Merge pull request #1753 from ghaerr/cmos

[direct floppy] Assume 360k floppy if no CMOS drives set
ghaerr · Oct 9, 2023 · 5f5f53d · 5f5f53d
2 parents 316cf0b + 41031d4
commit 5f5f53d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/elks/arch/i86/drivers/block/directfd.c b/elks/arch/i86/drivers/block/directfd.c
@@ -1276,8 +1276,8 @@ static unsigned char * INITPROC find_base(int drive, int type)
 static void INITPROC config_types(void)
 {
     printk("df: CMOS ");
-    base_type[0] = find_base(0, (CMOS_READ(0x10) >> 4) & 0xF);
-    //base_type[0] = find_base(0, CMOS_360k);   /* force 360k FIXME add setup table */
+    if (!(base_type[0] = find_base(0, (CMOS_READ(0x10) >> 4) & 0xF)))
+        base_type[0] = find_base(0, CMOS_360k);   /* use 360k if no CMOS */
     if (((CMOS_READ(0x14) >> 6) & 1) != 0) {
         printk(", ");
         base_type[1] = find_base(1, CMOS_READ(0x10) & 0xF);