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

Timestamp:

Feb 22, 2011, 2:25:44 AM (14 years ago)

Author:

chris

Message:

• Further fixes to automatic ATAPI sense handling, now supporting sense buffers larger than 64 bytes if requested by initiator (cdrecord wanted 96 bytes)
• Separate, and internally handled, spinlock for libc malloc/free calls to reduce chances of memory corruption if somebody forgets to get the driver-level spinlock before calling malloc/free. There was no real problem with that, just some awkward code fragments which look much better now.
• Link power management implemented
• More generic support for adapter/port options so all of them can now have a global, adapter or port scope
• Generic support for inverting driver options (i.e. turn them off with '!')
• Thorough PCI scan is now the default; the reason it wasn't so far was a delay in Virtualbox but that was never a problem on real hardware
• SCSI emulation for ATAPI devices; this can be enabled on global, adapter or port scope

File:

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

trunk/src/os2ahci/atapi.c

@@ -201 +201 @@
   u8 cdb[ATAPI_MIN_CDB_LEN];
   ATAPI_CDB_6 _far *pcdb = (ATAPI_CDB_6 _far *) cdb;
+  size_t sense_buf_len = ATAPI_SENSE_LEN;
 
   if ((iorb->RequestControl & IORB_REQ_STATUSBLOCK) &&
@@ -211 +212 @@
                                        (u16) iorb->pStatusBlock);
     if (ssb->Flags & 0x0008U) {
-      /* set a generic error code and skip automatic sense code handling */
       iorb_seterr(iorb, IOERR_DEVICE_NONSPECIFIC);
       return(-1);
     }
+
+    /* if the sense buffer requested is larger than our default, adjust
+     * the length accordingly to satisfy the caller's requirements. */
+    if (ssb->SenseData != NULL && ssb->ReqSenseLen > sense_buf_len) {
+      sense_buf_len = ssb->ReqSenseLen;
+    }
   }
 
   /* allocate sense buffer in ADD workspace */
-  if ((aws->buf = malloc(ATAPI_SENSE_LEN)) == NULL) {
+  if ((aws->buf = malloc(sense_buf_len)) == NULL) {
     iorb_seterr(iorb, IOERR_CMD_SW_RESOURCE);
     return(-1);
   }
-  memset(aws->buf, 0x00, ATAPI_SENSE_LEN);
+  memset(aws->buf, 0x00, sense_buf_len);
 
   /* prepare request sense command */
   memset(cdb, 0x00, sizeof(cdb));
   pcdb->cmd = ATAPI_CMD_REQUEST_SENSE;
-  pcdb->trans_len = (u8) ATAPI_SENSE_LEN;
+  pcdb->trans_len = (u8) sense_buf_len;
   
   aws->ppfunc = atapi_req_sense_pp;
@@ -236 +242 @@
                ATA_CMD_PACKET,
                AP_ATAPI_CMD, (void _far*) cdb, sizeof(cdb),
-               AP_VADDR, (void _far *) aws->buf, ATAPI_SENSE_LEN,
+               AP_VADDR, (void _far *) aws->buf, sense_buf_len,
                AP_FEATURES,  ATAPI_FEAT_DMA,
                AP_END);
@@ -277 +283 @@
 
     if (ssb->SenseData != NULL) {
-      memcpy(ssb->SenseData, psd, max(ssb->ReqSenseLen, ATAPI_SENSE_LEN));
+      memcpy(ssb->SenseData, psd, ssb->ReqSenseLen);
       ssb->Flags |= STATUS_SENSEDATA_VALID;
     }