diff options
| author | Mark Cave-Ayland | 2014-08-08 18:23:34 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2014-08-15 19:03:13 +0200 |
| commit | dab91a1e138e9d0cb7dc0744c1e41e9f18af0fc4 (patch) | |
| tree | 4b1cded1c81ea7aa138b481310c4284bdff7ab60 /hw | |
| parent | cmd646: synchronise DMA interrupt status with UDMA interrupt status (diff) | |
| download | qemu-dab91a1e138e9d0cb7dc0744c1e41e9f18af0fc4.tar.gz qemu-dab91a1e138e9d0cb7dc0744c1e41e9f18af0fc4.tar.xz qemu-dab91a1e138e9d0cb7dc0744c1e41e9f18af0fc4.zip | |
cmd646: switch cmd646_update_irq() to accept PCIDevice instead of PCIIDEState
This is in preparation for adding configuration space accessors which accept
PCIDevice as a parameter.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/cmd646.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index c3c6c53d91..11a3e52d71 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -48,7 +48,7 @@ #define UDIDETCR0 0x73 #define UDIDETCR1 0x7B -static void cmd646_update_irq(PCIIDEState *d); +static void cmd646_update_irq(PCIDevice *pd); static uint64_t cmd646_cmd_read(void *opaque, hwaddr addr, unsigned size) @@ -205,7 +205,7 @@ static void bmdma_write(void *opaque, hwaddr addr, pci_dev->config[MRDMODE] = (pci_dev->config[MRDMODE] & ~0x30) | (val & 0x30); cmd646_update_dma_interrupts(pci_dev); - cmd646_update_irq(bm->pci_dev); + cmd646_update_irq(pci_dev); break; case 2: bm->status = (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06); @@ -245,9 +245,8 @@ static void bmdma_setup_bar(PCIIDEState *d) /* XXX: call it also when the MRDMODE is changed from the PCI config registers */ -static void cmd646_update_irq(PCIIDEState *d) +static void cmd646_update_irq(PCIDevice *pd) { - PCIDevice *pd = PCI_DEVICE(d); int pci_level; pci_level = ((pd->config[MRDMODE] & MRDMODE_INTR_CH0) && @@ -271,7 +270,7 @@ static void cmd646_set_irq(void *opaque, int channel, int level) pd->config[MRDMODE] &= ~irq_mask; } cmd646_update_dma_interrupts(pd); - cmd646_update_irq(d); + cmd646_update_irq(pd); } static void cmd646_reset(void *opaque) |