From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JKBBk-0004K3-7f for qemu-devel@nongnu.org; Wed, 30 Jan 2008 06:33:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JKBBj-0004Jd-H9 for qemu-devel@nongnu.org; Wed, 30 Jan 2008 06:33:07 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JKBBj-0004JY-Ei for qemu-devel@nongnu.org; Wed, 30 Jan 2008 06:33:07 -0500 Received: from smtp7-g19.free.fr ([212.27.42.64]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JKBBj-00005E-0n for qemu-devel@nongnu.org; Wed, 30 Jan 2008 06:33:07 -0500 Received: from smtp7-g19.free.fr (localhost [127.0.0.1]) by smtp7-g19.free.fr (Postfix) with ESMTP id 4CC8E3227F7 for ; Wed, 30 Jan 2008 12:32:54 +0100 (CET) Received: from [127.0.0.1] (rob92-4-82-225-201-66.fbx.proxad.net [82.225.201.66]) by smtp7-g19.free.fr (Postfix) with ESMTP id 01ACB32286B for ; Wed, 30 Jan 2008 12:32:53 +0100 (CET) Message-ID: <47A06064.7060101@reactos.org> Date: Wed, 30 Jan 2008 12:32:52 +0100 From: =?ISO-8859-1?Q?Herv=E9_Poussineau?= MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------040802070708070805080202" Subject: [Qemu-devel] [PATCH] Remove broken MIPS PICA 61 machine 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 This is a multi-part message in MIME format. --------------040802070708070805080202 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Hi, This patch removes the MIPS Pica 61 machine and the RTC memory-mapped=20 interface. Those don't work. I didn't know how to do a patch which removes the file hw/mips_pica61.c,=20 so this file will have to be removed manually by the committer. Herv=E9 --------------040802070708070805080202 Content-Type: text/plain; name="remove_pica61.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="remove_pica61.diff" Index: Makefile.target =================================================================== RCS file: /sources/qemu/qemu/Makefile.target,v retrieving revision 1.240 diff -u -r1.240 Makefile.target --- Makefile.target 14 Jan 2008 22:09:11 -0000 1.240 +++ Makefile.target 30 Jan 2008 07:58:33 -0000 @@ -470,7 +470,7 @@ VL_OBJS+= pflash_cfi02.o ppc4xx_devs.o ppc405_uc.o ppc405_boards.o endif ifeq ($(TARGET_BASE_ARCH), mips) -VL_OBJS+= mips_r4k.o mips_malta.o mips_pica61.o mips_mipssim.o +VL_OBJS+= mips_r4k.o mips_malta.o mips_mipssim.o VL_OBJS+= mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o VL_OBJS+= jazz_led.o VL_OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o Index: vl.c =================================================================== RCS file: /sources/qemu/qemu/vl.c,v retrieving revision 1.401 diff -u -r1.401 vl.c --- vl.c 23 Jan 2008 19:01:12 -0000 1.401 +++ vl.c 30 Jan 2008 10:20:28 -0000 @@ -7935,7 +7935,6 @@ #elif defined(TARGET_MIPS) qemu_register_machine(&mips_machine); qemu_register_machine(&mips_malta_machine); - qemu_register_machine(&mips_pica61_machine); qemu_register_machine(&mips_mipssim_machine); #elif defined(TARGET_SPARC) #ifdef TARGET_SPARC64 Index: hw/boards.h =================================================================== RCS file: /sources/qemu/qemu/hw/boards.h,v retrieving revision 1.7 diff -u -r1.7 boards.h --- hw/boards.h 28 Dec 2007 20:59:23 -0000 1.7 +++ hw/boards.h 30 Jan 2008 07:58:21 -0000 @@ -39,9 +39,6 @@ /* mips_malta.c */ extern QEMUMachine mips_malta_machine; -/* mips_pica61.c */ -extern QEMUMachine mips_pica61_machine; - /* mips_mipssim.c */ extern QEMUMachine mips_mipssim_machine; Index: hw/mc146818rtc.c =================================================================== RCS file: /sources/qemu/qemu/hw/mc146818rtc.c,v retrieving revision 1.16 diff -u -r1.16 mc146818rtc.c --- hw/mc146818rtc.c 16 Dec 2007 23:41:11 -0000 1.16 +++ hw/mc146818rtc.c 30 Jan 2008 07:59:35 -0000 @@ -496,110 +496,3 @@ register_savevm("mc146818rtc", base, 1, rtc_save, rtc_load, s); return s; } - -/* Memory mapped interface */ -static uint32_t cmos_mm_readb (void *opaque, target_phys_addr_t addr) -{ - RTCState *s = opaque; - - return cmos_ioport_read(s, (addr - s->base) >> s->it_shift) & 0xFF; -} - -static void cmos_mm_writeb (void *opaque, - target_phys_addr_t addr, uint32_t value) -{ - RTCState *s = opaque; - - cmos_ioport_write(s, (addr - s->base) >> s->it_shift, value & 0xFF); -} - -static uint32_t cmos_mm_readw (void *opaque, target_phys_addr_t addr) -{ - RTCState *s = opaque; - uint32_t val; - - val = cmos_ioport_read(s, (addr - s->base) >> s->it_shift) & 0xFFFF; -#ifdef TARGET_WORDS_BIGENDIAN - val = bswap16(val); -#endif - return val; -} - -static void cmos_mm_writew (void *opaque, - target_phys_addr_t addr, uint32_t value) -{ - RTCState *s = opaque; -#ifdef TARGET_WORDS_BIGENDIAN - value = bswap16(value); -#endif - cmos_ioport_write(s, (addr - s->base) >> s->it_shift, value & 0xFFFF); -} - -static uint32_t cmos_mm_readl (void *opaque, target_phys_addr_t addr) -{ - RTCState *s = opaque; - uint32_t val; - - val = cmos_ioport_read(s, (addr - s->base) >> s->it_shift); -#ifdef TARGET_WORDS_BIGENDIAN - val = bswap32(val); -#endif - return val; -} - -static void cmos_mm_writel (void *opaque, - target_phys_addr_t addr, uint32_t value) -{ - RTCState *s = opaque; -#ifdef TARGET_WORDS_BIGENDIAN - value = bswap32(value); -#endif - cmos_ioport_write(s, (addr - s->base) >> s->it_shift, value); -} - -static CPUReadMemoryFunc *rtc_mm_read[] = { - &cmos_mm_readb, - &cmos_mm_readw, - &cmos_mm_readl, -}; - -static CPUWriteMemoryFunc *rtc_mm_write[] = { - &cmos_mm_writeb, - &cmos_mm_writew, - &cmos_mm_writel, -}; - -RTCState *rtc_mm_init(target_phys_addr_t base, int it_shift, qemu_irq irq) -{ - RTCState *s; - int io_memory; - - s = qemu_mallocz(sizeof(RTCState)); - if (!s) - return NULL; - - s->irq = irq; - s->cmos_data[RTC_REG_A] = 0x26; - s->cmos_data[RTC_REG_B] = 0x02; - s->cmos_data[RTC_REG_C] = 0x00; - s->cmos_data[RTC_REG_D] = 0x80; - s->base = base; - - rtc_set_date_from_host(s); - - s->periodic_timer = qemu_new_timer(vm_clock, - rtc_periodic_timer, s); - s->second_timer = qemu_new_timer(vm_clock, - rtc_update_second, s); - s->second_timer2 = qemu_new_timer(vm_clock, - rtc_update_second2, s); - - s->next_second_time = qemu_get_clock(vm_clock) + (ticks_per_sec * 99) / 100; - qemu_mod_timer(s->second_timer2, s->next_second_time); - - io_memory = cpu_register_io_memory(0, rtc_mm_read, rtc_mm_write, s); - cpu_register_physical_memory(base, 2 << it_shift, io_memory); - - register_savevm("mc146818rtc", base, 1, rtc_save, rtc_load, s); - return s; -} --------------040802070708070805080202--