d2q9: rename "timers" (name conflict with libc) master
authorSebastian <git@sraa.de>
Thu, 4 Dec 2014 14:13:14 +0000 (14:13 +0000)
committerSebastian <git@sraa.de>
Thu, 4 Dec 2014 14:13:14 +0000 (14:13 +0000)
d2q9/esrc/main.c

index 1a239ce385733ea334b196ed3e923b08ebfed992..7dcb4024e907604bc537e570acf2a3f9ac45cdc9 100644 (file)
@@ -19,7 +19,7 @@ static uint8_t dummy_bank3[8192] USED SECTION(".data_bank3");
 static block_t *block = (void*)0x2000;
 
 /* timer values */
 static block_t *block = (void*)0x2000;
 
 /* timer values */
-times_t timers = {0};
+times_t times = {0};
 
 /* barrier structures */
 volatile e_barrier_t  barriers[CORES];
 
 /* barrier structures */
 volatile e_barrier_t  barriers[CORES];
@@ -30,7 +30,7 @@ unsigned int row, col, core;
 
 #define READ_TIMER(X) \
        do { \
 
 #define READ_TIMER(X) \
        do { \
-               timers[X] = E_CTIMER_MAX - e_ctimer_stop(E_CTIMER_0); \
+               times[X] = E_CTIMER_MAX - e_ctimer_stop(E_CTIMER_0); \
                e_ctimer_set(E_CTIMER_0, E_CTIMER_MAX); \
                e_ctimer_start(E_CTIMER_0, E_CTIMER_CLK); \
        } while(0);
                e_ctimer_set(E_CTIMER_0, E_CTIMER_MAX); \
                e_ctimer_start(E_CTIMER_0, E_CTIMER_CLK); \
        } while(0);