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/m48t59.c | |
| parent | b6e27ab8b12ef6075d85fc505f821643804a3a79 (diff) | |
| download | qemu-d537cf6c8624b27ce2b63431d2f8937f6356f652.tar.gz qemu-d537cf6c8624b27ce2b63431d2f8937f6356f652.tar.bz2 qemu-d537cf6c8624b27ce2b63431d2f8937f6356f652.zip | |
Unify IRQ handling.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2635 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/m48t59.c')
| -rw-r--r-- | hw/m48t59.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/m48t59.c b/hw/m48t59.c index daa1c524db..1c61401c52 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -41,7 +41,7 @@ struct m48t59_t { /* Model parameters */ int type; // 8 = m48t08, 59 = m48t59 /* Hardware parameters */ - int IRQ; + qemu_irq IRQ; int mem_index; uint32_t mem_base; uint32_t io_base; @@ -100,7 +100,7 @@ static void alarm_cb (void *opaque) uint64_t next_time; m48t59_t *NVRAM = opaque; - pic_set_irq(NVRAM->IRQ, 1); + qemu_set_irq(NVRAM->IRQ, 1); if ((NVRAM->buffer[0x1FF5] & 0x80) == 0 && (NVRAM->buffer[0x1FF4] & 0x80) == 0 && (NVRAM->buffer[0x1FF3] & 0x80) == 0 && @@ -137,7 +137,7 @@ static void alarm_cb (void *opaque) next_time = 1 + mktime(&tm_now); } qemu_mod_timer(NVRAM->alrm_timer, next_time * 1000); - pic_set_irq(NVRAM->IRQ, 0); + qemu_set_irq(NVRAM->IRQ, 0); } @@ -173,8 +173,8 @@ static void watchdog_cb (void *opaque) /* May it be a hw CPU Reset instead ? */ qemu_system_reset_request(); } else { - pic_set_irq(NVRAM->IRQ, 1); - pic_set_irq(NVRAM->IRQ, 0); + qemu_set_irq(NVRAM->IRQ, 1); + qemu_set_irq(NVRAM->IRQ, 0); } } @@ -576,7 +576,7 @@ static CPUReadMemoryFunc *nvram_read[] = { }; /* Initialisation routine */ -m48t59_t *m48t59_init (int IRQ, target_ulong mem_base, +m48t59_t *m48t59_init (qemu_irq IRQ, target_ulong mem_base, uint32_t io_base, uint16_t size, int type) { |