Changeset 593 for soft

Timestamp:

Jul 8, 2015, 4:09:23 PM (9 years ago)

Author:

alain

Message:

Bloup

Location:

soft/giet_vm/giet_drivers

Files:

• bdv_driver.c (modified) (8 diffs)
• sdc_driver.c (modified) (1 diff)

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -73 +73 @@
     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[BDV DEBUG] P[%d,%d,%d] enters _bdv_access at cycle %d\n"
         "  use_irq = %d / to_mem = %d / lba = %x / paddr = %l / count = %d\n",
@@ -81 +81 @@
 
     // check buffer alignment
-    if( buf_paddr & 0x1FF )
-    {
-        _printf("\n[BDV ERROR] in _bdv_access() : buffer not block aligned\n");
+    if( buf_paddr & 0x3F )
+    {
+        _printf("\n[BDV ERROR] in _bdv_access() : buffer not cache ligne aligned\n");
         return -1;
     }
@@ -114 +114 @@
         else             _bdv_set_register( BLOCK_DEVICE_OP, BLOCK_DEVICE_READ );
 
-#if GIET_DEBUG_IOC_DRIVER
-if ( _get_proctime() > GIET_DEBUG_IOC_DRIVER )
+#if GIET_DEBUG_IOC
+if ( _get_proctime() > GIET_DEBUG_IOC )
 _printf("\n[BDV DEBUG] _bdv_access() : P[%d,%d,%d] launch transfer"
         " in polling mode at cycle %d\n",
@@ -125 +125 @@
             status = _bdv_get_register( BLOCK_DEVICE_STATUS );
 
-#if GIET_DEBUG_IOC_DRIVER
-if ( _get_proctime() > GIET_DEBUG_IOC_DRIVER )
+#if GIET_DEBUG_IOC
+if ( _get_proctime() > GIET_DEBUG_IOC )
 _printf("\n[BDV DEBUG] _bdv_access() : P[%d,%d,%d] wait on BDV_STATUS ...\n",
         x , y , p );
@@ -169 +169 @@
         else             _bdv_set_register( BLOCK_DEVICE_OP, BLOCK_DEVICE_READ  );
 
-#if GIET_DEBUG_IOC_DRIVER
-if ( _get_proctime() > GIET_DEBUG_IOC_DRIVER )
+#if GIET_DEBUG_IOC
+if ( _get_proctime() > GIET_DEBUG_IOC )
 _printf("\n[BDV DEBUG] _bdv_access() : P[%d,%d,%d] launch transfer"
         " in descheduling mode at cycle %d\n",
@@ -179 +179 @@
         _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[BDV DEBUG] _bdv_access() : P[%d,%d,%d] resume execution at cycle %d\n",
         x , y , p , _get_proctime() );
@@ -196 +196 @@
     _spin_lock_release( &_bdv_lock );      
 
-#if GIET_DEBUG_IOC_DRIVER
-if ( _get_proctime() > GIET_DEBUG_IOC_DRIVER )
+#if GIET_DEBUG_IOC
+if ( _get_proctime() > GIET_DEBUG_IOC )
 _printf("\n[BDV DEBUG] _bdv_access() : P[%d,%d,%d] exit at cycle %d\n",
         x , y , p , _get_proctime() );
@@ -254 +254 @@
                    0 );          // don't force context switch 
 
-#if GIET_DEBUG_IOC_DRIVER  
+#if GIET_DEBUG_IOC  
 unsigned int procid  = _get_procid();
 unsigned int x       = procid >> (Y_WIDTH + P_WIDTH);
 unsigned int y       = (procid >> P_WIDTH) & ((1<<Y_WIDTH)-1);
 unsigned int p       = procid & ((1<<P_WIDTH)-1);
-if ( _get_proctime() > GIET_DEBUG_IOC_DRIVER )
+if ( _get_proctime() > GIET_DEBUG_IOC )
 _printf("\n[BDV DEBUG] Processor[%d,%d,%d] enters _bdv_isr() at cycle %d\n"
         "  for task %d running on P[%d,%d,%d] / bdv_status = %x\n",

soft/giet_vm/giet_drivers/sdc_driver.c

@@ -246 +246 @@
 #endif
 
+    return 0;
 } // end _sdc_init()