commit 3bbcc14d946b9d77d6fe77a6d970da9ff6b37dc5
author Kevin O'Connor <kevin@koconnor.net> Sun Apr 13 17:07:33 2008 -0400
committer Kevin O'Connor <kevin@koconnor.net> Sun Apr 13 17:07:33 2008 -0400
tree 5e1028664a4eb44c03971a80a4ca966eab050dbf
parent 109432efbb357fcea3727a054be421fd92506609

Move floppy setup code from post.c to floppy.c.

src/post.c

diff --git a/src/post.c b/src/post.c
index bb69ed1..f8a3de9 100644
--- a/src/post.c
+++ b/src/post.c
@@ -11,8 +11,9 @@
 #include "cmos.h" // CMOS_*
 #include "util.h" // memset
 #include "biosvar.h" // struct bios_data_area_s
-#include "ata.h"
-#include "kbd.h"
+#include "ata.h" // ata_detect
+#include "kbd.h" // kbd_setup
+#include "disk.h" // floppy_drive_setup
 
 #define bda ((struct bios_data_area_s *)MAKE_FARPTR(SEG_BDA, 0))
 #define ebda ((struct extended_bios_data_area_s *)MAKE_FARPTR(SEG_EBDA, 0))
@@ -62,6 +63,8 @@
     SET_BDA(ivecs[0x74].offset, OFFSET_entry_74);
     SET_BDA(ivecs[0x75].offset, OFFSET_entry_75);
     SET_BDA(ivecs[0x10].offset, OFFSET_entry_10);
+
+    SET_BDA(ivecs[0x1E].offset, OFFSET_diskette_param_table2);
 }
 
 static void
@@ -181,21 +184,6 @@
 }
 
 static void
-floppy_drive_post()
-{
-    u8 type = inb_cmos(CMOS_FLOPPY_DRIVE_TYPE);
-    u8 out = 0;
-    if (type & 0xf0)
-        out |= 0x07;
-    if (type & 0x0f)
-        out |= 0x70;
-    SET_BDA(floppy_harddisk_info, out);
-    outb(0x02, PORT_DMA1_MASK_REG);
-
-    SET_BDA(ivecs[0x1E].offset, OFFSET_diskette_param_table2);
-}
-
-static void
 ata_init()
 {
     // hdidmap  and cdidmap init.
@@ -373,7 +361,7 @@
 
     rombios32_init();
 
-    floppy_drive_post();
+    floppy_drive_setup();
     hard_drive_post();
     if (CONFIG_ATA) {
         ata_init();