Changeset 4265 for trunk/src/wnaspi32/winaspi32.cpp

Timestamp:

Sep 15, 2000, 3:25:50 PM (25 years ago)

Author:

sandervl

Message:

open + init aspirout during dll load

File:

• trunk/src/wnaspi32/winaspi32.cpp (modified) (12 diffs)

trunk/src/wnaspi32/winaspi32.cpp

@@ -1 @@
-/* $Id: winaspi32.cpp,v 1.8 2000-09-14 19:09:17 sandervl Exp $ */
+/* $Id: winaspi32.cpp,v 1.9 2000-09-15 13:25:50 sandervl Exp $ */
 /*
  * WNASPI routines
@@ -28 +28 @@
 //#include "callback.h"
 
+#ifdef DEBUG
+#define DEBUG_BUFFER
+#endif
+
 DEFAULT_DEBUG_CHANNEL(aspi)
 ODINDEBUGCHANNEL(WNASPI32)
@@ -80 +84 @@
   cdb = &prb->CDBByte[0];
   cmd = prb->CDBByte[0];
-  if (TRACE_ON(aspi))
-  {
-      DPRINTF("CDB buffer[");
+#ifdef DEBUG_BUFFER
+      dprintfNoEOL(("CDB buffer["));
       for (i = 0; i < prb->SRB_CDBLen; i++) {
-          if (i != 0) DPRINTF(",");
-          DPRINTF("%02x", *cdb++);
-      }
-      DPRINTF("]\n");
-  }
+          if (i != 0) dprintfNoEOL((",0x%02x", *cdb++));
+          else        dprintfNoEOL(("0x%02x", *cdb++));
+      }
+      dprintfNoEOL(("]\n"));
+#endif
 }
 
@@ -178 +181 @@
               lpPRB->SRB_BufPointer,
               lpPRB->SRB_BufLen);
+
+#ifdef DEBUG_BUFFER
+      char *cdb = (char *)lpPRB->SRB_BufPointer;
+      dprintfNoEOL(("Write SRB buffer["));
+      for (int i = 0; i < lpPRB->SRB_BufLen; i++) {
+          if (i != 0) dprintfNoEOL((",0x%02x", *cdb++));
+          else        dprintfNoEOL(("0x%02x", *cdb++));
+      }
+      dprintfNoEOL(("]\n"));
+#endif
     }
   }
@@ -195 +208 @@
                   aspi->buffer,
                   lpPRB->SRB_BufLen);
+#ifdef DEBUG_BUFFER
+      char *cdb = (char *)lpPRB->SRB_BufPointer;
+      dprintfNoEOL(("Read SRB buffer["));
+      for (int i = 0; i < lpPRB->SRB_BufLen; i++) {
+          if (i != 0) dprintfNoEOL((",0x%02x", *cdb++));
+          else        dprintfNoEOL(("0x%02x", *cdb++));
+      }
+      dprintfNoEOL(("]\n"));
+#endif
+
         }
       }
@@ -251 +274 @@
 {
   LONG rc;
-  scsiObj *aspi;
-  ULONG hmtxDriver;
   BYTE bNumDrv;
   HKEY hkeyDrvInfo;
@@ -263 +284 @@
   bNumDrv = 0;
 
-  aspi = new scsiObj();
-
-  if( fGainDrvAccess( FALSE, &hmtxDriver) ) // Do nonblocking call for info
-  {
-
-    if(aspi->init(65535)==TRUE)
-    {
-
+  if(aspi->access(FALSE)) //'non-blocking' call
+  {
         bNumDrv = aspi->getNumHosts();
         brc = SS_COMP;
@@ -287 +302 @@
           RegCloseKey( hkeyDrvInfo);
         }
-        aspi->close();
-    }
-    else
-      brc = SS_FAILED_INIT;
-
-    fReleaseDrvAccess( hmtxDriver);
+        aspi->release();
   }
   else
@@ -324 +334 @@
     }
   }
-  delete aspi;
 
   return ((brc << 8) | bNumDrv); /* FIXME: get # of host adapters installed */
@@ -337 +346 @@
     ULONG ulParam, ulReturn;
     BYTE  bRC;
-    scsiObj *aspi;
-    ULONG hmtxDriver;
     LONG rc;
 
@@ -357 +364 @@
     }
 
-    aspi = new scsiObj();
-
     dwRC = SS_ERR;
 
-    if( fGainDrvAccess( TRUE, &hmtxDriver) ) // Block if a SRB is pending
-    {
-      if(aspi->init(65535)==TRUE)
-      {
+    if(aspi->access(TRUE)) // Block if a SRB is pending
+    {
         switch (lpSRB->common.SRB_Cmd)
         {
@@ -414 +417 @@
              break;
 
-          } // end switch (lpSRB->common.SRB_Cmd)
-
-      }
-      else
-      {
-        dwRC = bRC;
-      }
-
-      fReleaseDrvAccess( hmtxDriver);
-      aspi->close();
+        } // end switch (lpSRB->common.SRB_Cmd)
+
+        aspi->release();
     }
     else
     {
-      dwRC = SS_NO_ASPI;
-    }
-    delete aspi;
+        dwRC = SS_NO_ASPI;
+    }
 
     return dwRC;