Changeset 8931 for trunk/src

Timestamp:

Jul 28, 2002, 5:38:09 PM (23 years ago)

Author:

sandervl

Message:

Fixes for cdrom drive/burner recognition

Location:

trunk/src/wnaspi32

Files:

• cdio.cpp (modified) (2 diffs)
• winaspi32.cpp (modified) (2 diffs)

trunk/src/wnaspi32/cdio.cpp

@@ -125 +125 @@
     char        pszDisk[4];
 
-    if(SRB_HaId != 0 && SRB_Target != 0 || SRB_Lun > (nrCDROMDrives - 1)) {
+    if(SRB_HaId != 0 || SRB_Lun != 0 || SRB_Target > (nrCDROMDrives - 1)) {
         return (HCDIO) -1;
     }
     
-    if(hCDHandles[SRB_Lun]) {
-        return hCDHandles[SRB_Lun];
-    }
-    pszDisk[0] = 'A' + ulCDDriveNr[SRB_Lun];
+    if(hCDHandles[SRB_Target]) {
+        return hCDHandles[SRB_Target];
+    }
+    pszDisk[0] = 'A' + ulCDDriveNr[SRB_Target];
     pszDisk[1] = ':';
     pszDisk[2] = 0;
@@ -150 +150 @@
                 ulCDSig == (('C') | ('D' << 8) | ('0' << 16) | ('1' << 24)) )
         {
-            hCDHandles[SRB_Lun] = hDisk;
+            hCDHandles[SRB_Target] = hDisk;
             return (HCDIO)hDisk;
         }

trunk/src/wnaspi32/winaspi32.cpp

@@ -1 @@
-/* $Id: winaspi32.cpp,v 1.14 2002-06-08 11:42:02 sandervl Exp $ */
+/* $Id: winaspi32.cpp,v 1.15 2002-07-28 15:38:09 sandervl Exp $ */
 /*
  * WNASPI routines
@@ -179 +179 @@
     if(hCDIO == -1) {
         dprintf(("Failed: invalid device %d %d %d", lpPRB->SRB_HaId, lpPRB->SRB_Target, lpPRB->SRB_Lun));
+        ASPI_DebugPrintCmd(lpPRB);
         return WNASPI32_DoPosting( lpPRB, SS_NO_DEVICE );
     }