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

Timestamp:

Oct 21, 2010, 3:30:19 PM (15 years ago)

Author:

markus

Message:

set builddate in DRIVERSTRUCT; fixed RM device signature

File:

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

trunk/src/os2ahci/ahci.c

@@ -1396 +1396 @@
   ADJUNCT adj;
   HDEVICE dh;
+  char dev_name[RM_MAX_PREFIX_LEN+ATA_ID_PROD_LEN+1];
+  static u8 total_dev_cnt;
 
   if (ai->port_max < p) {
@@ -1436 +1438 @@
   memset(&adj, 0x00, sizeof(adj));
 
-  adj.pNextAdj           = NULL;
-  adj.AdjLength          = sizeof(adj);
-  adj.AdjType            = ADJ_ADD_UNIT;
-  adj.Add_Unit.ADDHandle = rm_drvh;
-
-  ds.DevDescriptName = ata_dev_name(id_buf);
+  adj.pNextAdj            = NULL;
+  adj.AdjLength           = sizeof(adj);
+  adj.AdjType             = ADJ_ADD_UNIT;
+  adj.Add_Unit.ADDHandle  = rm_drvh;
+  adj.Add_Unit.UnitHandle = (USHORT) total_dev_cnt;
+
+  /* create Resource Manager device key string;
+   * we distinguish only HDs and CD drives for now
+   */
+  if (ai->ports[p].devs[d].removable) {
+    sprintf(dev_name, RM_CD_PREFIX "%s", p, d, ata_dev_name(id_buf));
+  } else {
+    sprintf(dev_name, RM_HD_PREFIX "%s", p, d, ata_dev_name(id_buf));
+  }
+
+  ds.DevDescriptName = dev_name;
   ds.DevFlags        = (ai->ports[p].devs[d].removable) ? DS_REMOVEABLE_MEDIA
                                                         : DS_FIXED_LOGICALNAME;
   ds.DevType         = ai->ports[p].devs[d].dev_type;
+  ds.pAdjunctList    = &adj;
 
   RMCreateDevice(rm_drvh, &dh, &ds, ai->rm_adh, NULL);
+
+  total_dev_cnt++;
 
   /* try to detect virtualbox environment to enable a hack for IRQ routing */