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_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_device.c')
| -rw-r--r-- | hw/goldfish_device.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/hw/goldfish_device.c b/hw/goldfish_device.c index 2c9dd6e..3ced4ce 100644 --- a/hw/goldfish_device.c +++ b/hw/goldfish_device.c @@ -77,8 +77,7 @@ int goldfish_device_add(struct goldfish_device *dev, { int iomemtype; goldfish_add_device_no_io(dev); - iomemtype = cpu_register_io_memory(0, mem_read, - mem_write, opaque); + iomemtype = cpu_register_io_memory(mem_read, mem_write, opaque); cpu_register_physical_memory(dev->base, dev->size, iomemtype); return 0; } @@ -86,7 +85,6 @@ int goldfish_device_add(struct goldfish_device *dev, static uint32_t goldfish_bus_read(void *opaque, target_phys_addr_t offset) { struct bus_state *s = (struct bus_state *)opaque; - offset -= s->dev.base; switch (offset) { case PDEV_BUS_OP: @@ -138,7 +136,6 @@ static void goldfish_bus_op_init(struct bus_state *s) static void goldfish_bus_write(void *opaque, target_phys_addr_t offset, uint32_t value) { struct bus_state *s = (struct bus_state *)opaque; - offset -= s->dev.base; switch(offset) { case PDEV_BUS_OP: @@ -152,7 +149,7 @@ static void goldfish_bus_write(void *opaque, target_phys_addr_t offset, uint32_t break; case PDEV_BUS_GET_NAME: if(s->current) - pmemcpy(value, s->current->name, strlen(s->current->name)); + cpu_memory_rw_debug(cpu_single_env, value, (void*)s->current->name, strlen(s->current->name), 1); break; default: cpu_abort (cpu_single_env, "goldfish_bus_write: Bad offset %x\n", offset); |