Commit 05a8096f2dd33234cacb957d2694281efc85e74d
1 parent
aafd8139
Better fix for OpenPIC: should not depend on PowerPC.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2552 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
2 additions
and
3 deletions
hw/openpic.c
... | ... | @@ -965,7 +965,7 @@ static void openpic_map(PCIDevice *pci_dev, int region_num, |
965 | 965 | } |
966 | 966 | |
967 | 967 | openpic_t *openpic_init (PCIBus *bus, SetIRQFunc *set_irq, |
968 | - int *pmem_index, int nb_cpus, CPUPPCState **envp) | |
968 | + int *pmem_index, int nb_cpus, CPUState **envp) | |
969 | 969 | { |
970 | 970 | openpic_t *opp; |
971 | 971 | uint8_t *pci_conf; | ... | ... |
vl.h
... | ... | @@ -859,11 +859,10 @@ enum { |
859 | 859 | OPENPIC_EVT_DEBUG, /* Inconditional debug event */ |
860 | 860 | OPENPIC_EVT_RESET, /* Core reset event */ |
861 | 861 | }; |
862 | -struct CPUPPCState; | |
863 | 862 | void openpic_set_irq(void *opaque, int n_IRQ, int level); |
864 | 863 | openpic_t *openpic_init (PCIBus *bus, SetIRQFunc *set_irq, |
865 | 864 | int *pmem_index, int nb_cpus, |
866 | - struct CPUPPCState **envp); | |
865 | + struct CPUState **envp); | |
867 | 866 | |
868 | 867 | /* heathrow_pic.c */ |
869 | 868 | typedef struct HeathrowPICS HeathrowPICS; | ... | ... |