diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-12-15 09:05:26 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-12-15 09:05:26 +0000 |
| commit | 6d4e18925a65306afabaad7b63a4588c18919e99 (patch) | |
| tree | 3d46feb2372756bc5dcb37641f3c8030431fcf23 /hw/openpic.h | |
| parent | 659f807c0a700317a7a0fae7a6e6ebfe68bfbbc4 (diff) | |
| parent | a64ae610b978dfd8ccfb7f6c5d4cfe62d7542fbd (diff) | |
| download | qemu-6d4e18925a65306afabaad7b63a4588c18919e99.zip qemu-6d4e18925a65306afabaad7b63a4588c18919e99.tar.gz qemu-6d4e18925a65306afabaad7b63a4588c18919e99.tar.bz2 | |
Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf
* 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf: (40 commits)
pseries: Increase default NVRAM size
target-ppc: Don't use hwaddr to represent hardware state
PPC: e500: pci: Export slot2irq calculation
PPC: E500plat: Make a lot of PCI slots available
PPC: E500: Move PCI slot information into params
PPC: E500: Generate dt pci irq map dynamically
PPC: E500: PCI: Make IRQ calculation more generic
PPC: E500: PCI: Make first slot qdev settable
openpic: Accelerate pending irq search
openpic: fix minor coding style issues
MSI-X: Fix endianness
PPC: e500: Declare pci bridge as bridge
PPC: e500: Add MSI support
openpic: add Shared MSI support
openpic: make brr1 model specific
openpic: convert to qdev
openpic: remove irq_out
openpic: rename openpic_t to OpenPICState
openpic: convert simple reg operations to builtin bitops
openpic: remove unused type variable
...
Diffstat (limited to 'hw/openpic.h')
| -rw-r--r-- | hw/openpic.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/openpic.h b/hw/openpic.h index f50a1e4..e226d7b 100644 --- a/hw/openpic.h +++ b/hw/openpic.h @@ -11,8 +11,7 @@ enum { OPENPIC_OUTPUT_NB, }; -qemu_irq *openpic_init (MemoryRegion **pmem, int nb_cpus, - qemu_irq **irqs, qemu_irq irq_out); -qemu_irq *mpic_init (MemoryRegion *address_space, hwaddr base, - int nb_cpus, qemu_irq **irqs, qemu_irq irq_out); +#define OPENPIC_MODEL_RAVEN 0 +#define OPENPIC_MODEL_FSL_MPIC_20 1 + #endif /* __OPENPIC_H__ */ |