Changeset 185 for trunk/src/os2ahci/ahci.c

Timestamp:

Dec 20, 2016, 9:35:27 PM (9 years ago)

Author:

David Azarewicz

Message:

Fix for sparse port hardware

File:

• trunk/src/os2ahci/ahci.c (modified) (8 diffs)

trunk/src/os2ahci/ahci.c

@@ -295 +295 @@
     /* more ports in port_map than in HOST_CAP & 0x1f */
     ports = ai->hw_ports;
-    DPRINTF(1,"implemented port map (0x%x) contains more ports than nr_ports (%d), using nr_ports\n", ai->port_map, ports);
+    DPRINTF(1,"implemented port map (0x%x) contains more ports than hw_ports (%d), using hw_ports\n", ai->port_map, ports);
     ai->port_map = (1UL << ports) - 1UL;
   }
@@ -371 +371 @@
     int p;
 
-    for (p = 0; p < AHCI_MAX_PORTS; p++)
+    for (p = 0; p <= ai->port_max; p++)
     {
       if (ai->port_map & (1UL << p))
@@ -729 +729 @@
    * enough if a previously detected device has problems.
    */
-  for (p = 0; p < AHCI_MAX_PORTS; p++)
+  for (p = 0; p <= ai->port_max; p++)
   {
     if (ai->port_map & (1UL << p))
@@ -1791 +1791 @@
   HDEVICE dh;
   char dev_name[RM_MAX_PREFIX_LEN+ATA_ID_PROD_LEN+1];
+  char *pDevName;
   static u8 total_dev_cnt;
 
@@ -1804 +1805 @@
   ai->ports[p].devs[d].removable = (id_buf[ATA_ID_CONFIG] & 0x0080U) != 0;
   ai->ports[p].devs[d].dev_type  = UIB_TYPE_DISK;
+  pDevName = ai->ports[p].devs[d].dev_name;
+  strncpy(pDevName, ata_dev_name(id_buf), sizeof(ai->ports[0].devs[0].dev_name));
 
   if (id_buf[ATA_ID_CONFIG] & 0x8000U)
@@ -1847 +1850 @@
   adj.AdjType             = ADJ_ADD_UNIT;
   adj.Add_Unit.ADDHandle  = rm_drvh;
-  adj.Add_Unit.UnitHandle = (USHORT) total_dev_cnt;
+  adj.Add_Unit.UnitHandle = (USHORT)total_dev_cnt;
 
   /* create Resource Manager device key string;
@@ -1854 +1857 @@
   if (ai->ports[p].devs[d].removable)
   {
-    sprintf(dev_name, RM_CD_PREFIX "%s", p, d, ata_dev_name(id_buf));
+    sprintf(dev_name, RM_CD_PREFIX "%s", p, d, pDevName);
   }
   else
   {
-    sprintf(dev_name, RM_HD_PREFIX "%s", p, d, ata_dev_name(id_buf));
+    sprintf(dev_name, RM_HD_PREFIX "%s", p, d, pDevName);
   }
 
@@ -1873 +1876 @@
   /* try to detect virtualbox environment to enable a hack for IRQ routing */
   if (ai == ad_infos && ai->pci_vendor == 0x8086 && ai->pci_device == 0x2829 &&
-      !memcmp(ata_dev_name(id_buf), "VBOX HARDDISK", 13))
+      !memcmp(pDevName, "VBOX HARDDISK", 13))
   {
     /* running inside virtualbox */