Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1E4ars-0000EG-OR for qemu-devel@nongnu.org; Mon, 15 Aug 2005 05:02:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1E4arp-0000DC-8l for qemu-devel@nongnu.org; Mon, 15 Aug 2005 05:02:50 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1E4arn-00009F-Sy for qemu-devel@nongnu.org; Mon, 15 Aug 2005 05:02:48 -0400 Received: from [62.254.210.129] (helo=bacchus.net.dhis.org) by monty-python.gnu.org with esmtp (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.34) id 1E4b13-000725-Ro for qemu-devel@nongnu.org; Mon, 15 Aug 2005 05:12:22 -0400 Date: Mon, 15 Aug 2005 09:56:31 +0100 From: Ralf Baechle Message-ID: <20050815085631.GA7516@linux-mips.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH 2/3] Add i8259 PIT to MIPS Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fabrice Bellard , qemu-devel@nongnu.org Add i8259 PIT to the MIPS configuration. Not that the counter / compare interrupt isn't nicer but the i8259 unfortunately a common peripheral in MIPS systems and so it's probably a piece of code want just in case. Makefile.target | 4 ++-- hw/mips_r4k.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) Index: qemu-mips/hw/mips_r4k.c =================================================================== --- qemu-mips.orig/hw/mips_r4k.c +++ qemu-mips/hw/mips_r4k.c @@ -7,6 +7,8 @@ extern FILE *logfile; +static PITState *pit; + static void pic_irq_request(void *opaque, int level) { if (level) { @@ -242,6 +244,7 @@ void mips_r4k_init (int ram_size, int vg isa_mem_base = 0x10000000; isa_pic = pic_init(pic_irq_request, cpu_single_env); + pit = pit_init(0x40, 0); serial_init(0x3f8, 4, serial_hds[0]); vga_initialize(NULL, ds, phys_ram_base + ram_size, ram_size, vga_ram_size, 0, 0); Index: qemu-mips/Makefile.target =================================================================== --- qemu-mips.orig/Makefile.target +++ qemu-mips/Makefile.target @@ -295,8 +295,8 @@ VL_OBJS+= mc146818rtc.o serial.o i8259.o VL_OBJS+= ppc_prep.o ppc_chrp.o cuda.o adb.o openpic.o heathrow_pic.o mixeng.o endif ifeq ($(TARGET_ARCH), mips) -VL_OBJS+= mips_r4k.o dma.o vga.o serial.o ne2000.o i8259.o -#VL_OBJS+= #ide.o pckbd.o i8254.o fdc.o m48t59.o +VL_OBJS+= mips_r4k.o dma.o vga.o serial.o ne2000.o i8254.o i8259.o +#VL_OBJS+= #ide.o pckbd.o fdc.o m48t59.o endif ifeq ($(TARGET_BASE_ARCH), sparc) ifeq ($(TARGET_ARCH), sparc64)