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

Timestamp:

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

Author:

David Azarewicz

Message:

Variable name changes.

File:

• trunk/src/os2ahci/os2ahci.c (modified) (17 diffs)

trunk/src/os2ahci/os2ahci.c

@@ -68 +68 @@
 int verbosity = 0;     /* default is quiet. 1=show sign on banner, >1=show adapter info during boot */
 int use_mbr_test = 1;
-long com_baud = 0;
 
 HDRIVER rm_drvh;           /* resource manager driver handle */
@@ -225 +224 @@
     {
       pszCmdLine += 2;
-      com_baud = strtol(pszCmdLine, &pszCmdLine, 0);
+      InitComPort(strtol(pszCmdLine, &pszCmdLine, 0));
       continue;
     }
@@ -234 +233 @@
       /* set COM port base address for debug messages */
       D32g_ComBase = strtol(pszCmdLine, &pszCmdLine, 0);
+      #ifdef TESTVER
+      if (D32g_ComBase == 0) SetPsdPutc();
+      #endif
       if (D32g_ComBase == 1) D32g_ComBase = 0x3f8;
       if (D32g_ComBase == 2) D32g_ComBase = 0x2f8;
@@ -419 +421 @@
   if (iStatus) goto init_fail;
 
-  if (com_baud) InitComPort(com_baud);
-
   dprintf(0,"BldLevel: %s\n", BldLevel);
   dprintf(0,"CmdLine: %s\n", cmd_line);
@@ -602 +602 @@
      * link in 'vNext'.
      */
-    if (pIorb->RequestControl & IORB_CHAIN) vNext = pIorb->pNxtIORB;
+    if (pIorb->RequestControl & IORB_CHAIN) vNext = pIorb->f16NxtIORB;
     else vNext = (IORBH FAR16DATA *)0;
 
@@ -767 +767 @@
         pIorb = Far16ToFlat(vIorb);
 
-        vNext = pIorb->pNxtIORB;
+        vNext = pIorb->f16NxtIORB;
         if (!add_workspace(pIorb)->processing)
         {
@@ -911 +911 @@
       IORBH *pPtr = Far16ToFlat(vPtr);
 
-      vNext = pPtr->pNxtIORB;
+      vNext = pPtr->f16NxtIORB;
       /* move all matching IORBs to the abort queue */
       if (vPtr != vIorb && iorb_unit_device(pPtr) == d)
@@ -1002 +1002 @@
       break;
     }
-    ad_infos[a].ports[p].devs[d].unit_info = pIorb_uc->pUnitInfo;
+    ad_infos[a].ports[p].devs[d].unit_info = pIorb_uc->f16UnitInfo;
     break;
 
@@ -1052 +1052 @@
 
   pIorb_conf = (IORB_CONFIGURATION *)pIorb;
-  vDt = pIorb_conf->pDeviceTable;
+  vDt = pIorb_conf->f16DeviceTable;
   pDt = Far16ToFlat(vDt);
 
@@ -1079 +1079 @@
     }
 
-    pDt->pAdapter[dta] = MakeNear16PtrFromDiff(pIorb_conf->pDeviceTable, pDt, pPtr);
+    pDt->pAdapter[dta] = MakeNear16PtrFromDiff(pIorb_conf->f16DeviceTable, pDt, pPtr);
 
     //DPRINTF(2,"iocm_device_table: ptr=%x dta=%x pAdapter[dta]=%x pDeviceTable=%x\n",
@@ -1290 +1290 @@
   {
     /* priority IORB; insert at first position */
-    pIorb->pNxtIORB = queue->vRoot;
+    pIorb->f16NxtIORB = queue->vRoot;
     queue->vRoot = vIorb;
   }
@@ -1296 +1296 @@
   {
     /* append IORB to end of queue */
-    pIorb->pNxtIORB = FAR16NULL;
+    pIorb->f16NxtIORB = FAR16NULL;
 
     if (queue->vRoot == FAR16NULL)
@@ -1304 +1304 @@
     else
     {
-      ((IORBH *)Far16ToFlat(queue->vTail))->pNxtIORB = vIorb;
+      ((IORBH *)Far16ToFlat(queue->vTail))->f16NxtIORB = vIorb;
     }
     queue->vTail = vIorb;
@@ -1363 +1363 @@
       if (_vPrev != FAR16NULL)
       {
-        ((IORBH*)Far16ToFlat(_vPrev))->pNxtIORB = _pIorb->pNxtIORB;
+        ((IORBH*)Far16ToFlat(_vPrev))->f16NxtIORB = _pIorb->f16NxtIORB;
       }
       else
       {
-        queue->vRoot = _pIorb->pNxtIORB;
+        queue->vRoot = _pIorb->f16NxtIORB;
       }
       if (_vIorb == queue->vTail)
@@ -1377 +1377 @@
     }
     _vPrev = _vIorb;
-    _vIorb = _pIorb->pNxtIORB;
+    _vIorb = _pIorb->f16NxtIORB;
   }
 
@@ -1461 +1461 @@
   if (pIorb->RequestControl & IORB_ASYNC_POST)
   {
-    Dev32Help_CallFar16((PFNFAR16)pIorb->NotifyAddress, vIorb);
+    Dev32Help_CallFar16((PFNFAR16)pIorb->f16NotifyAddress, vIorb);
   }
 }
@@ -1630 +1630 @@
                          int a, int p, int d, int scsi_id)
 {
-  DEVICETABLE *pDt = Far16ToFlat(pIorb_conf->pDeviceTable);
+  DEVICETABLE *pDt = Far16ToFlat(pIorb_conf->f16DeviceTable);
   ADAPTERINFO *pPtr;
   UNITINFO *pUi;
   AD_INFO *ai = ad_infos + a;
 
-  pPtr = (ADAPTERINFO *)MakeFlatFromNear16(pIorb_conf->pDeviceTable, pDt->pAdapter[dta]);
+  pPtr = (ADAPTERINFO *)MakeFlatFromNear16(pIorb_conf->f16DeviceTable, pDt->pAdapter[dta]);
   //DPRINTF(2,"add_unit_info: ptr=%x dta=%x pAdapter[dta]=%x pDeviceTable=%x\n",
   //    ptr, dta, dt->pAdapter[dta], iorb_conf->pDeviceTable);