diff options
| author | Alexander Graf <agraf@suse.de> | 2010-12-15 00:23:00 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-12-17 16:11:01 +0100 |
| commit | 40a6238a20134a4687f67072d9be99cd97aab59a (patch) | |
| tree | 85856a4343e8d7dcd4b6daf60ccbf355883ecebe /hw/ide/pci.h | |
| parent | 6ef2ba5ea64e9feffdd1a8ffff66749323f719c8 (diff) | |
| download | qemu-40a6238a20134a4687f67072d9be99cd97aab59a.tar.gz | |
ide: Split out BMDMA code from ATA core
The ATA core is currently heavily intertwined with BMDMA code. Let's loosen
that a bit, so we can happily replace the DMA backend with different
implementations.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/pci.h')
| -rw-r--r-- | hw/ide/pci.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/hw/ide/pci.h b/hw/ide/pci.h index b81b26c532..cd72cbaeb9 100644 --- a/hw/ide/pci.h +++ b/hw/ide/pci.h @@ -3,6 +3,27 @@ #include <hw/ide/internal.h> +typedef struct BMDMAState { + IDEDMA dma; + uint8_t cmd; + uint8_t status; + uint32_t addr; + + IDEBus *bus; + /* current transfer state */ + uint32_t cur_addr; + uint32_t cur_prd_last; + uint32_t cur_prd_addr; + uint32_t cur_prd_len; + uint8_t unit; + BlockDriverCompletionFunc *dma_cb; + int64_t sector_num; + uint32_t nsector; + IORange addr_ioport; + QEMUBH *bh; + qemu_irq irq; +} BMDMAState; + typedef struct PCIIDEState { PCIDevice dev; IDEBus bus[2]; @@ -10,6 +31,15 @@ typedef struct PCIIDEState { uint32_t secondary; /* used only for cmd646 */ } PCIIDEState; + +static inline IDEState *bmdma_active_if(BMDMAState *bmdma) +{ + assert(bmdma->unit != (uint8_t)-1); + return bmdma->bus->ifs + bmdma->unit; +} + + +void bmdma_init(IDEBus *bus, BMDMAState *bm); void bmdma_cmd_writeb(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); |