[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Updated PCNet patch
From: |
Panagiotis Issaris |
Subject: |
[Qemu-devel] Updated PCNet patch |
Date: |
Fri, 12 Nov 2004 16:18:43 +0100 |
User-agent: |
Mozilla Thunderbird 0.8 (X11/20040926) |
Hi,
I've updated the PCNet patch to the current
CVS. Two hunks failed, but the fixes were
trivial.
With friendly regards,
Takis
--
------------------------------------------------------------------------
Panagiotis Issaris
Katholieke Universiteit Leuven
Division Production Engineering,
Machine Design and Automation
Celestijnenlaan 300B address@hidden
B-3001 Leuven Belgium http://www.mech.kuleuven.ac.be/pma
------------------------------------------------------------------------
Index: Makefile.target
===================================================================
RCS file: /cvsroot/qemu/qemu/Makefile.target,v
retrieving revision 1.46
diff -w -b -B -u -r1.46 Makefile.target
--- Makefile.target 11 Nov 2004 16:55:08 -0000 1.46
+++ Makefile.target 12 Nov 2004 15:12:33 -0000
@@ -299,7 +299,7 @@
# 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+= cirrus_vga.o mixeng.o
+VL_OBJS+= cirrus_vga.o mixeng.o pcnet.o
endif
ifeq ($(TARGET_ARCH), ppc)
VL_OBJS+= ppc.o ide.o ne2000.o pckbd.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
Index: vl.c
===================================================================
RCS file: /cvsroot/qemu/qemu/vl.c,v
retrieving revision 1.105
diff -w -b -B -u -r1.105 vl.c
--- vl.c 9 Nov 2004 23:08:30 -0000 1.105
+++ vl.c 12 Nov 2004 15:12:33 -0000
@@ -125,6 +125,7 @@
int sb16_enabled = 1;
int adlib_enabled = 1;
int gus_enabled = 1;
+int nic_pcnet = 0;
int pci_enabled = 1;
int prep_enabled = 0;
int rtc_utc = 1;
@@ -2508,6 +2509,7 @@
"-prep Simulate a PREP system (default is PowerMAC)\n"
"-g WxH[xDEPTH] Set the initial VGA graphic mode\n"
#endif
+ "-nic-pcnet simulate an AMD PC-Net PCI ethernet adaptor\n"
"\n"
"Network options:\n"
"-nics n simulate 'n' network cards [default=1]\n"
@@ -2614,6 +2616,7 @@
QEMU_OPTION_L,
QEMU_OPTION_no_code_copy,
QEMU_OPTION_pci,
+ QEMU_OPTION_nic_pcnet,
QEMU_OPTION_isa,
QEMU_OPTION_prep,
QEMU_OPTION_localtime,
@@ -2687,6 +2690,7 @@
/* temporary options */
{ "pci", 0, QEMU_OPTION_pci },
+ { "nic-pcnet", 0, QEMU_OPTION_nic_pcnet },
{ "cirrusvga", 0, QEMU_OPTION_cirrusvga },
{ NULL },
};
@@ -3024,6 +3028,9 @@
case QEMU_OPTION_pci:
pci_enabled = 1;
break;
+ case QEMU_OPTION_nic_pcnet:
+ nic_pcnet = 1;
+ break;
case QEMU_OPTION_isa:
pci_enabled = 0;
break;
Index: vl.h
===================================================================
RCS file: /cvsroot/qemu/qemu/vl.h,v
retrieving revision 1.60
diff -w -b -B -u -r1.60 vl.h
--- vl.h 9 Nov 2004 23:08:30 -0000 1.60
+++ vl.h 12 Nov 2004 15:12:33 -0000
@@ -596,6 +596,12 @@
void isa_ne2000_init(int base, int irq, NetDriverState *nd);
void pci_ne2000_init(PCIBus *bus, NetDriverState *nd);
+/* pcnet.c */
+
+extern int nic_pcnet;
+
+void pci_pcnet_init(PCIBus *bus, NetDriverState *nd);
+
/* pckbd.c */
void kbd_init(void);
Index: hw/pc.c
===================================================================
RCS file: /cvsroot/qemu/qemu/hw/pc.c,v
retrieving revision 1.32
diff -w -b -B -u -r1.32 pc.c
--- hw/pc.c 9 Nov 2004 23:08:30 -0000 1.32
+++ hw/pc.c 12 Nov 2004 15:12:33 -0000
@@ -534,6 +534,9 @@
if (pci_enabled) {
for(i = 0; i < nb_nics; i++) {
+ if (nic_pcnet)
+ pci_pcnet_init(pci_bus, &nd_table[i]);
+ else
pci_ne2000_init(pci_bus, &nd_table[i]);
}
pci_piix3_ide_init(pci_bus, bs_table);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] Updated PCNet patch,
Panagiotis Issaris <=