From d7edfd27021b36c5ca065293e13639e139ddd5da Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Sun, 27 May 2007 16:37:49 +0000 Subject: Use qemu_irq between interrupt controller and timers git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2874 c046a42c-6fe2-441c-8c8c-71466251a162 --- vl.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'vl.h') diff --git a/vl.h b/vl.h index 0a13f26185..d6a76f6c9e 100644 --- a/vl.h +++ b/vl.h @@ -1230,10 +1230,10 @@ void tcx_init(DisplayState *ds, target_phys_addr_t addr, uint8_t *vram_base, int depth); /* slavio_intctl.c */ -void pic_set_irq_cpu(void *opaque, int irq, int level, unsigned int cpu); void *slavio_intctl_init(target_phys_addr_t addr, target_phys_addr_t addrg, const uint32_t *intbit_to_level, - qemu_irq **irq); + qemu_irq **irq, qemu_irq **cpu_irq, + unsigned int cputimer); void slavio_intctl_set_cpu(void *opaque, unsigned int cpu, CPUState *env); void slavio_pic_info(void *opaque); void slavio_irq_info(void *opaque); @@ -1247,8 +1247,7 @@ int load_aout(const char *filename, uint8_t *addr); int load_uboot(const char *filename, target_ulong *ep, int *is_linux); /* slavio_timer.c */ -void slavio_timer_init(target_phys_addr_t addr, int irq, int mode, - unsigned int cpu, void *intctl); +void slavio_timer_init(target_phys_addr_t addr, qemu_irq irq, int mode); /* slavio_serial.c */ SerialState *slavio_serial_init(target_phys_addr_t base, qemu_irq irq, -- cgit v1.2.3