Add floppy support, tested to work with www.linux-mips.org GIT head.

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

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 4d95fbfbffed429a9431fd61f448a68e7ce3c3c9..ac6800f65ffc582689b702c38bd262048d390029 100644 (file)
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -24,6 +24,7 @@
 
 #include "hw.h"
 #include "pc.h"
+#include "fdc.h"
 #include "net.h"
 #include "boards.h"
 #include "smbus.h"
@@ -767,7 +768,7 @@ void mips_malta_init (int ram_size, int vga_ram_size,
     PCIBus *pci_bus;
     CPUState *env;
     RTCState *rtc_state;
-    /* fdctrl_t *floppy_controller; */
+    fdctrl_t *floppy_controller;
     MaltaFPGAState *malta_fpga;
     int ret;
     qemu_irq *i8259;
@@ -882,9 +883,7 @@ void mips_malta_init (int ram_size, int vga_ram_size,
         serial_init(0x2f8, i8259[3], serial_hds[1]);
     if (parallel_hds[0])
         parallel_init(0x378, i8259[7], parallel_hds[0]);
-    /* XXX: The floppy controller does not work correctly, something is
-       probably wrong.
-    floppy_controller = fdctrl_init(i8259[6], 2, 0, 0x3f0, fd_table); */
+    floppy_controller = fdctrl_init(i8259[6], 2, 0, 0x3f0, fd_table);
 
     /* Sound card */
 #ifdef HAS_AUDIO