[Qemu-devel] [PATCH 07/34] via: convert to pci_bar_map

[Blue Swirl]

Use pci_bar_map() instead of a mapping function.

Signed-off-by: Blue Swirl <blauwir...@gmail.com>
---
 hw/ide/via.c |   65 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/hw/ide/via.c b/hw/ide/via.c
index b2c7cad..36901b3 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -70,32 +70,35 @@ static void bmdma_writeb(void *opaque, uint32_t
addr, uint32_t val)
     }
 }

-static void bmdma_map(PCIDevice *pci_dev, int region_num,
-                    pcibus_t addr, pcibus_t size, int type)
-{
-    PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, pci_dev);
-    int i;
+static IOPortWriteFunc * const bmdma_cmd_io_writes[] = {
+    bmdma_cmd_writeb,
+    NULL,
+    NULL,
+};

-    for(i = 0;i < 2; i++) {
-        BMDMAState *bm = &d->bmdma[i];
-        d->bus[i].bmdma = bm;
-        bm->bus = d->bus+i;
-        qemu_add_vm_change_state_handler(ide_dma_restart_cb, bm);
+static IOPortWriteFunc * const bmdma_io_writes[] = {
+    bmdma_writeb,
+    NULL,
+    NULL,
+};

-        register_ioport_write(addr, 1, 1, bmdma_cmd_writeb, bm);
+static IOPortReadFunc * const bmdma_io_reads[] = {
+    bmdma_readb,
+    NULL,
+    NULL,
+};

-        register_ioport_write(addr + 1, 3, 1, bmdma_writeb, bm);
-        register_ioport_read(addr, 4, 1, bmdma_readb, bm);
+static IOPortWriteFunc * const bmdma_addr_writes[] = {
+    bmdma_addr_writeb,
+    bmdma_addr_writew,
+    bmdma_addr_writel,
+};

-        register_ioport_write(addr + 4, 4, 1, bmdma_addr_writeb, bm);
-        register_ioport_read(addr + 4, 4, 1, bmdma_addr_readb, bm);
-        register_ioport_write(addr + 4, 4, 2, bmdma_addr_writew, bm);
-        register_ioport_read(addr + 4, 4, 2, bmdma_addr_readw, bm);
-        register_ioport_write(addr + 4, 4, 4, bmdma_addr_writel, bm);
-        register_ioport_read(addr + 4, 4, 4, bmdma_addr_readl, bm);
-        addr += 8;
-    }
-}
+static IOPortReadFunc * const bmdma_addr_reads[] = {
+    bmdma_addr_readb,
+    bmdma_addr_readw,
+    bmdma_addr_readl,
+};

 static void via_reset(void *opaque)
 {
@@ -144,6 +147,8 @@ static int vt82c686b_ide_initfn(PCIDevice *dev)
 {
     PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev);;
     uint8_t *pci_conf = d->dev.config;
+    unsigned int i;
+    int io_index;

     pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_VIA);
     pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIA_IDE);
@@ -153,8 +158,20 @@ static int vt82c686b_ide_initfn(PCIDevice *dev)
     pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0);

     qemu_register_reset(via_reset, d);
-    pci_register_bar((PCIDevice *)d, 4, 0x10,
-                           PCI_BASE_ADDRESS_SPACE_IO, bmdma_map);
+    pci_register_bar((PCIDevice *)d, 4, 0x10, PCI_BASE_ADDRESS_SPACE_IO, NULL);
+    for (i = 0; i < 2; i++) {
+        BMDMAState *bm = &d->bmdma[i];
+
+        d->bus[i].bmdma = bm;
+        bm->bus = d->bus + i;
+        qemu_add_vm_change_state_handler(ide_dma_restart_cb, bm);
+        io_index = cpu_register_io(bmdma_io_reads, bmdma_cmd_io_writes, 1, bm);
+        pci_bar_map(&d->dev, 4, i * 3 + 0, i * 8 + 0, 1, io_index);
+        io_index = cpu_register_io(bmdma_io_reads, bmdma_io_writes, 3, bm);
+        pci_bar_map(&d->dev, 4, i * 3 + 1, i * 8 + 1, 3, io_index);
+        io_index = cpu_register_io(bmdma_addr_reads, bmdma_addr_writes, 4, bm);
+        pci_bar_map(&d->dev, 4, i * 3 + 2, i * 8 + 4, 4, io_index);
+    }

     vmstate_register(&dev->qdev, 0, &vmstate_ide_pci, d);

-- 
1.6.2.4