Changeset 198 for trunk/src/os2ahci/os2ahci.c

Timestamp:

Nov 26, 2018, 3:15:43 PM (7 years ago)

Author:

David Azarewicz

Message:

Added Usable Disk option.

File:

• trunk/src/os2ahci/os2ahci.c (modified) (4 diffs)

trunk/src/os2ahci/os2ahci.c

@@ -67 +67 @@
 int force_write_cache; /* if != 0, force write cache */
 int verbosity = 0;     /* default is quiet. 1=show sign on banner, >1=show adapter info during boot */
-int use_lvm_info = 1;
+int use_mbr_test = 1;
 long com_baud = 0;
 
@@ -383 +383 @@
     }
 
-    if (ArgCmp(pszCmdLine, "Z"))
+    if (ArgCmp(pszCmdLine, "U"))
     {
       pszCmdLine++;
-      /* Specify to not use the LVM information. There is no reason why anyone would
-       * want to do this, but previous versions of this driver did not have LVM capability,
-       * so this switch is here temporarily just in case.
+      /* Specify to use the MBR test to ignore non-MBR disks.
+       * Default is on.
        */
-      use_lvm_info = !iInvertOption;
+      use_mbr_test = !iInvertOption;
       continue;
     }
@@ -1128 +1127 @@
         for (d = 0; d <= ad_info->ports[p].dev_max; d++)
         {
-          if (ad_info->ports[p].devs[d].present)
+          if (ad_info->ports[p].devs[d].present && !ad_info->ports[p].devs[d].ignored)
           {
             if (ad_info->ports[p].devs[d].atapi && emulate_scsi[dta][p])
@@ -1167 +1166 @@
           for (d = 0; d <= ad_info->ports[p].dev_max; d++)
           {
-            if (ad_info->ports[p].devs[d].present && ad_info->ports[p].devs[d].atapi && emulate_scsi[a][p])
+            if (ad_info->ports[p].devs[d].present && !ad_info->ports[p].devs[d].ignored
+                && ad_info->ports[p].devs[d].atapi && emulate_scsi[a][p])
             {
               if (add_unit_info(pIorb_conf, dta, a, p, d, scsi_id++))