diff options
| author | Benoît Canet <benoit.canet@gmail.com> | 2011-12-16 23:37:48 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 13:36:27 -0600 |
| commit | ab0115e10ca2221a7844ac5fd18842976eec3b2b (patch) | |
| tree | aa072a560c02dc5125093640d9d9d0fe84da3fa2 /hw | |
| parent | cb4e15c7ff92859d112221ef57ee4340e5c531d3 (diff) | |
| download | qemu-ab0115e10ca2221a7844ac5fd18842976eec3b2b.tar.gz | |
sysbus: remove sysbus_init_mmio_cb2
This function is not longer in use so remove it.
Signed-off-by: Benoît Canet <benoit.canet@gmail.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/sysbus.c | 16 | ||||
| -rw-r--r-- | hw/sysbus.h | 5 |
2 files changed, 0 insertions, 21 deletions
diff --git a/hw/sysbus.c b/hw/sysbus.c index b315a8cf5d..81a57bdba8 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -53,8 +53,6 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr) if (dev->mmio[n].memory) { memory_region_del_subregion(get_system_memory(), dev->mmio[n].memory); - } else if (dev->mmio[n].unmap) { - dev->mmio[n].unmap(dev, dev->mmio[n].addr); } } dev->mmio[n].addr = addr; @@ -62,8 +60,6 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr) memory_region_add_subregion(get_system_memory(), addr, dev->mmio[n].memory); - } else if (dev->mmio[n].cb) { - dev->mmio[n].cb(dev, addr); } } @@ -89,18 +85,6 @@ void sysbus_pass_irq(SysBusDevice *dev, SysBusDevice *target) } } -void sysbus_init_mmio_cb2(SysBusDevice *dev, - mmio_mapfunc cb, mmio_mapfunc unmap) -{ - int n; - - assert(dev->num_mmio < QDEV_MAX_MMIO); - n = dev->num_mmio++; - dev->mmio[n].addr = -1; - dev->mmio[n].cb = cb; - dev->mmio[n].unmap = unmap; -} - void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion *memory) { int n; diff --git a/hw/sysbus.h b/hw/sysbus.h index 9bac582ea4..2f4025b221 100644 --- a/hw/sysbus.h +++ b/hw/sysbus.h @@ -11,7 +11,6 @@ #define QDEV_MAX_IRQ 256 typedef struct SysBusDevice SysBusDevice; -typedef void (*mmio_mapfunc)(SysBusDevice *dev, target_phys_addr_t addr); struct SysBusDevice { DeviceState qdev; @@ -21,8 +20,6 @@ struct SysBusDevice { int num_mmio; struct { target_phys_addr_t addr; - mmio_mapfunc cb; - mmio_mapfunc unmap; MemoryRegion *memory; } mmio[QDEV_MAX_MMIO]; int num_pio; @@ -43,8 +40,6 @@ typedef struct { void sysbus_register_dev(const char *name, size_t size, sysbus_initfn init); void sysbus_register_withprop(SysBusDeviceInfo *info); void *sysbus_new(void); -void sysbus_init_mmio_cb2(SysBusDevice *dev, - mmio_mapfunc cb, mmio_mapfunc unmap); void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion *memory); MemoryRegion *sysbus_mmio_get_region(SysBusDevice *dev, int n); void sysbus_init_irq(SysBusDevice *dev, qemu_irq *p); |