From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rapsa-0001I5-5V for qemu-devel@nongnu.org; Wed, 14 Dec 2011 09:32:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RapsY-0004bp-N0 for qemu-devel@nongnu.org; Wed, 14 Dec 2011 09:32:20 -0500 Received: from mail-ey0-f173.google.com ([209.85.215.173]:41919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RapsY-0004ab-ID for qemu-devel@nongnu.org; Wed, 14 Dec 2011 09:32:18 -0500 Received: by mail-ey0-f173.google.com with SMTP id a14so851073eaa.4 for ; Wed, 14 Dec 2011 06:32:18 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 14 Dec 2011 15:32:09 +0100 Message-Id: <1323873129-29742-4-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1323873129-29742-1-git-send-email-benoit.canet@gmail.com> References: <1323873129-29742-1-git-send-email-benoit.canet@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2 3/3] sysbus: remove sysbus_init_mmio_cb2 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Beno=C3=AEt=20Canet?= , agraf@suse.de This function is not longer in use so remove it. Signed-off-by: Benoît Canet --- hw/sysbus.c | 16 ---------------- hw/sysbus.h | 5 ----- 2 files changed, 0 insertions(+), 21 deletions(-) diff --git a/hw/sysbus.c b/hw/sysbus.c index b315a8c..81a57bd 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 9bac582..2f4025b 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); -- 1.7.7.4