diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-04-07 18:14:41 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-04-07 18:14:41 +0000 |
| commit | d537cf6c8624b27ce2b63431d2f8937f6356f652 (patch) | |
| tree | d7173d79977b4426b2ff225b35c839c8a2e4a215 /hw/pl110.c | |
| parent | b6e27ab8b12ef6075d85fc505f821643804a3a79 (diff) | |
| download | qemu-d537cf6c8624b27ce2b63431d2f8937f6356f652.tar.gz | |
Unify IRQ handling.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2635 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pl110.c')
| -rw-r--r-- | hw/pl110.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/pl110.c b/hw/pl110.c index 16de16c0dd..92a7e0bb6a 100644 --- a/hw/pl110.c +++ b/hw/pl110.c @@ -29,7 +29,6 @@ typedef struct { DisplayState *ds; /* The Versatile/PB uses a slightly modified PL110 controller. */ int versatile; - void *pic; uint32_t timing[4]; uint32_t cr; uint32_t upbase; @@ -42,7 +41,7 @@ typedef struct { int invalidate; uint32_t pallette[256]; uint32_t raw_pallette[128]; - int irq; + qemu_irq irq; } pl110_state; static const unsigned char pl110_id[] = @@ -399,7 +398,7 @@ static CPUWriteMemoryFunc *pl110_writefn[] = { pl110_write }; -void *pl110_init(DisplayState *ds, uint32_t base, void *pic, int irq, +void *pl110_init(DisplayState *ds, uint32_t base, qemu_irq irq, int versatile) { pl110_state *s; @@ -412,7 +411,6 @@ void *pl110_init(DisplayState *ds, uint32_t base, void *pic, int irq, s->base = base; s->ds = ds; s->versatile = versatile; - s->pic = pic; s->irq = irq; graphic_console_init(ds, pl110_update_display, pl110_invalidate_display, NULL, s); |