Changeset 320 for soft/giet_vm/giet_drivers/bdv_driver.c

Timestamp:

Jun 10, 2014, 12:33:23 PM (10 years ago)

Author:

alain

Message:

All drivers have been modified to use only the information
contained in the hard_config.h file

File:

• soft/giet_vm/giet_drivers/bdv_driver.c (modified) (9 diffs)

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -42 +42 @@
 // An error code is returned if these conditions are not verified.
 //
-// The "seg_ioc_base" must be defined in giet_vsegs.ld file.
+// The SEG_IOC_BASE address must be defined in the hard_config.h file.
 ///////////////////////////////////////////////////////////////////////////////////
 // Implementation notes:
@@ -55 +55 @@
 
 #include <giet_config.h>
+#include <hard_config.h>
 #include <bdv_driver.h>
 #include <xcu_driver.h>
@@ -77 +78 @@
 unsigned int _bdv_get_register( unsigned int index )
 {
-    unsigned int* vaddr = (unsigned int*)&seg_ioc_base + index;
+    unsigned int* vaddr = (unsigned int*)SEG_IOC_BASE + index;
     return _io_extended_read( vaddr );
 }
@@ -87 +88 @@
                         unsigned int value ) 
 {
-    unsigned int* vaddr = (unsigned int*)&seg_ioc_base + index;
+    unsigned int* vaddr = (unsigned int*)SEG_IOC_BASE + index;
     _io_extended_write( vaddr, value );
 }
@@ -185 +186 @@
         _it_disable( &save_sr ); 
         
+
         // set _bdv_gtid and reset runnable 
         _bdv_gtid = (gpid<<16) + ltid;
@@ -300 +302 @@
                unsigned int channel )   // unused 
 {
-    unsigned int procid     = _get_procid();
-    unsigned int cluster_xy = procid / NB_PROCS_MAX;
-    unsigned int lpid       = procid % NB_PROCS_MAX;
-
     // get BDV status (and reset IRQ)
     unsigned int status =  _bdv_get_register( BLOCK_DEVICE_STATUS ); 
@@ -311 +309 @@
          (status == BLOCK_DEVICE_BUSY) )   return;
  
-    // reset WTI in XCU if WTI type
-    if ( irq_type == IRQ_TYPE_WTI ) 
-    {
-        unsigned int value;
-        _xcu_get_wti_value( cluster_xy, irq_id, &value );
-    }
-    
     // save status in kernel buffer _bdv_status
     _bdv_status = status; 
 
     // identify task waiting on BDV
-    unsigned int rprocid    = _bdv_gtid>>16;
-    unsigned int ltid       = _bdv_gtid & 0xFFFF;
-    unsigned int remote_xy  = rprocid / NB_PROCS_MAX;
+    unsigned int rprocid     = _bdv_gtid>>16;
+    unsigned int ltid        = _bdv_gtid & 0xFFFF;
+    unsigned int remote_xy   = rprocid / NB_PROCS_MAX;
+    unsigned int remote_lpid = rprocid % NB_PROCS_MAX;
 
     // re-activates sleeping task
@@ -333 +325 @@
 
     // requires a context switch for remote processor running the waiting task 
-    _xcu_send_wti( remote_xy,    // cluster index
-                   lpid,         // local processor index
+    _xcu_send_wti( remote_xy,    // remote cluster index
+                   remote_lpid,  // remote local processor index
                    0 );          // don't force context switch if not idle
 
 #if GIET_DEBUG_IRQS  // we don't take the TTY lock to avoid deadlock
+unsigned int procid     = _get_procid();
+unsigned int cluster_xy = procid / NB_PROCS_MAX;
+unsigned int lpid       = procid % NB_PROCS_MAX;
 unsigned int x              = cluster_xy >> Y_WIDTH;
 unsigned int y              = cluster_xy & ((1<<Y_WIDTH)-1);
 unsigned int rx             = remote_xy >> Y_WIDTH;
 unsigned int ry             = remote_xy & ((1<<Y_WIDTH)-1);
-unsigned int rlpid          = rprocid % NB_PROCS_MAX;
 _puts("\n[IRQS DEBUG] Processor[");
 _putd(x );
@@ -358 +352 @@
 _putd(ry );
 _puts(",");
-_putd(rlpid );
+_putd(remote_lpid );
 _puts(" / bdv status = ");
 _putx(_bdv_status );