diff options
| author | BALATON Zoltan <balaton@eik.bme.hu> | 2019-01-25 14:52:11 -0500 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2019-01-25 14:52:11 -0500 |
| commit | 8ac98d1a97a7aeefe45f4a5af37d61caa41ded54 (patch) | |
| tree | ea83f51ec6e97a80662db74012c158af4b059383 /include/hw/ide | |
| parent | c9ebc75dc24f99e881414e7f35544041f678235a (diff) | |
| download | qemu-8ac98d1a97a7aeefe45f4a5af37d61caa41ded54.zip qemu-8ac98d1a97a7aeefe45f4a5af37d61caa41ded54.tar.gz qemu-8ac98d1a97a7aeefe45f4a5af37d61caa41ded54.tar.bz2 | |
ide: Get rid of CMD646BAR struct
Now that no CMD646 specific parts are left in CMD646BAR (all remaining
members are really PCI IDE specific) this struct can be deleted moving
the memory regions for PCI IDE BARs to PCIIDEState where they better
belong. The CMD646 PCI IDE model is adjusted accordingly.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 4b6cb2ae150dc0d21178209e4beb1e35140a7325.1547166960.git.balaton@eik.bme.hu
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'include/hw/ide')
| -rw-r--r-- | include/hw/ide/pci.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h index 3110633..a9f2c33 100644 --- a/include/hw/ide/pci.h +++ b/include/hw/ide/pci.h @@ -37,11 +37,6 @@ typedef struct BMDMAState { struct PCIIDEState *pci_dev; } BMDMAState; -typedef struct CMD646BAR { - MemoryRegion cmd; - MemoryRegion data; -} CMD646BAR; - #define TYPE_PCI_IDE "pci-ide" #define PCI_IDE(obj) OBJECT_CHECK(PCIIDEState, (obj), TYPE_PCI_IDE) @@ -54,17 +49,16 @@ typedef struct PCIIDEState { BMDMAState bmdma[2]; uint32_t secondary; /* used only for cmd646 */ MemoryRegion bmdma_bar; - CMD646BAR cmd646_bar[2]; /* used only for cmd646 */ + MemoryRegion cmd_bar[2]; + MemoryRegion data_bar[2]; } PCIIDEState; - static inline IDEState *bmdma_active_if(BMDMAState *bmdma) { assert(bmdma->bus->retry_unit != (uint8_t)-1); return bmdma->bus->ifs + bmdma->bus->retry_unit; } - void bmdma_init(IDEBus *bus, BMDMAState *bm, PCIIDEState *d); void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val); extern MemoryRegionOps bmdma_addr_ioport_ops; |