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

Timestamp:

Oct 14, 2011, 10:22:12 PM (14 years ago)

Author:

cjm

Message:

• Added IBMS506$ character device driver to support existing SMART tools

• Finishing touches to SMART support

• Updated READNE with information around "/f" command line parameter and SMART support

File:

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

trunk/src/os2ahci/os2ahci.c

@@ -161 +161 @@
 USHORT init_drv(RPINITIN _far *req)
 {
+  static int init_drv_called;
+  static int init_drv_failed;
   RPINITOUT _far *rsp = (RPINITOUT _far *) req;
   DDD_PARM_LIST _far *ddd_pl = (DDD_PARM_LIST _far *) req->InitArgs;
@@ -172 +174 @@
   u16 vendor;
   u16 device;
+
+  if (init_drv_called) {
+    /* This is the init call for the second (legacy IBMS506$) character
+     * device driver. If the main driver failed initialization, fail this
+     * one as well.
+     */
+    rsp->CodeEnd = (u16) end_of_code;
+    rsp->DataEnd = (u16) &end_of_data;
+    return(STDON | ((init_drv_failed) ? ERROR_I24_QUIET_INIT_FAIL : 0));
+  }
+  init_drv_called = 1;
 
   /* set device helper entry point */
@@ -375 +388 @@
   rsp->CodeEnd = 0;
   rsp->DataEnd = 0;
+  init_drv_failed = 1;
 
   /* free context hooks */