Revision 9a6ee9fd hw/mcf_intc.c
b/hw/mcf_intc.c | ||
---|---|---|
16 | 16 |
uint64_t ifr; |
17 | 17 |
uint64_t enabled; |
18 | 18 |
uint8_t icr[64]; |
19 |
CPUM68KState *env;
|
|
19 |
M68kCPU *cpu;
|
|
20 | 20 |
int active_vector; |
21 | 21 |
} mcf_intc_state; |
22 | 22 |
|
... | ... | |
40 | 40 |
} |
41 | 41 |
} |
42 | 42 |
s->active_vector = ((best == 64) ? 24 : (best + 64)); |
43 |
m68k_set_irq_level(s->env, best_level, s->active_vector);
|
|
43 |
m68k_set_irq_level(&s->cpu->env, best_level, s->active_vector);
|
|
44 | 44 |
} |
45 | 45 |
|
46 | 46 |
static uint64_t mcf_intc_read(void *opaque, hwaddr addr, |
... | ... | |
139 | 139 |
|
140 | 140 |
qemu_irq *mcf_intc_init(MemoryRegion *sysmem, |
141 | 141 |
hwaddr base, |
142 |
CPUM68KState *env)
|
|
142 |
M68kCPU *cpu)
|
|
143 | 143 |
{ |
144 | 144 |
mcf_intc_state *s; |
145 | 145 |
|
146 | 146 |
s = g_malloc0(sizeof(mcf_intc_state)); |
147 |
s->env = env;
|
|
147 |
s->cpu = cpu;
|
|
148 | 148 |
mcf_intc_reset(s); |
149 | 149 |
|
150 | 150 |
memory_region_init_io(&s->iomem, &mcf_intc_ops, s, "mcf", 0x100); |
Also available in: Unified diff