From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GcPPG-0000Z6-Tz for qemu-devel@nongnu.org; Tue, 24 Oct 2006 12:45:39 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GcPP2-00009I-4Z for qemu-devel@nongnu.org; Tue, 24 Oct 2006 12:45:38 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GcPP1-00009C-Tr for qemu-devel@nongnu.org; Tue, 24 Oct 2006 12:45:23 -0400 Received: from [82.232.2.251] (helo=farad.aurel32.net) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1GcPP1-0005xo-NZ for qemu-devel@nongnu.org; Tue, 24 Oct 2006 12:45:24 -0400 Date: Tue, 24 Oct 2006 18:41:28 +0200 From: Aurelien Jarno Message-ID: <20061024164128.GA8249@bode.aurel32.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="TB36FDmn/VVEgNH/" Content-Disposition: inline Subject: [Qemu-devel] [PATCH] QEMU: IDE support for mips 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 Cc: linux-mips@linux-mips.org --TB36FDmn/VVEgNH/ Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Hi, The attached patch adds IDE support on the mips target. It has been written by Daniel Jacobowitz, and posted on linux-mips@linux-mips.org, along with another patch. He told me it is ok to submit it. I am using it for a week, it works correctly. Could you apply it? Thanks, Aurelien -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net --TB36FDmn/VVEgNH/ Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename="mips-qemu-ide.patch" Index: Makefile.target =================================================================== RCS file: /sources/qemu/qemu/Makefile.target,v retrieving revision 1.130 diff -u -d -p -r1.130 Makefile.target --- Makefile.target 22 Oct 2006 00:18:54 -0000 1.130 +++ Makefile.target 24 Oct 2006 04:58:51 -0000 @@ -357,8 +357,8 @@ VL_OBJS+= grackle_pci.o prep_pci.o unin_ DEFINES += -DHAS_AUDIO endif ifeq ($(TARGET_ARCH), mips) -VL_OBJS+= mips_r4k.o dma.o vga.o serial.o i8254.o i8259.o -#VL_OBJS+= #ide.o pckbd.o fdc.o m48t59.o +VL_OBJS+= mips_r4k.o dma.o vga.o serial.o i8254.o i8259.o ide.o +#VL_OBJS+= #pckbd.o fdc.o m48t59.o endif ifeq ($(TARGET_BASE_ARCH), sparc) ifeq ($(TARGET_ARCH), sparc64) Index: hw/mips_r4k.c =================================================================== RCS file: /sources/qemu/qemu/hw/mips_r4k.c,v retrieving revision 1.20 diff -u -d -p -r1.20 mips_r4k.c --- hw/mips_r4k.c 18 Sep 2006 01:15:29 -0000 1.20 +++ hw/mips_r4k.c 24 Oct 2006 04:58:51 -0000 @@ -7,6 +7,10 @@ #define VIRT_TO_PHYS_ADDEND (-0x80000000LL) +static const int ide_iobase[2] = { 0x1f0, 0x170 }; +static const int ide_iobase2[2] = { 0x3f6, 0x376 }; +static const int ide_irq[2] = { 14, 15 }; + extern FILE *logfile; static PITState *pit; @@ -118,6 +122,7 @@ void mips_r4k_init (int ram_size, int vg int ret; CPUState *env; long kernel_size; + int i; env = cpu_init(); register_savevm("cpu", 0, 3, cpu_save, cpu_load, env); @@ -198,6 +203,10 @@ void mips_r4k_init (int ram_size, int vg exit (1); } } + + for(i = 0; i < 2; i++) + isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i], + bs_table[2 * i], bs_table[2 * i + 1]); } QEMUMachine mips_machine = { --TB36FDmn/VVEgNH/--