From f32dd06ba6299e6c9174e94bd0ac9e4f7828bd78 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Mon, 4 Apr 2011 18:28:04 +0300 Subject: [PATCH] hda-intel: convert to pci_register_bar_simple() (partial) Signed-off-by: Avi Kivity Signed-off-by: Michael S. Tsirkin --- hw/lsi53c895a.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 84a4992..6c811cf 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -2037,15 +2037,6 @@ static void lsi_ram_mapfunc(PCIDevice *pci_dev, int region_num, cpu_register_physical_memory(addr + 0, 0x2000, s->ram_io_addr); } -static void lsi_mmio_mapfunc(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - LSIState *s = DO_UPCAST(LSIState, dev, pci_dev); - - DPRINTF("Mapping registers at %08"FMT_PCIBUS"\n", addr); - cpu_register_physical_memory(addr + 0, 0x400, s->mmio_io_addr); -} - static void lsi_scsi_reset(DeviceState *dev) { LSIState *s = DO_UPCAST(LSIState, dev.qdev, dev); @@ -2188,8 +2179,7 @@ static int lsi_scsi_init(PCIDevice *dev) pci_register_bar(&s->dev, 0, 256, PCI_BASE_ADDRESS_SPACE_IO, lsi_io_mapfunc); - pci_register_bar(&s->dev, 1, 0x400, - PCI_BASE_ADDRESS_SPACE_MEMORY, lsi_mmio_mapfunc); + pci_register_bar_simple(&s->dev, 1, 0x400, 0, s->mmio_io_addr); pci_register_bar(&s->dev, 2, 0x2000, PCI_BASE_ADDRESS_SPACE_MEMORY, lsi_ram_mapfunc); QTAILQ_INIT(&s->queue); -- 2.7.4