diff options
author | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
commit | 5d8f37ad78fc66901af50c762029a501561f3b23 (patch) | |
tree | 206790f8f21000850a98c4f9590a79e779106278 /hw/goldfish_events_device.c | |
parent | cd059b15f2c7df69f4a087bd66900eb172e41d1c (diff) | |
download | external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.zip external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.gz external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.bz2 |
Merge upstream QEMU 10.0.50 into the Android source tree.
This change integrates many changes from the upstream QEMU sources.
Its main purpose is to enable correct ARMv6 and ARMv7 support to the
Android emulator. Due to the nature of the upstream code base, this
unfortunately also required changes to many other parts of the source.
Note that to ensure easier integrations in the future, some source files
and directories that have heavy Android-specific customization have been
renamed with an -android suffix. The original files are still there for
easier integration tracking, but *never* compiled. For example:
net.c net-android.c
qemu-char.c qemu-char-android.c
slirp/ slirp-android/
etc...
Tested on linux-x86, darwin-x86 and windows host machines.
Diffstat (limited to 'hw/goldfish_events_device.c')
-rw-r--r-- | hw/goldfish_events_device.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/goldfish_events_device.c b/hw/goldfish_events_device.c index 6f7e41b..d8e265c 100644 --- a/hw/goldfish_events_device.c +++ b/hw/goldfish_events_device.c @@ -164,7 +164,7 @@ static int get_page_data(events_state *s, int offset) static uint32_t events_read(void *x, target_phys_addr_t off) { events_state *s = (events_state *) x; - int offset = off - s->base; + int offset = off; // - s->base; if (offset == REG_READ) return dequeue_event(s); else if (offset == REG_LEN) @@ -177,7 +177,7 @@ static uint32_t events_read(void *x, target_phys_addr_t off) static void events_write(void *x, target_phys_addr_t off, uint32_t val) { events_state *s = (events_state *) x; - int offset = off - s->base; + int offset = off; // - s->base; if (offset == REG_SET_PAGE) s->page = val; } @@ -379,12 +379,12 @@ void events_dev_init(uint32_t base, qemu_irq irq) events_set_bit(s, EV_SW, 0); } - iomemtype = cpu_register_io_memory(0, events_readfn, events_writefn, s); + iomemtype = cpu_register_io_memory(events_readfn, events_writefn, s); cpu_register_physical_memory(base, 0xfff, iomemtype); qemu_add_kbd_event_handler(events_put_keycode, s); - qemu_add_mouse_event_handler(events_put_mouse, s, 1); + qemu_add_mouse_event_handler(events_put_mouse, s, 1, "goldfish-events"); qemu_add_generic_event_handler(events_put_generic, s); s->base = base; |