Changeset 191 for trunk/src/os2ahci/ctxhook.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/ctxhook.c (modified) (10 diffs)

trunk/src/os2ahci/ctxhook.c

@@ -104 +104 @@
   D32ThunkStackTo32();
 
-  vNext = NULL;
+  vNext = FAR16NULL;
   rearm_ctx_hook = 0;
 
@@ -131 +131 @@
         /* restart this port */
         port_mmio = port_base(ai, p);
-        vProblemIorb = NULL;
+        vProblemIorb = FAR16NULL;
         need_reset = 0;
 
@@ -140 +140 @@
         DPRINTF(8," PORT_CMD      = 0x%x\n", ccs);
 
-        for (vIorb = ai->ports[p].iorb_queue.vRoot; vIorb != NULL; vIorb = vNext)
+        for (vIorb = ai->ports[p].iorb_queue.vRoot; vIorb != FAR16NULL; vIorb = vNext)
         {
           IORBH *pIorb = Far16ToFlat(vIorb);
@@ -180 +180 @@
               {
                 /* no further analysis -- we're done with this one */
-                vProblemIorb = NULL;
+                vProblemIorb = FAR16NULL;
               }
             }
@@ -223 +223 @@
         ai->ports[p].cmd_slot = 0;
 
-        if (vProblemIorb != NULL)
+        if (vProblemIorb != FAR16NULL)
         {
           IORBH *pProblemIorb = Far16ToFlat(vProblemIorb);
@@ -271 +271 @@
 
   /* call notification routine on all IORBs which have completed */
-  for (vIorb = done_queue.vRoot; vIorb != NULL; vIorb = vNext)
+  for (vIorb = done_queue.vRoot; vIorb != FAR16NULL; vIorb = vNext)
   {
     IORBH *pIorb = Far16ToFlat(vIorb);
@@ -339 +339 @@
   D32ThunkStackTo32();
 
-  vNext = NULL;
+  vNext = FAR16NULL;
   rearm_ctx_hook = 0;
 
@@ -355 +355 @@
 
   /* add ports of active IORBs from the abort queue to ports_to_reset[] */
-  for (vIorb = abort_queue.vRoot; vIorb != NULL; vIorb = vNext)
+  for (vIorb = abort_queue.vRoot; vIorb != FAR16NULL; vIorb = vNext)
   {
     IORBH *pIorb = Far16ToFlat(vIorb);
@@ -417 +417 @@
 
         /* retry or abort all remaining active commands on this port */
-        for (vIorb = ai->ports[p].iorb_queue.vRoot; vIorb != NULL; vIorb = vNext)
+        for (vIorb = ai->ports[p].iorb_queue.vRoot; vIorb != FAR16NULL; vIorb = vNext)
         {
           IORBH *pIorb = Far16ToFlat(vIorb);
@@ -448 +448 @@
 
   /* complete all aborted IORBs */
-  for (vIorb = done_queue.vRoot; vIorb != NULL; vIorb = vNext)
+  for (vIorb = done_queue.vRoot; vIorb != FAR16NULL; vIorb = vNext)
   {
     IORBH *pIorb = Far16ToFlat(vIorb);