From 4e7ed2d1d396feac872c727a0700fdb5a86641e2 Mon Sep 17 00:00:00 2001 From: aurel32 Date: Fri, 21 Nov 2008 21:06:51 +0000 Subject: 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 --- hw/sh.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'hw/sh.h') diff --git a/hw/sh.h b/hw/sh.h index 800b2a1e3f..15c58cb91c 100644 --- a/hw/sh.h +++ b/hw/sh.h @@ -36,11 +36,11 @@ void tmu012_init(target_phys_addr_t base, int feat, uint32_t freq, #define SH_SERIAL_FEAT_SCIF (1 << 0) void sh_serial_init (target_phys_addr_t base, int feat, uint32_t freq, CharDriverState *chr, - struct intc_source *eri_source, - struct intc_source *rxi_source, - struct intc_source *txi_source, - struct intc_source *tei_source, - struct intc_source *bri_source); + qemu_irq eri_source, + qemu_irq rxi_source, + qemu_irq txi_source, + qemu_irq tei_source, + qemu_irq bri_source); /* tc58128.c */ int tc58128_init(struct SH7750State *s, const char *zone1, const char *zone2); -- cgit v1.2.3