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

Timestamp:

Dec 15, 2016, 12:31:51 AM (9 years ago)

Author:

David Azarewicz

Message:

Reworked makefile
Fixed context hook logic.

File:

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

trunk/src/os2ahci/os2ahci.c

@@ -422 +422 @@
   if (com_baud) InitComPort(com_baud);
 
-  NTPRINTF("BldLevel: %s\n", BldLevel);
-  NTPRINTF("CmdLine: %s\n", cmd_line);
+  dprintf(0,"BldLevel: %s\n", BldLevel);
+  dprintf(0,"CmdLine: %s\n", cmd_line);
   /*
   if (sizeof(ADD_WORKSPACE) > ADD_WORKSPACE_SIZE)
@@ -634 +634 @@
 
         /* unit handle outside of the allowed range */
-        DPRINTF(0,"warning: IORB for %d.%d.%d out of range\n", a, p, d);
+        dprintf(0,"warning: IORB for %d.%d.%d out of range\n", a, p, d);
         pIorb->Status = IORB_ERROR;
         pIorb->ErrorCode = IOERR_CMD_SYNTAX;
@@ -1077 +1077 @@
     if ((u32)(pPtr + 1) - (u32)pDt > pIorb_conf->DeviceTableLen)
     {
-      DPRINTF(0,"error: device table provided by DASD too small\n");
+      dprintf(0,"error: device table provided by DASD too small\n");
       iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
       goto iocm_device_table_done;
@@ -1106 +1106 @@
         if (ad_info->busy)
         {
-          DPRINTF(0,"error: port scan requested while adapter was busy\n");
+          dprintf(0,"error: port scan requested while adapter was busy\n");
           iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
           goto iocm_device_table_done;
@@ -1118 +1118 @@
         if (rc != 0)
         {
-          DPRINTF(0,"error: port scan failed on adapter #%d\n", dta);
+          dprintf(0,"error: port scan failed on adapter #%d\n", dta);
           iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
           goto iocm_device_table_done;
@@ -1312 +1312 @@
   }
 
+  #ifdef DEBUG
   if (D32g_DbgLevel)
   {
@@ -1347 +1348 @@
            pIorb->Timeout);
   }
+  #endif
 }
 
@@ -1385 +1387 @@
   }
 
+  #ifdef DEBUG
   if (found)
   {
@@ -1393 +1396 @@
     DPRINTF(2,"IORB %x not found in queue %x\n", vIorb, queue);
   }
+  #endif
 
   return(!found);
@@ -1553 +1557 @@
 
   Timer_CancelTimer(timer_handle);
-  DPRINTF(0,"timeout for IORB %x\n", vIorb);
+  dprintf(0,"timeout for IORB %x\n", vIorb);
 
   /* Move the timed-out IORB to the abort queue. Since it's possible that the
@@ -1606 +1610 @@
   /* reset watchdog timer */
   Timer_CancelTimer(timer_handle);
-  DPRINTF(0,"reset watchdog invoked\n");
+  dprintf(0,"reset watchdog invoked\n");
 
   /* call context hook manually */
@@ -1639 +1643 @@
   if ((u32)(pUi + 1) - (u32)pDt > pIorb_conf->DeviceTableLen)
   {
-    DPRINTF(0,"error: device table provided by DASD too small\n");
+    dprintf(0,"error: device table provided by DASD too small\n");
     iorb_seterr(&pIorb_conf->iorbh, IOERR_CMD_SW_RESOURCE);
     return(-1);