[Freedos-cvs] kernel/kernel initdisk.c,1.33.2.2,1.33.2.3

[Kenneth D. <per...@us...>]

Update of /cvsroot/freedos/kernel/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1014/kernel

Modified Files:
      Tag: UNSTABLE
	initdisk.c 
Log Message:
simpler output in case of unpartitioned disks (don't repeat error messages)

Index: initdisk.c
===================================================================
RCS file: /cvsroot/freedos/kernel/kernel/initdisk.c,v
retrieving revision 1.33.2.2
retrieving revision 1.33.2.3
diff -u -d -r1.33.2.2 -r1.33.2.3
--- initdisk.c	9 Jan 2005 11:25:44 -0000	1.33.2.2
+++ initdisk.c	29 Jan 2005 20:21:56 -0000	1.33.2.3
@@ -149,13 +149,7 @@
  * CHS or LBA, strengthening its role as a rescue environment.
  */
 
-/* #define DEBUG */
-
-#if defined(DEBUG)
-#define DebugPrintf(x) printf x
-#else
-#define DebugPrintf(x)
-#endif
+#include "debug.h"
 
 #define LBA_to_CHS   init_LBA_to_CHS
 
@@ -1029,6 +1023,15 @@
 }
 
 /* Load the Partition Tables and get information on all drives */
+/* If scanType != SCAN_EXTENDED then we return with the
+   lower four bits set (valid partition, drive added) or clear
+   (unhandled or invalid) for each partition entry in the 
+   partition table, or 0 when scanType == SCAN_EXTENDED.
+   If we are unable to obtain the disk parameters for drive,
+   then we return -1 (usually means BIOS returned a count
+   higher than drives that exists; ISOLINUX may do this and
+   from RBIL may occur in some BIOSes).
+ */
 int ProcessDisk(int scanType, unsigned drive, int PartitionsToIgnore)
 {
 
@@ -1047,8 +1050,9 @@
 
   if (!LBA_Get_Drive_Parameters(drive, &driveParam))
   {
-    printf("can't get drive parameters for drive %02x\n", drive);
-    return PartitionsToIgnore;
+    if (scanType == SCAN_PRIMARYBOOT) /* only display 1st time through */
+      printf("can't get drive parameters for drive %02x\n", drive);
+    return -1;
   }
 
   RelSectorOffset = 0;          /* boot sector */
@@ -1079,7 +1083,10 @@
     if (++strangeHardwareLoop < 3)
       goto strange_restart;
 
-    printf("illegal partition table - drive %02x sector %lu\n", drive,
+    if (scanType == SCAN_PRIMARYBOOT) /* only display 1st time through */
+      printf("corrupt or unpartitioned drive %02x\n", drive);
+    else if (RelSectorOffset /* && (scanType == SCAN_EXTENDED) */)
+      printf("illegal extended partition table - drive %02x sector %lu\n", drive,
            RelSectorOffset);
     return PartitionsToIgnore;
   }
@@ -1316,6 +1323,9 @@
         foundPartitions[HardDrive] =
             ProcessDisk(SCAN_PRIMARY, HardDrive, 0);
     }
+    /* ignore last drive if can't get info about it; can't use anyway */
+    if ((nHardDisk>1) && (foundPartitions[nHardDisk-1]==(UBYTE)-1))
+      nHardDisk--;
 
     /* Process extended partition table                      */
     for (HardDrive = 0; HardDrive < nHardDisk; HardDrive++)
@@ -1357,6 +1367,9 @@
           foundPartitions[HardDrive] =
             ProcessDisk(SCAN_PRIMARY, HardDrive, 0);
       }
+      /* ignore last drive if can't get info about it; can't use anyway */
+      if ((nHardDisk>1) && (foundPartitions[nHardDisk-1]==(UBYTE)-1))
+        nHardDisk--;
 
       /* Process extended partition table                      */
       ProcessDisk(SCAN_EXTENDED, HardDrive, 0);