diff options
| author | Benoît Canet <benoit.canet@gmail.com> | 2011-11-17 14:23:01 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-11-24 18:32:03 +0200 |
| commit | b279e5efc0aa3a62c5bce21bc31700e828ca9cd8 (patch) | |
| tree | 3385c382a9515e46b4d1caeff1aff308859e59f4 /hw/sh_intc.h | |
| parent | 89e29451407353587a744a27d2896850d7c7624d (diff) | |
sh_intc: convert interrupt controller to memory API
Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/sh_intc.h')
| -rw-r--r-- | hw/sh_intc.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/sh_intc.h b/hw/sh_intc.h index c117d6fb8c..80c9430577 100644 --- a/hw/sh_intc.h +++ b/hw/sh_intc.h @@ -3,6 +3,7 @@ #include "qemu-common.h" #include "irq.h" +#include "exec-memory.h" typedef unsigned char intc_enum; @@ -46,6 +47,8 @@ struct intc_source { }; struct intc_desc { + MemoryRegion iomem; + MemoryRegion *iomem_aliases; qemu_irq *irqs; struct intc_source *sources; int nr_sources; @@ -53,7 +56,6 @@ struct intc_desc { int nr_mask_regs; struct intc_prio_reg *prio_regs; int nr_prio_regs; - int iomemtype; int pending; /* number of interrupt sources that has pending set */ }; @@ -68,7 +70,8 @@ void sh_intc_register_sources(struct intc_desc *desc, struct intc_group *groups, int nr_groups); -int sh_intc_init(struct intc_desc *desc, +int sh_intc_init(MemoryRegion *sysmem, + struct intc_desc *desc, int nr_sources, struct intc_mask_reg *mask_regs, int nr_mask_regs, |