Changeset 529 for soft/giet_vm/giet_drivers/xcu_driver.c

Timestamp:

Mar 27, 2015, 11:51:33 AM (10 years ago)

Author:

alain

Message:

1) Removing the IOC driver (integrated in the FAT library).
2) Simplifying the BDV, HBA, SDC, RDK drivers: they support
only two modes (synchronous => polling / descheduling => IRQ),
and only one access function (for both read/write).

File:

• soft/giet_vm/giet_drivers/xcu_driver.c (modified) (18 diffs)

soft/giet_vm/giet_drivers/xcu_driver.c

@@ -87 +87 @@
                     unsigned int irq_type ) 
 {
-#if USE_XCU
     // parameters checking 
     unsigned int x = cluster_xy >> Y_WIDTH;
@@ -106 +105 @@
 
     _xcu_set_register(cluster_xy, func, channel, value);
-
-#else
-    _printf("[GIET ERROR] _xcu_set_mask() should not be used if USE_XCU not set\n");
-    _exit();
-#endif
 }
 
@@ -119 +113 @@
                      unsigned int * irq_type )
 {
-#if USE_XCU
     // parameters checking 
     unsigned int x = cluster_xy >> Y_WIDTH;
@@ -153 +146 @@
         *index = 32;
     }
- 
-#else
-    _printf("[GIET ERROR] _xcu_get_index should not be used if USE_XCU is not set\n");
-    _exit();
-#endif
 }
 
@@ -165 +153 @@
                     unsigned int wdata )
 { 
-#if USE_XCU
     // parameters checking 
     unsigned int x = cluster_xy >> Y_WIDTH;
@@ -174 +161 @@
 
     _xcu_set_register(cluster_xy, XCU_WTI_REG, wti_index, wdata);
-
-#else
-    _printf("[GIET ERROR] _xcu_send_wti() should not be used if USE_XCU is not set\n");
-    _exit();
-#endif
 } 
 
@@ -186 +168 @@
                           unsigned int wdata )
 { 
-#if USE_XCU
     // parameters checking 
     unsigned int x = cluster_xy >> Y_WIDTH;
@@ -199 +180 @@
 
     _physical_write(paddr, wdata);
-
-#else
-    _puts("[GIET ERROR] _xcu_send_wti() should not be used if USE_XCU is not set\n");
-    _exit();
-#endif
-}
+}
+
 ///////////////////////////////////////////////////
 void _xcu_get_wti_value( unsigned int   cluster_xy,
@@ -210 +187 @@
                          unsigned int * value )
 {
-#if USE_XCU
     // parameters checking 
     unsigned int x = cluster_xy >> Y_WIDTH;
@@ -219 +195 @@
  
     *value = _xcu_get_register(cluster_xy, XCU_WTI_REG, wti_index);
-
-#else
-    _printf("[GIET ERROR] in _xcu_get_wti_value() USE_XCU is not set\n");
-    _exit();
-#endif
 }
 
@@ -230 +201 @@
                            unsigned int * address )
 {
-#if USE_XCU
-    if (wti_index >= 32)           _exit(); 
+    if (wti_index >= 32)  _exit(); 
  
     *address = SEG_XCU_BASE + (XCU_REG(XCU_WTI_REG, wti_index)<<2); 
-
-#else
-    _printf("[GIET ERROR] in _xcu_get_wti_address() USE_XCU is not set\n");
-    _exit();
-#endif
 }
 
@@ -246 +211 @@
                        unsigned int period )
 {
-#if USE_XCU
     // parameters checking 
     unsigned int x = cluster_xy >> Y_WIDTH;
@@ -254 +218 @@
 
     _xcu_set_register(cluster_xy, XCU_PTI_PER, pti_index, period);
-
-#else
-    _printf("[GIET ERROR] in _xcu_timer_start() USE_XCU is not set\n");
-    _exit();
-#endif
 }
 
@@ -265 +224 @@
                       unsigned int pti_index) 
 {
-#if USE_XCU
     // parameters checking 
     unsigned int x = cluster_xy >> Y_WIDTH;
@@ -273 +231 @@
 
     _xcu_set_register(cluster_xy, XCU_PTI_PER, pti_index, 0);
-
-#else
-    _printf("[GIET ERROR] in _xcu_timer_stop() USE_XCU is not set\n");
-    _exit();
-#endif
 }
 
 ///////////////////////////////////////////////////////////
-unsigned int _xcu_timer_reset_irq( unsigned int cluster_xy, 
-                                   unsigned int pti_index ) 
-{
-#if USE_XCU
+void _xcu_timer_reset_irq( unsigned int cluster_xy, 
+                           unsigned int pti_index ) 
+{
     // parameters checking 
     unsigned int x = cluster_xy >> Y_WIDTH;
@@ -292 +244 @@
 
     // This return value is not used / avoid a compilation warning.
-    return _xcu_get_register(cluster_xy, XCU_PTI_ACK, pti_index);
-
-#else
-    _puts("[GIET ERROR] in _xcu_timer_reset_irq() USE_XCU is not set\n");
-    _exit();
-    return 0;
-#endif
+    x = _xcu_get_register(cluster_xy, XCU_PTI_ACK, pti_index);
 }
 
@@ -305 +251 @@
                            unsigned int pti_index ) 
 {
-#if USE_XCU
     // parameters checking 
     unsigned int x = cluster_xy >> Y_WIDTH;
@@ -318 +263 @@
     _xcu_set_register(cluster_xy, XCU_PTI_PER, pti_index, 0);
     _xcu_set_register(cluster_xy, XCU_PTI_PER, pti_index, per);
-
-#else
-    _puts("[GIET ERROR] in _xcu_timer_reset_cpt() USE_XCU is not set\n");
-    _exit();
-#endif
 }