Commit 55a22902 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

raven: some minor IRQ-related tidy-ups 



This really lays the groundwork for the upcoming patches: it renames the
irqs PREPPCIState struct member to pci_irqs (as soon there will be a
distinction) and then changes the raven IRQ opaque to use PREPPCIState
instead of just irqs array.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Tested-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 8e93b2c3

hw/pci-host/prep.c

+5 −6
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ typedef struct RavenPCIState { 
typedef struct PRePPCIState {

    PCIHostState parent_obj;



    qemu_irq irq[PCI_NUM_PINS];

    qemu_irq pci_irqs[PCI_NUM_PINS];

    PCIBus pci_bus;

    AddressSpace pci_io_as;

    MemoryRegion pci_io;
@@ -194,9 +194,9 @@ static int raven_map_irq(PCIDevice *pci_dev, int irq_num) 


static void raven_set_irq(void *opaque, int irq_num, int level)

{

    qemu_irq *pic = opaque;

    PREPPCIState *s = opaque;



    qemu_set_irq(pic[irq_num] , level);

    qemu_set_irq(s->pci_irqs[irq_num], level);

}



static AddressSpace *raven_pcihost_set_iommu(PCIBus *bus, void *opaque,
@@ -223,13 +223,12 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) 
    int i;



    for (i = 0; i < PCI_NUM_PINS; i++) {

        sysbus_init_irq(dev, &s->irq[i]);

        sysbus_init_irq(dev, &s->pci_irqs[i]);

    }



    qdev_init_gpio_in(d, raven_change_gpio, 1);



    pci_bus_irqs(&s->pci_bus, raven_set_irq, raven_map_irq, s->irq,

                 PCI_NUM_PINS);

    pci_bus_irqs(&s->pci_bus, raven_set_irq, raven_map_irq, s, PCI_NUM_PINS);



    memory_region_init_io(&h->conf_mem, OBJECT(h), &pci_host_conf_le_ops, s,

                          "pci-conf-idx", 4);