added NE2000 (Ralf Baechle)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1475 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile.target b/Makefile.target
index ade079f8570142c9363de915ce88724ee473ef02..9bc08731b4dcc342ed26d73e40402aff200ea403 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -360,7 +360,7 @@ VL_OBJS+= mc146818rtc.o serial.o i8259.o i8254.o fdc.o m48t59.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.o mips_r4k.o dma.o vga.o serial.o #ide.o ne2000.o pckbd.o
+VL_OBJS+= mips.o mips_r4k.o dma.o vga.o serial.o ne2000.o #ide.o pckbd.o
 VL_OBJS+= #i8259.o i8254.o fdc.o m48t59.o
 endif
 ifeq ($(TARGET_BASE_ARCH), sparc)

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 1deda148864ecac4300c3a2785baed1b9b9bd358..44f1ba4fcaf73cf8f7e761c4a95235d565bb9922 100644 (file)
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -298,6 +298,8 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
     serial_init(0x3f8, 4, serial_hds[0]);
     vga_initialize(NULL, ds, phys_ram_base + ram_size, ram_size, 
                    vga_ram_size);
+
+    isa_ne2000_init(0x300, 9, &nd_table[0]);
 }
 
 QEMUMachine mips_machine = {