diff options
| author | Richard Henderson <rth@twiddle.net> | 2011-08-11 16:07:19 -0700 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-10-02 16:14:02 +0200 |
| commit | a6dc4c2d95f7b7bd95a53e8c2e524a8a202b4d1f (patch) | |
| tree | 1460cb186c2179a19d8f410c147331cdbe198f9d /hw/pxa2xx.c | |
| parent | 3e9f0113b4c5ec37fbba0a50b28ea26c8477da93 (diff) | |
| download | qemu-a6dc4c2d95f7b7bd95a53e8c2e524a8a202b4d1f.zip qemu-a6dc4c2d95f7b7bd95a53e8c2e524a8a202b4d1f.tar.gz qemu-a6dc4c2d95f7b7bd95a53e8c2e524a8a202b4d1f.tar.bz2 | |
pxa: Pass in address_space to pxa{255, 270}_init
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/pxa2xx.c')
| -rw-r--r-- | hw/pxa2xx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c index c47e698..70d7c8a 100644 --- a/hw/pxa2xx.c +++ b/hw/pxa2xx.c @@ -15,7 +15,6 @@ #include "ssi.h" #include "qemu-char.h" #include "blockdev.h" -#include "exec-memory.h" static struct { target_phys_addr_t io_base; @@ -2060,7 +2059,8 @@ static void pxa2xx_reset(void *opaque, int line, int level) } /* Initialise a PXA270 integrated chip (ARM based core). */ -PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision) +PXA2xxState *pxa270_init(MemoryRegion *address_space, + unsigned int sdram_size, const char *revision) { PXA2xxState *s; int iomemtype, i; @@ -2116,7 +2116,7 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision) for (i = 0; pxa270_serial[i].io_base; i++) { if (serial_hds[i]) { - serial_mm_init(get_system_memory(), pxa270_serial[i].io_base, 2, + serial_mm_init(address_space, pxa270_serial[i].io_base, 2, qdev_get_gpio_in(s->pic, pxa270_serial[i].irqn), 14857000 / 16, serial_hds[i], DEVICE_NATIVE_ENDIAN); @@ -2199,7 +2199,7 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision) } /* Initialise a PXA255 integrated chip (ARM based core). */ -PXA2xxState *pxa255_init(unsigned int sdram_size) +PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) { PXA2xxState *s; int iomemtype, i; @@ -2248,7 +2248,7 @@ PXA2xxState *pxa255_init(unsigned int sdram_size) for (i = 0; pxa255_serial[i].io_base; i++) { if (serial_hds[i]) { - serial_mm_init(get_system_memory(), pxa255_serial[i].io_base, 2, + serial_mm_init(address_space, pxa255_serial[i].io_base, 2, qdev_get_gpio_in(s->pic, pxa255_serial[i].irqn), 14745600 / 16, serial_hds[i], DEVICE_NATIVE_ENDIAN); |