Commit ded7ba9c75687710d4ca6f0501c403d9bfa84019
1 parent
ae2dbf7f
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
Showing
1 changed file
with
3 additions
and
4 deletions
hw/mips_malta.c
@@ -24,6 +24,7 @@ | @@ -24,6 +24,7 @@ | ||
24 | 24 | ||
25 | #include "hw.h" | 25 | #include "hw.h" |
26 | #include "pc.h" | 26 | #include "pc.h" |
27 | +#include "fdc.h" | ||
27 | #include "net.h" | 28 | #include "net.h" |
28 | #include "boards.h" | 29 | #include "boards.h" |
29 | #include "smbus.h" | 30 | #include "smbus.h" |
@@ -767,7 +768,7 @@ void mips_malta_init (int ram_size, int vga_ram_size, | @@ -767,7 +768,7 @@ void mips_malta_init (int ram_size, int vga_ram_size, | ||
767 | PCIBus *pci_bus; | 768 | PCIBus *pci_bus; |
768 | CPUState *env; | 769 | CPUState *env; |
769 | RTCState *rtc_state; | 770 | RTCState *rtc_state; |
770 | - /* fdctrl_t *floppy_controller; */ | 771 | + fdctrl_t *floppy_controller; |
771 | MaltaFPGAState *malta_fpga; | 772 | MaltaFPGAState *malta_fpga; |
772 | int ret; | 773 | int ret; |
773 | qemu_irq *i8259; | 774 | qemu_irq *i8259; |
@@ -882,9 +883,7 @@ void mips_malta_init (int ram_size, int vga_ram_size, | @@ -882,9 +883,7 @@ void mips_malta_init (int ram_size, int vga_ram_size, | ||
882 | serial_init(0x2f8, i8259[3], serial_hds[1]); | 883 | serial_init(0x2f8, i8259[3], serial_hds[1]); |
883 | if (parallel_hds[0]) | 884 | if (parallel_hds[0]) |
884 | parallel_init(0x378, i8259[7], parallel_hds[0]); | 885 | parallel_init(0x378, i8259[7], parallel_hds[0]); |
885 | - /* XXX: The floppy controller does not work correctly, something is | ||
886 | - probably wrong. | ||
887 | - floppy_controller = fdctrl_init(i8259[6], 2, 0, 0x3f0, fd_table); */ | 886 | + floppy_controller = fdctrl_init(i8259[6], 2, 0, 0x3f0, fd_table); |
888 | 887 | ||
889 | /* Sound card */ | 888 | /* Sound card */ |
890 | #ifdef HAS_AUDIO | 889 | #ifdef HAS_AUDIO |