diff options
author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-21 21:06:42 +0000 |
---|---|---|
committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-21 21:06:42 +0000 |
commit | 96e2fc41a94f190994dfb56d47d609a658bfe67c (patch) | |
tree | 07bb16d585c39d29d4006830ebc2b5a3e7e0133d /hw/sh_intc.c | |
parent | 380ce5ba932724aa2bb2b8564ee4cc47cea15570 (diff) | |
download | qemu-96e2fc41a94f190994dfb56d47d609a658bfe67c.zip qemu-96e2fc41a94f190994dfb56d47d609a658bfe67c.tar.gz qemu-96e2fc41a94f190994dfb56d47d609a658bfe67c.tar.bz2 |
SH4: Use qemu_irq in timer emulation.
* hw/sh.h (tmu012_init): Accept qemu_irq, not intc_source.
* hw/sh7750.c (sh7750_init): Pass qemu_irq to tmu012_init.
* hw/sh_intc.c (sh_intc_set_irq): New.
(sh_intc_init): Allocate irqs.
* hw/sh_intc.h (struct intc_desc): New field irqs.
* hw/sh_timer.c (sh_timer_state): Use qemu_irq, not intc_source.
(sh_timer_update): Use qemu_set_irq, not sh_intc_toggle_source.
(sh_timer_init, tmu012_init): Adjust.
(Vladimir Prus)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5768 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/sh_intc.c')
-rw-r--r-- | hw/sh_intc.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/sh_intc.c b/hw/sh_intc.c index 8d1674a..3c6809a 100644 --- a/hw/sh_intc.c +++ b/hw/sh_intc.c @@ -73,6 +73,14 @@ void sh_intc_toggle_source(struct intc_source *source, } } +void sh_intc_set_irq (void *opaque, int n, int level) +{ + struct intc_desc *desc = opaque; + struct intc_source *source = &(desc->sources[n]); + + sh_intc_toggle_source(source, 0, level ? 1 : -1); +} + int sh_intc_get_pending_vector(struct intc_desc *desc, int imask) { unsigned int i; @@ -428,6 +436,8 @@ int sh_intc_init(struct intc_desc *desc, source->parent = desc; } + + desc->irqs = qemu_allocate_irqs(sh_intc_set_irq, desc, nr_sources); desc->iomemtype = cpu_register_io_memory(0, sh_intc_readfn, sh_intc_writefn, desc); |