diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-28 12:54:06 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-28 12:54:06 +0000 |
| commit | 5f39a91dbd9a186edb999afd4d17524f4b1da14f (patch) | |
| tree | 193ba234c87de9179e961ab984fffb4ca2970725 /include | |
| parent | ad7a21e81231ae64540310384fb0f87ac8758b02 (diff) | |
| parent | 4ea98d317eb442c738f898f16cfdd47a18b7ca49 (diff) | |
| download | qemu-5f39a91dbd9a186edb999afd4d17524f4b1da14f.zip qemu-5f39a91dbd9a186edb999afd4d17524f4b1da14f.tar.gz qemu-5f39a91dbd9a186edb999afd4d17524f4b1da14f.tar.bz2 | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
Pull request
# gpg: Signature made Fri 25 Jan 2019 22:06:08 GMT
# gpg: using RSA key 7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jnsnow/tags/ide-pull-request:
ide/via: Implement and use native PCI IDE mode
ide/via: Rename functions to match device name
ide/via: Remove vt82c686b_init_ports() function
sii3112: Remove duplicated code and use PCI IDE ops instead
ide: Get rid of CMD646BAR struct
cmd646: Move PCI IDE specific functions to ide/pci.c
cmd646: Remove IDEBus from CMD646BAR
cmd646: Remove unused variable
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/ide.h | 2 | ||||
| -rw-r--r-- | include/hw/ide/pci.h | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/include/hw/ide.h b/include/hw/ide.h index 3ae087c..28d8a06 100644 --- a/include/hw/ide.h +++ b/include/hw/ide.h @@ -18,7 +18,7 @@ PCIDevice *pci_piix3_xen_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); int pci_piix3_xen_ide_unplug(DeviceState *dev, bool aux); -void vt82c686b_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); +void via_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); /* ide-mmio.c */ void mmio_ide_init_drives(DeviceState *dev, DriveInfo *hd0, DriveInfo *hd1); diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h index dbc6a03..a9f2c33 100644 --- a/include/hw/ide/pci.h +++ b/include/hw/ide/pci.h @@ -37,13 +37,6 @@ typedef struct BMDMAState { struct PCIIDEState *pci_dev; } BMDMAState; -typedef struct CMD646BAR { - MemoryRegion cmd; - MemoryRegion data; - IDEBus *bus; - struct PCIIDEState *pci_dev; -} CMD646BAR; - #define TYPE_PCI_IDE "pci-ide" #define PCI_IDE(obj) OBJECT_CHECK(PCIIDEState, (obj), TYPE_PCI_IDE) @@ -56,21 +49,22 @@ 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; void pci_ide_create_devs(PCIDevice *dev, DriveInfo **hd_table); extern const VMStateDescription vmstate_ide_pci; +extern const MemoryRegionOps pci_ide_cmd_le_ops; +extern const MemoryRegionOps pci_ide_data_le_ops; #endif |