ide: convert bmdma address ioport to ioport_register()
PATCH 1/1 ide: convert bmdma address ioport to ioport_register()
cmd646, via compile tested, pci lightly boot tested.
Signed-off-by Avi Kivity <[email protected]>
--- hw/ide/cmd646.c | 8 +---- hw/ide/internal.h | 2 + hw/ide/pci.c | 71 +++++++++++++--------------------------------------- hw/ide/pci.h | 7 +---- hw/ide/piix.c | 8 +---- hw/ide/via.c | 8 +---- 6 files changed, 27 insertions(+), 77 deletions(-)
hw/ide/cmd646.c +2 -6
@@ -179,12 +179,8 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num,register_ioport_read (addr,4 ,1 , bmdma_readb_1, d); } -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); +iorange_init (&bm->addr_ioport, &bmdma_addr_ioport_ops, addr +4 ,4 ); +ioport_register (&bm->addr_ioport); addr +=8 ; } }
hw/ide/internal.h +2 -0
@@ -8,6 +8,7 @@*/ #include <hw/ide.h> #include "block_int.h" +#include "iorange.h" /* debug IDE devices */ //#define DEBUG_IDE
@@ -496,6 +497,7 @@ struct BMDMAState {QEMUIOVector qiov;int64_t sector_num;uint32_t nsector; +IORange addr_ioport;QEMUBH *bh; };
hw/ide/pci.c +18 -53
90 lines not on this page · raw message
hw/ide/pci.h +1 -6
@@ -11,12 +11,7 @@ typedef struct PCIIDEState { } PCIIDEState;void bmdma_cmd_writeb (void *opaque,uint32_t addr,uint32_t val); -uint32_t bmdma_addr_readb (void *opaque,uint32_t addr); -void bmdma_addr_writeb (void *opaque,uint32_t addr,uint32_t val); -uint32_t bmdma_addr_readw (void *opaque,uint32_t addr); -void bmdma_addr_writew (void *opaque,uint32_t addr,uint32_t val); -uint32_t bmdma_addr_readl (void *opaque,uint32_t addr); -void bmdma_addr_writel (void *opaque,uint32_t addr,uint32_t val); +extern const IORangeOps bmdma_addr_ioport_ops;void pci_ide_create_devs (PCIDevice *dev,DriveInfo **hd_table);extern const VMStateDescription vmstate_ide_pci;
hw/ide/piix.c +2 -6
@@ -85,12 +85,8 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num,register_ioport_write (addr +1 ,3 ,1 , bmdma_writeb, bm);register_ioport_read (addr,4 ,1 , bmdma_readb, bm); -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); +iorange_init (&bm->addr_ioport, &bmdma_addr_ioport_ops, addr +4 ,4 ); +ioport_register (&bm->addr_ioport); addr +=8 ; } }
hw/ide/via.c +2 -6
@@ -87,12 +87,8 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num,register_ioport_write (addr +1 ,3 ,1 , bmdma_writeb, bm);register_ioport_read (addr,4 ,1 , bmdma_readb, bm); -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); +iorange_init (&bm->addr_ioport, &bmdma_addr_ioport_ops, addr +4 ,4 ); +ioport_register (&bm->addr_ioport); addr +=8 ; } }
Signature · 1 line
1.7.1
Kevin Wolf
AppliedAm 21.11.2010 17:29, schrieb Avi Kivity:
Quoted 3 lines
cmd646, via compile tested, pci lightly boot tested.
Signed-off-by Avi Kivity <[email protected]>
Thanks, applied to the block branch.
Kevin