Changeset 181 for trunk/src/os2ahci/atapi.c

Timestamp:

Dec 13, 2016, 3:07:49 AM (9 years ago)

Author:

David Azarewicz

Message:

Debugging changes

File:

• trunk/src/os2ahci/atapi.c (modified) (10 diffs)

trunk/src/os2ahci/atapi.c

@@ -31 +31 @@
 
 /* need this for the SCSI status block */
-#include <scsi.h>
+#include <Dev32scsi.h>
 
 /* -------------------------- macros and constants ------------------------- */
@@ -51 +51 @@
 int atapi_get_geometry(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
 {
-  DPRINTF(2,"atapi_get_geometry called\n");
+  DPRINTF(4,"atapi_get_geometry called\n");
   iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
   return(-1);
@@ -61 +61 @@
 int atapi_unit_ready(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
 {
-  DPRINTF(2,"atapi_unit_ready called\n");
+  DPRINTF(4,"atapi_unit_ready called\n");
   iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
   return(-1);
@@ -102 +102 @@
   SET_CDB_32(cdb.lba, io->RBA + io->BlocksXferred);
 
+  DPRINTF(4, "atapi_read\n");
+
   do {
     /* update sector count (might have been updated due to S/G limitations) */
@@ -173 +175 @@
   SET_CDB_32(cdb.trans_len, 1UL);
 
+  DPRINTF(4, "atapi_read_unaligned\n");
+
   /* allocate transfer buffer */
   if ((aws->buf = MemAlloc(io->BlockSize)) == NULL)
@@ -212 +216 @@
 int atapi_verify(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
 {
-  DPRINTF(3,"atapi_verify called\n");
+  DPRINTF(4,"atapi_verify called\n");
   iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
   return(-1);
@@ -222 +226 @@
 int atapi_write(IORBH FAR16DATA *vIorb, IORBH *pIorb, int slot)
 {
-  DPRINTF(3,"atapi_write called\n");
+  DPRINTF(4,"atapi_write called\n");
   iorb_seterr(pIorb, IOERR_CMD_NOT_SUPPORTED);
   return(-1);
@@ -244 +248 @@
   }
   /* AHCI requires 12 or 16 byte commands */
-  atapi_pad_cdb(Far16ToFlat(pt->pControllerCmd), pt->ControllerCmdLen,
-                (u8 *) cdb, (u16 *) &cdb_len);
+  atapi_pad_cdb(Far16ToFlat(pt->pControllerCmd), pt->ControllerCmdLen, cdb, &cdb_len);
 
   if (cdb[0] == 0x12 || cdb[0] == 0x5a)
@@ -293 +296 @@
   size_t sense_buf_len = ATAPI_SENSE_LEN;
 
-  DPRINTF(2,"atapi_req_sense\n");
+  DPRINTF(4,"atapi_req_sense\n");
 
   if ((pIorb->RequestControl & IORB_REQ_STATUSBLOCK) &&
@@ -386 +389 @@
     if (ssb->SenseData != NULL)
     {
-      memcpy(ssb->SenseData, psd, ssb->ReqSenseLen);
+      memcpy(Far16ToFlat(ssb->SenseData), psd, ssb->ReqSenseLen);
       ssb->Flags |= STATUS_SENSEDATA_VALID;
     }