david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd646: switch cmd646_update_irq() to accept PCIDevice instead of PCIIDEState

Browse Source 
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>
This commit is contained in:
Mark Cave-Ayland 2014-08-08 17:23:34 +01:00 committed by Stefan Hajnoczi
parent 5bbc0a703d
commit dab91a1e13
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/ide/cmd646.c
View File

@ -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)