diff options
Diffstat (limited to 'hw/prep_pci.c')
| -rw-r--r-- | hw/prep_pci.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/prep_pci.c b/hw/prep_pci.c index f384e4215..815db5308 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -22,7 +22,9 @@ * THE SOFTWARE. */ -#include "vl.h" +#include "hw.h" +#include "pci.h" + typedef uint32_t pci_addr_t; #include "pci_host.h" @@ -117,7 +119,6 @@ static CPUReadMemoryFunc *PPC_PCIIO_read[] = { &PPC_PCIIO_readl, }; -/* Don't know if this matches real hardware, but it agrees with OHW. */ static int prep_map_irq(PCIDevice *pci_dev, int irq_num) { return (irq_num + (pci_dev->devfn >> 3)) & 1; @@ -125,7 +126,7 @@ static int prep_map_irq(PCIDevice *pci_dev, int irq_num) static void prep_set_irq(qemu_irq *pic, int irq_num, int level) { - qemu_set_irq(pic[irq_num ? 11 : 9], level); + qemu_set_irq(pic[(irq_num & 1) ? 11 : 9] , level); } PCIBus *pci_prep_init(qemu_irq *pic) @@ -135,7 +136,7 @@ PCIBus *pci_prep_init(qemu_irq *pic) int PPC_io_memory; s = qemu_mallocz(sizeof(PREPPCIState)); - s->bus = pci_register_bus(prep_set_irq, prep_map_irq, pic, 0, 2); + s->bus = pci_register_bus(prep_set_irq, prep_map_irq, pic, 0, 4); register_ioport_write(0xcf8, 4, 4, pci_prep_addr_writel, s); register_ioport_read(0xcf8, 4, 4, pci_prep_addr_readl, s); |