diff options
Diffstat (limited to 'hw/sysbus.c')
| -rw-r--r-- | hw/sysbus.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hw/sysbus.c b/hw/sysbus.c index f8f1746658..f39768b6a2 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -53,6 +53,8 @@ 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); } else { cpu_register_physical_memory(dev->mmio[n].addr, dev->mmio[n].size, IO_MEM_UNASSIGNED); @@ -105,16 +107,17 @@ void sysbus_init_mmio(SysBusDevice *dev, target_phys_addr_t size, dev->mmio[n].iofunc = iofunc; } -void sysbus_init_mmio_cb(SysBusDevice *dev, target_phys_addr_t size, - mmio_mapfunc cb) +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].size = size; + dev->mmio[n].size = 0; dev->mmio[n].cb = cb; + dev->mmio[n].unmap = unmap; } void sysbus_init_mmio_region(SysBusDevice *dev, MemoryRegion *memory) |