diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-21 21:06:51 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-21 21:06:51 +0000 |
| commit | 4e7ed2d1d396feac872c727a0700fdb5a86641e2 (patch) | |
| tree | ab22dca8472cd9b31521d801ce8fdab23c44dfb5 /hw/sh7750.c | |
| parent | 96e2fc41a94f190994dfb56d47d609a658bfe67c (diff) | |
| download | focaccia-qemu-4e7ed2d1d396feac872c727a0700fdb5a86641e2.tar.gz focaccia-qemu-4e7ed2d1d396feac872c727a0700fdb5a86641e2.zip | |
SH4: Switch serial emulation to qemu_irq
This patches makes SH serial emulation use qemu_irq in its interface.
* hw/sh.h (sh_serial_init): Take qemu_irq, not intc_source.
* hw/sh7750.c (sh7750_init): Adjust.
* hw/sh_intc.c (sh_intc_set_irq): Don't assert or deassert
irq more than once.
* hw/sh_serial.c (sh_serial_state): Use qemu_irq, not intc_source.
(sh_serial_clear_fifo, sh_serial_ioport_write)
(sh_serial_receive_byte): Adjust.
(sh_serial_init): Take qemu_irq, not intc_source.
(Vladimir Prus)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5769 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/sh7750.c')
| -rw-r--r-- | hw/sh7750.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/hw/sh7750.c b/hw/sh7750.c index f04d13a6f6..33e733704e 100644 --- a/hw/sh7750.c +++ b/hw/sh7750.c @@ -662,18 +662,18 @@ SH7750State *sh7750_init(CPUSH4State * cpu) cpu->intc_handle = &s->intc; sh_serial_init(0x1fe00000, 0, s->periph_freq, serial_hds[0], - sh_intc_source(&s->intc, SCI1_ERI), - sh_intc_source(&s->intc, SCI1_RXI), - sh_intc_source(&s->intc, SCI1_TXI), - sh_intc_source(&s->intc, SCI1_TEI), + s->intc.irqs[SCI1_ERI], + s->intc.irqs[SCI1_RXI], + s->intc.irqs[SCI1_TXI], + s->intc.irqs[SCI1_TEI], NULL); sh_serial_init(0x1fe80000, SH_SERIAL_FEAT_SCIF, s->periph_freq, serial_hds[1], - sh_intc_source(&s->intc, SCIF_ERI), - sh_intc_source(&s->intc, SCIF_RXI), - sh_intc_source(&s->intc, SCIF_TXI), + s->intc.irqs[SCIF_ERI], + s->intc.irqs[SCIF_RXI], + s->intc.irqs[SCIF_TXI], NULL, - sh_intc_source(&s->intc, SCIF_BRI)); + s->intc.irqs[SCIF_BRI]); tmu012_init(0x1fd80000, TMU012_FEAT_TOCR | TMU012_FEAT_3CHAN | TMU012_FEAT_EXTCLK, |