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

Timestamp:

Feb 18, 2011, 10:09:10 PM (14 years ago)

Author:

chris

Message:

• APM support
• Generic IOCTL interface for adapter passthrough commands (ATA and ATAPI)
• Fixes to ATAPI sense data handling
• Cosmetic changes to debug reporting
• Fixed missing interrupt enable flag for PIO transfer completions
• Added command line switch /I to ignore specific adapters

File:

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

trunk/src/os2ahci/atapi.c

@@ -168 +168 @@
    * mechanism:" -- Storage Device Driver Reference, Scatter/Gather Lists
    */
-  rc = ata_cmd(ad_infos + iorb_unit_adapter(iorb),
-               iorb_unit_port(iorb),
-               iorb_unit_device(iorb),
-               slot, ATA_CMD_PACKET,
+  rc = ata_cmd(ad_infos + iorb_unit_adapter(iorb), iorb_unit_port(iorb),
+               iorb_unit_device(iorb), slot, ATA_CMD_PACKET,
                AP_ATAPI_CMD, (void _far *) cdb, cdb_len,
                AP_SGLIST, pt->pSGList, pt->cSGList,
@@ -280 +278 @@
     if (ssb->SenseData != NULL) {
       memcpy(ssb->SenseData, psd, max(ssb->ReqSenseLen, ATAPI_SENSE_LEN));
-      ssb->Flags != STATUS_SENSEDATA_VALID;
+      ssb->Flags |= STATUS_SENSEDATA_VALID;
     }
+    iorb->Status |= IORB_STATUSBLOCK_AVAIL;
   }
 
@@ -333 +332 @@
 
 /******************************************************************************
- * pad atapi commands; AHCI requires ATAPI commands to be either 12 or
+ * Pad ATAPI commands; AHCI requires ATAPI commands to be either 12 or
  * 16 bytes in length. This func converts commands that have a 12 byte
  * equivalent, and pads the others to 12 bytes.
@@ -343 +342 @@
 {
   ATAPI_CDB_12 _far *p12;
+  u32 tmp;
 
   if (cmd_in_len == ATAPI_MIN_CDB_LEN || cmd_in_len == ATAPI_MAX_CDB_LEN) {
@@ -364 +364 @@
     p12->cmd = 0xa0 | (cmd_in[0] & 0x0f);
     p12->flags = cmd_in[1] & 0xc0; /* 6byte cmds have no flags (FUA etc.) */
-    SET_CDB_32(p12->lba, (u32) cmd_in[3] | (u32) cmd_in[2] << 8 | 
-                         (u32) (cmd_in[1] & 0x1f) << 16);
-    SET_CDB_32(p12->trans_len, (u32) cmd_in[4]);
+    tmp = GET_CDB_24(cmd_in + 1) & 0x1fffffUL;
+    SET_CDB_32(p12->lba, tmp);
+    SET_CDB_32(p12->trans_len, cmd_in[4]);
     p12->control = cmd_in[5];
     break;
@@ -375 +375 @@
     p12->cmd = 0xa0 | (cmd_in[0] & 0x0f);
     p12->flags = cmd_in[1];
+    p12->control = cmd_in[9];
     memcpy(p12->lba, cmd_in + 2, 4);
-    SET_CDB_32(p12->trans_len, (u32) GET_CDB_16(cmd_in + 7));
-    p12->control = cmd_in[9];
+    tmp = GET_CDB_16(cmd_in + 7);
+    SET_CDB_32(p12->trans_len, tmp);
     break;