diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-08-28 16:22:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2011-08-28 16:37:12 +0000 |
| commit | 07bc2f807768d85e98f50de2e5f8115743277381 (patch) | |
| tree | c44d8ece7a7f56d821586e5209d75b009d82f459 /hw/nseries.c | |
| parent | 7c00b9de8b1cdb18d3ba0d6759abea3776d7e05b (diff) | |
| download | qemu-07bc2f807768d85e98f50de2e5f8115743277381.tar.gz qemu-07bc2f807768d85e98f50de2e5f8115743277381.tar.bz2 qemu-07bc2f807768d85e98f50de2e5f8115743277381.zip | |
omap_gpmc: Clean up omap_gpmc_attach MemoryRegion conversion
Now that all callers of omap_gpmc_attach pass in a MemoryRegion*,
we can remove the base_update and unmap function pointer arguments,
and the opaque pointer that was passed into these callbacks.
We can also remove the base and size fields from omap_gpmc_cs_file_s
as these are no longer necessary (you don't need the base/size
to unmap a MemoryRegion the way you did to undo a mapping made
with cpu_register_physical_memory()).
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/nseries.c')
| -rw-r--r-- | hw/nseries.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/hw/nseries.c b/hw/nseries.c index 7e1ad34877..f7ace9979c 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -182,9 +182,7 @@ static void n8x0_nand_setup(struct n800_s *s) sysbus_connect_irq(sysbus_from_qdev(s->nand), 0, qdev_get_gpio_in(s->cpu->gpio, N8X0_ONENAND_GPIO)); omap_gpmc_attach(s->cpu->gpmc, N8X0_ONENAND_CS, - sysbus_mmio_get_region(sysbus_from_qdev(s->nand), 0), - NULL, NULL, - s->nand); + sysbus_mmio_get_region(sysbus_from_qdev(s->nand), 0)); otp_region = onenand_raw_otp(s->nand); memcpy(otp_region + 0x000, n8x0_cal_wlan_mac, sizeof(n8x0_cal_wlan_mac)); @@ -781,10 +779,8 @@ static void n8x0_usb_setup(struct n800_s *s) TUSBState *tusb = tusb6010_init(tusb_irq); /* Using the NOR interface */ - omap_gpmc_attach(s->cpu->gpmc, N8X0_USB_ASYNC_CS, - tusb6010_async_io(tusb), NULL, NULL, tusb); - omap_gpmc_attach(s->cpu->gpmc, N8X0_USB_SYNC_CS, - tusb6010_sync_io(tusb), NULL, NULL, tusb); + omap_gpmc_attach(s->cpu->gpmc, N8X0_USB_ASYNC_CS, tusb6010_async_io(tusb)); + omap_gpmc_attach(s->cpu->gpmc, N8X0_USB_SYNC_CS, tusb6010_sync_io(tusb)); s->usb = tusb; qdev_connect_gpio_out(s->cpu->gpio, N8X0_TUSB_ENABLE_GPIO, tusb_pwr); |