aboutsummaryrefslogtreecommitdiffstats
path: root/hw/goldfish_events_device.c
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-03-18 14:06:41 -0700
committerXavier Ducrohet <xav@android.com>2011-03-18 14:06:41 -0700
commit2facea6512c84af9285682909f6ac6edcd4130ab (patch)
treec62d4c51819511c1197041f8603eaaafe92dedb6 /hw/goldfish_events_device.c
parentd80a3bc754bda637449b5ad1abfd8d3c322a21d5 (diff)
downloadexternal_qemu-2facea6512c84af9285682909f6ac6edcd4130ab.zip
external_qemu-2facea6512c84af9285682909f6ac6edcd4130ab.tar.gz
external_qemu-2facea6512c84af9285682909f6ac6edcd4130ab.tar.bz2
Revert "Merge 29e114d2 from master. do not merge."
This reverts commit e36a1cc2561b2ce27d3c0a5b3a7b79d4e8531f0e.
Diffstat (limited to 'hw/goldfish_events_device.c')
-rw-r--r--hw/goldfish_events_device.c36
1 files changed, 0 insertions, 36 deletions
diff --git a/hw/goldfish_events_device.c b/hw/goldfish_events_device.c
index 3072e3b..340dc76 100644
--- a/hw/goldfish_events_device.c
+++ b/hw/goldfish_events_device.c
@@ -448,44 +448,8 @@ 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