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

Timestamp:

Sep 13, 2000, 11:00:51 PM (25 years ago)

Author:

sandervl

Message:

FS corruption fixed

File:

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

trunk/src/wnaspi32/winaspi32.cpp

@@ -1 @@
-/* $Id: winaspi32.cpp,v 1.6 2000-09-03 08:20:10 sandervl Exp $ */
+/* $Id: winaspi32.cpp,v 1.7 2000-09-13 21:00:51 sandervl Exp $ */
 /*
  * WNASPI routines
@@ -29 +29 @@
 
 DEFAULT_DEBUG_CHANNEL(aspi)
+ODINDEBUGCHANNEL(WNASPI32)
 
 static void
@@ -120 +121 @@
     break;
   }
-}
-
-
-static WORD
-ASPI_ExecScsiCmd( scsiObj *aspi,
-                  SRB_ExecSCSICmd *lpPRB)
+  dprintf(("Result code: %x", prb->SRB_Status));
+}
+
+
+static WORD ASPI_ExecScsiCmd( scsiObj *aspi, SRB_ExecSCSICmd *lpPRB)
 {
   int   status;
@@ -137 +137 @@
   if (!lpPRB->SRB_CDBLen)
   {
-      WARN("Failed: lpPRB->SRB_CDBLen = 0.\n");
+      dprintf(("Failed: lpPRB->SRB_CDBLen = 0."));
       lpPRB->SRB_Status = SS_ERR;
       return SS_ERR;
@@ -144 +144 @@
   if(MaxCDBStatus<lpPRB->SRB_CDBLen)
   {
-    WARN("Failed: lpPRB->SRB_CDBLen > 64.\n");
+    dprintf(("Failed: lpPRB->SRB_CDBLen > 64."));
     lpPRB->SRB_Status = SS_ERR;
     return SS_ERR;
@@ -151 +151 @@
   if(lpPRB->SRB_BufLen>65536)    // Check Max 64k!!
   {
-    WARN("Failed: lpPRB->SRB_BufLen > 65536.\n");
+    dprintf(("Failed: lpPRB->SRB_BufLen > 65536."));
     lpPRB->SRB_Status = SS_BUFFER_TO_BIG;
     return SS_BUFFER_TO_BIG;
@@ -214 +214 @@
         if (ASPI_POSTING(lpPRB))
         {
-          TRACE("Post Routine (%lx) called\n", (DWORD) lpPRB->SRB_PostProc);
+          dprintf(("Post Routine (%lx) called\n", (DWORD) lpPRB->SRB_PostProc));
           (*lpPRB->SRB_PostProc)();
         }
@@ -220 +220 @@
         if (lpPRB->SRB_Flags & SRB_EVENT_NOTIFY)
         {
-          TRACE("Setting event %04x\n", (HANDLE)lpPRB->SRB_PostProc);
+          dprintf(("Setting event %04x\n", (HANDLE)lpPRB->SRB_PostProc));
           SetEvent((HANDLE)lpPRB->SRB_PostProc); /* FIXME: correct ? */
         }
@@ -236 +236 @@
 
   return lpPRB->SRB_Status;
-
 }
 
@@ -249 +248 @@
  *    LOBYTE of LOWORD: # of host adapters.
  */
-DWORD WINAPI GetASPI32SupportInfo()
+ODINFUNCTION0(DWORD, GetASPI32SupportInfo)
 {
   LONG rc;
@@ -334 +333 @@
  *             SendASPI32Command32 (WNASPI32.1)
  */
-DWORD __cdecl SendASPI32Command(LPSRB lpSRB)
+DWORD SendASPICommand(LPSRB lpSRB)
 {
     DWORD dwRC;
@@ -355 +354 @@
         (SC_EXEC_SCSI_CMD!=lpSRB->common.SRB_Cmd) &&
         (SC_ABORT_SRB!=lpSRB->common.SRB_Cmd) &&
-        (SC_RESET_DEV!=lpSRB->common.SRB_Cmd) )
-      return SS_INVALID_SRB; // shoud be invalid command
+        (SC_RESET_DEV!=lpSRB->common.SRB_Cmd) ) 
+    {
+        dprintf(("Invalid command!"));
+        return SS_INVALID_SRB; // shoud be invalid command
+    }
 
     dwRC = SS_ERR;
@@ -433 +435 @@
 }
 
+DWORD CDECL SendASPI32Command(LPSRB lpSRB)
+{
+ DWORD yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = SendASPICommand(lpSRB);
+    SetFS(sel);
+
+    return yyrc;
+}
+
 
 /***********************************************************************