Index: /soft/giet_vm/giet_drivers/hba_driver.c
===================================================================
--- /soft/giet_vm/giet_drivers/hba_driver.c	(revision 602)
+++ /soft/giet_vm/giet_drivers/hba_driver.c	(revision 603)
@@ -162,6 +162,6 @@
     unsigned int p       = procid & ((1<<P_WIDTH)-1);
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG HBA] _hba_access() : P[%d,%d,%d] enters at cycle %d\n"
         "  use_irq = %d / to_mem = %d / lba = %x / paddr = %l / count = %d\n",
@@ -246,6 +246,6 @@
         _hba_set_register( HBA_PXCI, (1<<cmd_id) );
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG HBA] _hba_access() : P[%d,%d,%d] get slot %d in Cmd List "
         " at cycle %d / polling\n",
@@ -260,6 +260,6 @@
             pxci = _hba_get_register( HBA_PXCI );
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG HBA] _hba_access() : P[%d,%d,%d] wait on HBA_PXCI / pxci = %x\n",
         x , y , p , pxci );
@@ -285,6 +285,6 @@
     {
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG HBA] _hba_access() : P[%d,%d,%d] get slot %d in Cmd List "
         "at cycle %d / descheduling\n",
@@ -315,6 +315,6 @@
         _ctx_switch();                      
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG HBA] _hba_access() : task %d on P[%d,%d,%d] resume at cycle %d\n",
         ltid , x , y , p , _get_proctime() );
@@ -332,6 +332,6 @@
     release_success = _hba_cmd_release(cmd_id);
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG HBA] _hba_access() : P[%d,%d,%d] release slot %d in Cmd List "
         "and exit at cycle %d\n",
@@ -452,6 +452,6 @@
                            0 );          // don't force context switch
 
-#if GIET_DEBUG_IOC_DRIVER  
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC  
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG HBA] _hba_isr() : command %d completed at cycle %d\n"
         "  resume task %d running on P[%d,%d,%d]\n",
Index: /soft/giet_vm/giet_drivers/sdc_driver.c
===================================================================
--- /soft/giet_vm/giet_drivers/sdc_driver.c	(revision 602)
+++ /soft/giet_vm/giet_drivers/sdc_driver.c	(revision 603)
@@ -133,6 +133,6 @@
     }
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_init() : SDC_CMD0 done at cycle %d\n", _get_proctime() );
 #endif
@@ -152,6 +152,6 @@
     }
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_init() : SDC_CMD8 done at cycle %d\n", _get_proctime() );
 #endif
@@ -165,6 +165,6 @@
     _sdc_sdhc = ( (rsp & SDC_CMD41_RSP_CCS) != 0 );
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_init() : SDC_CMD41 done at cycle %d\n", _get_proctime() );
 #endif
@@ -179,6 +179,6 @@
     _sdc_rca = rsp;
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_init() : SDC_CMD3 done at cycle %d\n", _get_proctime() );
 #endif
@@ -192,6 +192,6 @@
     }
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_init() : SDC_CMD7 done at cycle %d\n", _get_proctime() );
 #endif
@@ -241,6 +241,6 @@
     _sdc_set_register( AHCI_PXCMD  , 1 );
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_init() : AHCI init done at cycle %d\n", _get_proctime() );
 #endif
@@ -263,6 +263,6 @@
     unsigned int iter;
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_access() : P[%d,%d,%d] enters at cycle %d\n"
         "  use_irq = %d / to_mem = %d / lba = %x / paddr = %l / count = %d\n",
@@ -366,6 +366,6 @@
         _sdc_set_register( AHCI_PXCI, (1<<ptw) );
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_access() : command %d for P[%d,%d,%d]"
         " at cycle %d / polling\n",
@@ -408,6 +408,6 @@
     {
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_access() : command %d for P[%d,%d,%d] "
         "at cycle %d / descheduling\n",
@@ -435,6 +435,6 @@
         _ctx_switch();                      
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_access() : task %d on P[%d,%d,%d] resume at cycle %d\n",
         ltid , x , y , p , _get_proctime() );
@@ -448,6 +448,6 @@
     }    
 
-#if GIET_DEBUG_IOC_DRIVER
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_access() : P[%d,%d,%d] exit at cycle %d\n",
         x , y , p , _get_proctime() );
@@ -509,6 +509,6 @@
                            0 );          // don't force context switch
 
-#if GIET_DEBUG_IOC_DRIVER  
-if (_get_proctime() > GIET_DEBUG_IOC_DRIVER)
+#if GIET_DEBUG_IOC  
+if (_get_proctime() > GIET_DEBUG_IOC)
 _printf("\n[DEBUG SDC] _sdc_isr() : command %d completed at cycle %d\n"
         "  resume task %d running on P[%d,%d,%d] / status = %x\n",
