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

Timestamp:

Dec 18, 2010, 3:10:02 PM (15 years ago)

Author:

markus

Message:

added feature byte to ATAPI commands; fixed request sense CDB

File:

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

trunk/src/os2ahci/atapi.c

@@ -93 +93 @@
                  AP_SGLIST,    io->pSGList + sg_indx, (u16) sg_cnt,
                  AP_DEVICE,    0x4000,
+                 AP_FEATURES,  0x0001,
                  AP_END);
 
@@ -155 +156 @@
                              pt->ControllerCmdLen,
                AP_SGLIST,    pt->pSGList, pt->cSGList,
+               AP_FEATURES,  0x0001,
                AP_END);
 
-  if (rc == 0) {
-    add_workspace(iorb)->blocks = pt->cSGList;
-    /* no pp func needed */
-
-  } else if (rc > 0) {
-    iorb_seterr(iorb, IOERR_CMD_SGLIST_BAD);
-
-  } else {
-    iorb_seterr(iorb, IOERR_CMD_ADD_SOFTWARE_FAILURE);
+  if (rc) {
+    iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
   }
   
@@ -184 +179 @@
 {
   ADD_WORKSPACE _far *aws = add_workspace(iorb);
-  ATAPI_CDB_REQ_SENSE cdb;
+  ATAPI_CDB_6 cdb;
   int rc;
   
@@ -198 +193 @@
   memset(&cdb, 0x00, sizeof(cdb));
   cdb.cmd = ATAPI_CMD_REQUEST_SENSE;
+  cdb.trans_len = (u8) ATAPI_SENSE_LEN;
+  
   aws->ppfunc = atapi_req_sense_pp;
   rc = ata_cmd(ad_infos + iorb_unit_adapter(iorb),