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

Timestamp:

Aug 10, 2017, 11:21:16 PM (8 years ago)

Author:

David Azarewicz

Message:

Misc fixes. NULL pointer fixes.

File:

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

trunk/src/os2ahci/os2ahci.c

@@ -463 +463 @@
 
     return(RPDONE);
-
   }
   else
@@ -500 +499 @@
     switch (ioctl->ioctl.bFunction)
     {
-
     case OS2AHCI_IOCTL_GET_DEVLIST:
       return(ioctl_get_devlist(ioctl));
@@ -506 +504 @@
     case OS2AHCI_IOCTL_PASSTHROUGH:
       return(ioctl_passthrough(ioctl));
-
     }
     break;
@@ -592 +589 @@
 {
   IORBH FAR16DATA *vIorb;
-  IORBH FAR16DATA *vNext = NULL;
+  IORBH FAR16DATA *vNext = FAR16NULL;
 
   spin_lock(drv_lock);
 
-  for (vIorb=vFirstIorb; vIorb!=NULL; vIorb=vNext)
+  for (vIorb=vFirstIorb; vIorb!=FAR16NULL; vIorb=vNext)
   {
     IORBH *pIorb = Far16ToFlat(vIorb);
@@ -622 +619 @@
       pIorb->UnitHandle = 0;
       iorb_queue_add(&driver_queue, vIorb, pIorb);
-
     }
     else
@@ -636 +632 @@
           (ad_infos[a].port_map & (1UL << p)) == 0)
       {
-
         /* unit handle outside of the allowed range */
         dprintf(0,"warning: IORB for %d.%d.%d out of range\n", a, p, d);
@@ -745 +740 @@
 
   /* process driver-level IORBs */
-  if ((vIorb = driver_queue.vRoot) != NULL)
+  if ((vIorb = driver_queue.vRoot) != FAR16NULL)
   {
     pIorb = Far16ToFlat(vIorb);
@@ -768 +763 @@
     {
       /* send all queued IORBs on this port */
-      vNext = NULL;
-      for (vIorb = ai->ports[p].iorb_queue.vRoot; vIorb != NULL; vIorb = vNext)
+      vNext = FAR16NULL;
+      for (vIorb = ai->ports[p].iorb_queue.vRoot; vIorb != FAR16NULL; vIorb = vNext)
       {
         pIorb = Far16ToFlat(vIorb);
@@ -904 +899 @@
   AD_INFO *ai = ad_infos + iorb_unit_adapter(pIorb);
   IORBH FAR16DATA *vPtr;
-  IORBH FAR16DATA *vNext = NULL;
+  IORBH FAR16DATA *vNext = FAR16NULL;
   int p = iorb_unit_port(pIorb);
   int d = iorb_unit_device(pIorb);
@@ -910 +905 @@
   switch (pIorb->CommandModifier)
   {
-
   case IOCM_ABORT:
     /* abort all pending commands on specified port and device */
     spin_lock(drv_lock);
-    for (vPtr = ai->ports[p].iorb_queue.vRoot; vPtr != NULL; vPtr = vNext)
+    for (vPtr = ai->ports[p].iorb_queue.vRoot; vPtr != FAR16NULL; vPtr = vNext)
     {
       IORBH *pPtr = Far16ToFlat(vPtr);
@@ -1271 +1265 @@
   switch (pIorb->CommandModifier)
   {
-
   case IOCM_EXECUTE_CDB:
     add_workspace(pIorb)->idempotent = 0;
@@ -1303 +1296 @@
   {
     /* append IORB to end of queue */
-    pIorb->pNxtIORB = NULL;
-
-    if (queue->vRoot == NULL)
+    pIorb->pNxtIORB = FAR16NULL;
+
+    if (queue->vRoot == FAR16NULL)
     {
       queue->vRoot = vIorb;
@@ -1330 +1323 @@
       queue_type = "local";
       min_debug = 8;
-
     }
     else if (queue == &driver_queue)
     {
       queue_type = "driver";
-
     }
     else if (queue == &abort_queue)
@@ -1341 +1332 @@
       queue_type = "abort";
       min_debug = 8;
-
     }
     else
@@ -1362 +1352 @@
 {
   IORBH FAR16DATA *_vIorb;
-  IORBH FAR16DATA *_vPrev = NULL;
+  IORBH FAR16DATA *_vPrev = FAR16NULL;
   int found = 0;
 
-  for (_vIorb = queue->vRoot; _vIorb != NULL; )
+  for (_vIorb = queue->vRoot; _vIorb != FAR16NULL; )
   {
     IORBH *_pIorb = Far16ToFlat(_vIorb);
@@ -1371 +1361 @@
     {
       /* found the IORB to be removed */
-      if (_vPrev != NULL)
+      if (_vPrev != FAR16NULL)
       {
         ((IORBH*)Far16ToFlat(_vPrev))->pNxtIORB = _pIorb->pNxtIORB;