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

Timestamp:

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

Author:

David Azarewicz

Message:

Variable name changes.

File:

• trunk/src/os2ahci/ata.c (modified) (12 diffs)

trunk/src/os2ahci/ata.c

@@ -361 +361 @@
 {
   ULONG offset = io->BlocksXferred * io->BlockSize;
-  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->f16SGList);
   USHORT i;
 
@@ -403 +403 @@
   ULONG offset = 0;
   USHORT i;
-  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->f16SGList);
 
   for (i = sg_indx; i < io->cSGList; i++)
@@ -532 +532 @@
   DLA_Table_Sector *pDLA = (DLA_Table_Sector*)add_workspace(pIorb)->buf;
   AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
-  GEOMETRY *geometry = ((IORB_GEOMETRY*)pIorb)->pGeometry;
+  GEOMETRY *geometry = ((IORB_GEOMETRY*)pIorb)->f16Geometry;
   int p = iorb_unit_port(pIorb);
   int rc;
@@ -567 +567 @@
 int is_lvm_geometry(IORBH *pIorb)
 {
-  GEOMETRY *geometry = ((IORB_GEOMETRY*)pIorb)->pGeometry;
+  GEOMETRY *geometry = ((IORB_GEOMETRY*)pIorb)->f16Geometry;
   ULONG sector;
 
@@ -597 +597 @@
 void ata_get_geometry_pp(IORBH FAR16DATA *vIorb, IORBH *pIorb)
 {
-  GEOMETRY *geometry = ((IORB_GEOMETRY*)pIorb)->pGeometry;
+  GEOMETRY *geometry = ((IORB_GEOMETRY*)pIorb)->f16Geometry;
   USHORT geometry_len =  ((IORB_GEOMETRY *)pIorb)->GeometryLen;
   u16 *id_buf = add_workspace(pIorb)->buf;
@@ -750 +750 @@
 {
   IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
-  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->f16SGList);
   AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
   ULONG sector = io->RBA + io->BlocksXferred;
@@ -875 +875 @@
 {
   IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
-  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->f16SGList);
   ADD_WORKSPACE *aws = add_workspace(pIorb);
 
@@ -948 +948 @@
 {
   IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
-  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->f16SGList);
   AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
   ULONG sector = io->RBA + io->BlocksXferred;
@@ -1015 +1015 @@
 {
   IORB_EXECUTEIO *io = (IORB_EXECUTEIO *)pIorb;
-  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->pSGList);
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(io->f16SGList);
   ADD_WORKSPACE *aws = add_workspace(pIorb);
   AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
@@ -1092 +1092 @@
 {
   IORB_ADAPTER_PASSTHRU *apt = (IORB_ADAPTER_PASSTHRU *)pIorb;
-  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(apt->pSGList);
+  SCATGATENTRY *pSGList = (SCATGATENTRY*)Far16ToFlat(apt->f16SGList);
   AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
   int p = iorb_unit_port(pIorb);
@@ -1106 +1106 @@
   rc = ata_cmd(ai, p, d, slot, 0,
                AP_SGLIST,   pSGList, apt->cSGList,
-               AP_ATA_CMD,  Far16ToFlat(apt->pControllerCmd),
+               AP_ATA_CMD,  Far16ToFlat(apt->f16ControllerCmd),
                AP_WRITE,    !(apt->Flags & PT_DIRECTION_IN),
                AP_END);
@@ -1148 +1148 @@
 
   /* map D2H FIS to the original ATA controller command structure */
-  cmd = (ATA_CMD *)Far16ToFlat(((IORB_ADAPTER_PASSTHRU*)pIorb)->pControllerCmd);
+  cmd = (ATA_CMD *)Far16ToFlat(((IORB_ADAPTER_PASSTHRU*)pIorb)->f16ControllerCmd);
 
   cmd->cmd      = fis[2];