Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Keucr-0001hr-B9 for qemu-devel@nongnu.org; Sun, 14 Sep 2008 12:39:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Keucq-0001hJ-4p for qemu-devel@nongnu.org; Sun, 14 Sep 2008 12:39:04 -0400 Received: from [199.232.76.173] (port=42046 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Keucp-0001hC-TM for qemu-devel@nongnu.org; Sun, 14 Sep 2008 12:39:03 -0400 Received: from hall.aurel32.net ([91.121.138.14]:57395) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Keucp-0008Gq-Ef for qemu-devel@nongnu.org; Sun, 14 Sep 2008 12:39:03 -0400 Received: from volta.aurel32.net ([2002:52e8:2fb:1:21e:8cff:feb0:693b]) by hall.aurel32.net with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1Keucn-0007B6-CK for qemu-devel@nongnu.org; Sun, 14 Sep 2008 18:39:01 +0200 Received: from aurel32 by volta.aurel32.net with local (Exim 4.69) (envelope-from ) id 1Keucm-0001a2-GQ for qemu-devel@nongnu.org; Sun, 14 Sep 2008 18:39:00 +0200 Date: Sun, 14 Sep 2008 18:39:00 +0200 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] MIPS: remove empty cpu_mips_irqctrl_init() Message-ID: <20080914163900.GD22422@volta.aurel32.net> References: <48C27F4B.7010404@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <48C27F4B.7010404@reactos.org> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org On Sat, Sep 06, 2008 at 03:02:03PM +0200, Hervé Poussineau wrote: > Hi, > > cpu_mips_irqctrl_init() function in hw/mips_timer.c is empty. > Attached patch removes it, and its callers. Applied, thanks. > Hervé > Index: hw/mips.h > =================================================================== > --- hw/mips.h (revision 5171) > +++ hw/mips.h (working copy) > @@ -25,7 +25,6 @@ > > /* mips_timer.c */ > extern void cpu_mips_clock_init(CPUState *); > -extern void cpu_mips_irqctrl_init (void); > > /* rc4030.c */ > qemu_irq *rc4030_init(qemu_irq timer, qemu_irq jazz_bus); > Index: hw/mips_malta.c > =================================================================== > --- hw/mips_malta.c (revision 5171) > +++ hw/mips_malta.c (working copy) > @@ -878,7 +878,6 @@ > /* Init internal devices */ > cpu_mips_irq_init_cpu(env); > cpu_mips_clock_init(env); > - cpu_mips_irqctrl_init(); > > /* Interrupt controller */ > /* The 8259 is attached to the MIPS CPU INT0 pin, ie interrupt 2 */ > Index: hw/mips_mipssim.c > =================================================================== > --- hw/mips_mipssim.c (revision 5171) > +++ hw/mips_mipssim.c (working copy) > @@ -165,7 +165,6 @@ > /* Init CPU internal devices. */ > cpu_mips_irq_init_cpu(env); > cpu_mips_clock_init(env); > - cpu_mips_irqctrl_init(); > > /* Register 64 KB of ISA IO space at 0x1fd00000. */ > isa_mmio_init(0x1fd00000, 0x00010000); > Index: hw/mips_r4k.c > =================================================================== > --- hw/mips_r4k.c (revision 5171) > +++ hw/mips_r4k.c (working copy) > @@ -225,7 +225,6 @@ > /* Init CPU internal devices */ > cpu_mips_irq_init_cpu(env); > cpu_mips_clock_init(env); > - cpu_mips_irqctrl_init(); > > /* The PIC is attached to the MIPS CPU INT0 pin */ > i8259 = i8259_init(env->irq[2]); > Index: hw/mips_timer.c > =================================================================== > --- hw/mips_timer.c (revision 5171) > +++ hw/mips_timer.c (working copy) > @@ -4,10 +4,6 @@ > > #define TIMER_FREQ 100 * 1000 * 1000 > > -void cpu_mips_irqctrl_init (void) > -{ > -} > - > /* XXX: do not use a global */ > uint32_t cpu_mips_get_random (CPUState *env) > { > Index: target-mips/exec.h > =================================================================== > --- target-mips/exec.h (revision 5171) > +++ target-mips/exec.h (working copy) > @@ -33,7 +33,6 @@ > void do_raise_exception_err (uint32_t exception, int error_code); > void do_raise_exception (uint32_t exception); > > -void cpu_mips_irqctrl_init (void); > uint32_t cpu_mips_get_random (CPUState *env); > uint32_t cpu_mips_get_count (CPUState *env); > void cpu_mips_store_count (CPUState *env, uint32_t value); -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net