From: Kevin O'Connor <kevin@koconnor.net>
Date: Mon, 26 Nov 2012 16:18:11 +0000 (-0500)
Subject: floppy: Allow floppy code to be used with coreboot.
X-Git-Tag: rel-1.7.2~42
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8b73b838de25aaf04ff0d397855b1eecd0443e98;p=seabios.git

floppy: Allow floppy code to be used with coreboot.

Allow coreboot users to enable the floppy support (via CBFS files
etc/floppy0 and etc/floppy1) on real hardware.  It is unknown if the
Bochs derived floppy controller support will work on real hardware,
but this option will make it easier for those wishing to test.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---

diff --git a/src/floppy.c b/src/floppy.c
index 3c8ae5a..f508559 100644
--- a/src/floppy.c
+++ b/src/floppy.c
@@ -126,7 +126,12 @@ floppy_setup(void)
     dprintf(3, "init floppy drives\n");
 
     if (CONFIG_COREBOOT) {
-        // XXX - disable floppies on coreboot for now.
+        u8 type = romfile_loadint("etc/floppy0", 0);
+        if (type)
+            addFloppy(0, type);
+        type = romfile_loadint("etc/floppy1", 0);
+        if (type)
+            addFloppy(1, type);
     } else {
         u8 type = inb_cmos(CMOS_FLOPPY_DRIVE_TYPE);
         if (type & 0xf0)