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

Timestamp:

Jan 21, 2014, 7:20:06 PM (10 years ago)

Author:

cfuguet

Message:

• Adding volatile attribute for pointers used to address memory mapped hardware registers.

• Removing the activation of interruptions before the execution of the ctx_switch function on the ioc_access function. This is to avoid been interrupted during the modification of task context variables.

File:

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

soft/giet_vm/giet_drivers/xcu_driver.c

@@ -72 +72 @@
 
 #if USE_XICU
-    unsigned int* xcu_address = (unsigned int *) ((unsigned int)&seg_xcu_base + 
-                                (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    volatile unsigned int* xcu_address =
+        (unsigned int *) ((unsigned int)&seg_xcu_base + 
+        (cluster_xy * (unsigned int)&vseg_cluster_increment));
+
     unsigned int func;
     if      (irq_type == IRQ_TYPE_PTI) func = XICU_MSK_PTI_ENABLE;
@@ -109 +111 @@
 
 #if USE_XICU
-    unsigned int* xcu_address = (unsigned int *) ((unsigned int)&seg_xcu_base + 
-                                (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    volatile unsigned int* xcu_address =
+        (unsigned int *) ((unsigned int)&seg_xcu_base + 
+        (cluster_xy * (unsigned int)&vseg_cluster_increment));
 
     unsigned int prio = xcu_address[XICU_REG(XICU_PRIO, proc_id)];
@@ -151 +154 @@
 
 #if USE_XICU
-    unsigned int* xcu_address = (unsigned int *) ((unsigned int)&seg_xcu_base + 
-                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    volatile unsigned int* xcu_address =
+        (unsigned int *) ((unsigned int)&seg_xcu_base + 
+        (cluster_xy * (unsigned int)&vseg_cluster_increment));
+
     xcu_address[XICU_REG(XICU_WTI_REG, proc_id)] = wdata;
     return 0; 
@@ -180 +185 @@
 
 #if USE_XICU
-    unsigned int* xcu_address = (unsigned int *) ((unsigned int)&seg_xcu_base + 
-                                (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    volatile unsigned int* xcu_address =
+        (unsigned int *) ((unsigned int)&seg_xcu_base + 
+        (cluster_xy * (unsigned int)&vseg_cluster_increment));
+
     xcu_address[XICU_REG(XICU_PTI_PER, pti_index)] = period;
     return 0;
@@ -208 +215 @@
 
 #if USE_XICU
-    unsigned int * xcu_address = (unsigned int *) ((unsigned int)&seg_xcu_base + 
-                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    volatile unsigned int * xcu_address =
+        (unsigned int *) ((unsigned int)&seg_xcu_base + 
+        (cluster_xy * (unsigned int)&vseg_cluster_increment));
+
     xcu_address[XICU_REG(XICU_PTI_PER, pti_index)] = 0;
     return 0;
@@ -271 +280 @@
 
 #if USE_XICU
-    unsigned int * xcu_address = (unsigned int *) ((unsigned int) &seg_xcu_base + 
-                                 (cluster_xy * (unsigned int)&vseg_cluster_increment));
+    volatile unsigned int * xcu_address =
+        (unsigned int *) ((unsigned int) &seg_xcu_base + 
+        (cluster_xy * (unsigned int)&vseg_cluster_increment));
 
     unsigned int period = xcu_address[XICU_REG(XICU_PTI_PER, pti_index)];