projects
/
lattice-boltzmann-epiphany.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
44c1f0a
)
d2q9: rename "timers" (name conflict with libc)
master
author
Sebastian
<git@sraa.de>
Thu, 4 Dec 2014 14:13:14 +0000
(14:13 +0000)
committer
Sebastian
<git@sraa.de>
Thu, 4 Dec 2014 14:13:14 +0000
(14:13 +0000)
d2q9/esrc/main.c
patch
|
blob
|
history
diff --git
a/d2q9/esrc/main.c
b/d2q9/esrc/main.c
index 1a239ce385733ea334b196ed3e923b08ebfed992..7dcb4024e907604bc537e570acf2a3f9ac45cdc9 100644
(file)
--- a/
d2q9/esrc/main.c
+++ b/
d2q9/esrc/main.c
@@
-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 time
r
s = {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 { \
- time
r
s[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);