Revision d537cf6c hw/pl011.c
b/hw/pl011.c | ||
---|---|---|
27 | 27 |
int read_count; |
28 | 28 |
int read_trigger; |
29 | 29 |
CharDriverState *chr; |
30 |
void *pic; |
|
31 |
int irq; |
|
30 |
qemu_irq irq; |
|
32 | 31 |
} pl011_state; |
33 | 32 |
|
34 | 33 |
#define PL011_INT_TX 0x20 |
... | ... | |
47 | 46 |
uint32_t flags; |
48 | 47 |
|
49 | 48 |
flags = s->int_level & s->int_enabled; |
50 |
pic_set_irq_new(s->pic, s->irq, flags != 0);
|
|
49 |
qemu_set_irq(s->irq, flags != 0);
|
|
51 | 50 |
} |
52 | 51 |
|
53 | 52 |
static uint32_t pl011_read(void *opaque, target_phys_addr_t offset) |
... | ... | |
224 | 223 |
pl011_write |
225 | 224 |
}; |
226 | 225 |
|
227 |
void pl011_init(uint32_t base, void *pic, int irq,
|
|
226 |
void pl011_init(uint32_t base, qemu_irq irq,
|
|
228 | 227 |
CharDriverState *chr) |
229 | 228 |
{ |
230 | 229 |
int iomemtype; |
... | ... | |
235 | 234 |
pl011_writefn, s); |
236 | 235 |
cpu_register_physical_memory(base, 0x00000fff, iomemtype); |
237 | 236 |
s->base = base; |
238 |
s->pic = pic; |
|
239 | 237 |
s->irq = irq; |
240 | 238 |
s->chr = chr; |
241 | 239 |
s->read_trigger = 1; |
Also available in: Unified diff