[SOS] Remise à jour du patch pour qemu.

Christophe Lucas clucas at rotomalug.org
Mar 24 Mai 17:05:56 CEST 2005


Voilà :)
-- 
	~Christophe

Star Trek Lives!
-------------- section suivante --------------
diff -urpN qemu-0.7.0/hw/pc.c qemu-0.7.0-clucas/hw/pc.c
--- qemu-0.7.0/hw/pc.c	2005-04-27 22:52:05.000000000 +0200
+++ qemu-0.7.0-clucas/hw/pc.c	2005-05-24 16:56:05.915556312 +0200
@@ -586,6 +586,7 @@ void pc_init(int ram_size, int vga_ram_s
     }
 
     floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);
+    port_e9_init();
 
     cmos_init(ram_size, boot_device, bs_table);
 
diff -urpN qemu-0.7.0/Makefile.target qemu-0.7.0-clucas/Makefile.target
--- qemu-0.7.0/Makefile.target	2005-04-27 22:52:05.000000000 +0200
+++ qemu-0.7.0-clucas/Makefile.target	2005-05-24 16:55:40.465425320 +0200
@@ -340,7 +340,7 @@ endif
 ifeq ($(TARGET_BASE_ARCH), i386)
 # Hardware support
 VL_OBJS+= ide.o ne2000.o pckbd.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
-VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o
+VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o port-e9.o
 VL_OBJS+= cirrus_vga.o mixeng.o apic.o parallel.o
 endif
 ifeq ($(TARGET_ARCH), ppc)
diff -urpN qemu-0.7.0/port-e9.c qemu-0.7.0-clucas/port-e9.c
--- qemu-0.7.0/port-e9.c	1970-01-01 01:00:00.000000000 +0100
+++ qemu-0.7.0-clucas/port-e9.c	2005-05-24 16:56:36.582894168 +0200
@@ -0,0 +1,39 @@
+/*
+ * QEMU Port 0xe9 hack
+ * 
+ * Copyright (c) 2000-2004 E. Marty, the bochs team, D. Decotigny
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdio.h>
+#include <unistd.h>
+#include <inttypes.h>
+
+#include "vl.h"
+
+static void bochs_e9_write(void *opaque, uint32_t address, uint32_t data)
+{
+  write(fileno(stdout), &data, 1);
+}
+
+void port_e9_init ()
+{
+   register_ioport_write(0xe9, 1, 1, bochs_e9_write, NULL);
+}
+
diff -urpN qemu-0.7.0/vl.h qemu-0.7.0-clucas/vl.h
--- qemu-0.7.0/vl.h	2005-04-27 22:52:05.000000000 +0200
+++ qemu-0.7.0-clucas/vl.h	2005-05-24 16:57:02.712921800 +0200
@@ -832,4 +832,5 @@ const char *readline_get_history(unsigne
 void readline_start(const char *prompt, int is_password,
                     ReadLineFunc *readline_func, void *opaque);
 
+void port_e9_init(void);
 #endif /* VL_H */


Plus d'informations sur la liste de diffusion Sos