diff options
author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-26 14:52:02 +0000 |
---|---|---|
committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-26 14:52:02 +0000 |
commit | ded7ba9c75687710d4ca6f0501c403d9bfa84019 (patch) | |
tree | e79b6bd922415e10e928e2ec3dda8165a7eeaaa5 /hw/mips_malta.c | |
parent | ae2dbf7fb04194c367c3352f716715bb569602ed (diff) |
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
Diffstat (limited to 'hw/mips_malta.c')
-rw-r--r-- | hw/mips_malta.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 4d95fbfbff..ac6800f65f 100644 --- 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 |