diff options
author | Xavier Ducrohet <xav@android.com> | 2011-03-18 13:06:28 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-03-18 13:06:28 -0700 |
commit | d80a3bc754bda637449b5ad1abfd8d3c322a21d5 (patch) | |
tree | a10ee1971ad5e2ffd75eb13238e66954e00001ce /hw | |
parent | 601f3627157e8d994d35a58f5ee3187f04a6cb21 (diff) | |
parent | e36a1cc2561b2ce27d3c0a5b3a7b79d4e8531f0e (diff) | |
download | external_qemu-d80a3bc754bda637449b5ad1abfd8d3c322a21d5.zip external_qemu-d80a3bc754bda637449b5ad1abfd8d3c322a21d5.tar.gz external_qemu-d80a3bc754bda637449b5ad1abfd8d3c322a21d5.tar.bz2 |
Merge "Merge 29e114d2 from master. do not merge." into tools_r10
Diffstat (limited to 'hw')
-rw-r--r-- | hw/goldfish_events_device.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/hw/goldfish_events_device.c b/hw/goldfish_events_device.c index 340dc76..3072e3b 100644 --- a/hw/goldfish_events_device.c +++ b/hw/goldfish_events_device.c @@ -448,8 +448,44 @@ void events_dev_init(uint32_t base, qemu_irq irq) * EV_ABS events are sent when the touchscreen is pressed */ if (config->hw_touchScreen) { + int32_t* values; + events_set_bit (s, EV_SYN, EV_ABS ); events_set_bits(s, EV_ABS, ABS_X, ABS_Z); + /* Allocate the absinfo to report the min/max bounds for each + * absolute dimension. The array must contain 3 tuples + * of (min,max,fuzz,flat) 32-bit values. + * + * min and max are the bounds + * fuzz corresponds to the device's fuziness, we set it to 0 + * flat corresponds to the flat position for JOEYDEV devices, + * we also set it to 0. + * + * There is no need to save/restore this array in a snapshot + * since the values only depend on the hardware configuration. + */ + s->abs_info_count = 3*4; + s->abs_info = values = malloc(sizeof(uint32_t)*s->abs_info_count); + + /* ABS_X min/max/fuzz/flat */ + values[0] = 0; + values[1] = config->hw_lcd_width-1; + values[2] = 0; + values[3] = 0; + values += 4; + + /* ABS_Y */ + values[0] = 0; + values[1] = config->hw_lcd_height-1; + values[2] = 0; + values[3] = 0; + values += 4; + + /* ABS_Z */ + values[0] = 0; + values[1] = 1; + values[2] = 0; + values[3] = 0; } /* configure EV_SW array |