Changeset 34

Timestamp:

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

Author:

markus

Message:

set builddate in DRIVERSTRUCT; fixed RM device signature

Location:

trunk

Files:

• src/os2ahci/Makefile (modified) (3 diffs)
• src/os2ahci/ahci.c (modified) (2 diffs)
• src/os2ahci/ahci.h (modified) (1 diff)
• src/os2ahci/os2ahci.c (modified) (2 diffs)
• src/os2ahci/os2ahci.def (modified) (1 diff)
• tools/blddate.cmd (added)

trunk/src/os2ahci/Makefile

@@ -29 +29 @@
 MAPSYM     = $(DDK)\base\tools\mapsym.exe
 BLDLEVEL   = cmd.exe /c ..\..\tools\bldlvl.cmd
+BLDDATE    = cmd.exe /c ..\..\tools\blddate.cmd
 
 AFLAGS     = -Mb
 CFLAGS     = -c -nologo -Asnw -W2 -G2ms -Zlpd -Fc -Zi
-LFLAGS     = /noe /nod /packd /a:16 /batch /map /line 
+LFLAGS     = /noe /nod /packd /a:16 /batch /map /line
 
 ###############################################################################
@@ -88 +89 @@
 libc.obj:     libc.c     Makefile $(INCS)
 
-os2ahci.obj:  os2ahci.c  Makefile $(INCS)
+os2ahci.obj:  os2ahci.c  Makefile $(INCS) bldday.h
 
 pci.obj:      pci.c      Makefile $(INCS)
@@ -103 +104 @@
 # Action definitions (compile/link commands)
 
+bldday.h:
+        $(BLDDATE) > bldday.h
+
 .asm.obj:
         $(AS) $(AFLAGS) $(AS_INCLUDE) $*.asm

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 */

trunk/src/os2ahci/ahci.h

@@ -23 +23 @@
 
 /* -------------------------- macros and constants ------------------------- */
+
+/******************************************************************************
+ *  device prefix strings for Resource Manager
+ */
+#define RM_HD_PREFIX         "HD_(%d,%d) "
+#define RM_HD_PREFIX_LEN     (sizeof(RM_HD_PREFIX) - 1)
+#define RM_CD_PREFIX         "CD_(%d,%d) "
+#define RM_CD_PREFIX_LEN     (sizeof(RM_CD_PREFIX) - 1)
+#define RM_TAPE_PREFIX       "TAPE_(%d,%d) "
+#define RM_TAPE_PREFIX_LEN   (sizeof(RM_TAPE_PREFIX) - 1)
+#define RM_MAX_PREFIX_LEN    RM_TAPE_PREFIX_LEN
 
 /******************************************************************************

trunk/src/os2ahci/os2ahci.c

@@ -21 +21 @@
 
 #include "os2ahci.h"
+#include "bldday.h"
 
 /* -------------------------- macros and constants ------------------------- */
@@ -66 +67 @@
   CMVERSION_MAJOR,                 /* RM interface version major */
   CMVERSION_MINOR,                 /* RM interface version minor */
-  2010, 4, 27,                     /* date */
+  BLD_YEAR, BLD_MONTH, BLD_DAY,    /* date */
   0,                               /* driver flags */
   DRT_ADDDM,                       /* driver type */

trunk/src/os2ahci/os2ahci.def

@@ -1 +1 @@
 library os2ahci
-Description '$@#thi.guten (www.thiguten.de):1.00.20101001#@OS/2 AHCI Adapter Device Driver'
+Description '$@#thi.guten (www.thiguten.de):1.00.20101021#@OS/2 AHCI Adapter Device Driver'
 protmode