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.h | |
| 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.h')
| -rw-r--r-- | hw/sh.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -28,8 +28,8 @@ int sh7750_register_io_device(struct SH7750State *s, #define TMU012_FEAT_3CHAN (1 << 1) #define TMU012_FEAT_EXTCLK (1 << 2) void tmu012_init(target_phys_addr_t base, int feat, uint32_t freq, - struct intc_source *ch0_irq, struct intc_source *ch1_irq, - struct intc_source *ch2_irq0, struct intc_source *ch2_irq1); + qemu_irq ch0_irq, qemu_irq ch1_irq, + qemu_irq ch2_irq0, qemu_irq ch2_irq1); /* sh_serial.c */ |