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

Timestamp:

Jun 3, 2020, 5:36:55 PM (5 years ago)

Author:

David Azarewicz

Message:

Variable name changes.

File:

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

trunk/src/os2ahci/atapi.c

@@ -72 +72 @@
 {
   IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
-  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->f16SGList);
   ATAPI_CDB_12 cdb;
   AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
@@ -238 +238 @@
 {
   IORB_ADAPTER_PASSTHRU *pt = (IORB_ADAPTER_PASSTHRU *)pIorb;
-  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(pt->pSGList);
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(pt->f16SGList);
   int rc;
   u8 cdb[ATAPI_MAX_CDB_LEN];
@@ -249 +249 @@
   }
   /* AHCI requires 12 or 16 byte commands */
-  atapi_pad_cdb(Far16ToFlat(pt->pControllerCmd), pt->ControllerCmdLen, cdb, &cdb_len);
+  atapi_pad_cdb(Far16ToFlat(pt->f16ControllerCmd), pt->ControllerCmdLen, cdb, &cdb_len);
 
   if (cdb[0] == 0x12 || cdb[0] == 0x5a)
@@ -318 +318 @@
     /* 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)
+    if (ssb->f16SenseData != FAR16NULL && ssb->ReqSenseLen > sense_buf_len)
     {
       sense_buf_len = ssb->ReqSenseLen;
@@ -388 +388 @@
     memset(ssb->AdapterDiagInfo, 0x00, sizeof(ssb->AdapterDiagInfo));
 
-    if (ssb->SenseData != NULL)
+    if (ssb->f16SenseData != FAR16NULL)
     {
-      memcpy(Far16ToFlat(ssb->SenseData), psd, ssb->ReqSenseLen);
+      memcpy(Far16ToFlat(ssb->f16SenseData), psd, ssb->ReqSenseLen);
       ssb->Flags |= STATUS_SENSEDATA_VALID;
     }