diff options
| author | Marti Bolivar <mbolivar@mit.edu> | 2010-12-14 15:41:17 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@mit.edu> | 2010-12-14 15:41:17 -0500 |
| commit | 74c8937446e1be4e0d21f69a8c098e2caf7814d5 (patch) | |
| tree | 1c7b8e4d93a9512ee54cdd6c5bb7ede064f96b3e /wirish/time.h | |
| parent | 5ceac644e90c929e77f05d357d1d35d45e673fac (diff) | |
| parent | b67d281d85bd59a9738a9a43c4db1027f81d9208 (diff) | |
| download | librambutan-74c8937446e1be4e0d21f69a8c098e2caf7814d5.tar.gz librambutan-74c8937446e1be4e0d21f69a8c098e2caf7814d5.zip | |
Merge branch 'master' into newdoc
Diffstat (limited to 'wirish/time.h')
| -rw-r--r-- | wirish/time.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wirish/time.h b/wirish/time.h index 18aef9a..c925f74 100644 --- a/wirish/time.h +++ b/wirish/time.h @@ -68,10 +68,10 @@ static inline uint32 micros(void) { nvic_globalirq_enable(); - /* MAPLE_RELOAD_VAL is 1 less than the number of cycles it actually - takes to complete a systick reload */ + /* SYSTICK_RELOAD_VAL is 1 less than the number of cycles it + actually takes to complete a SysTick reload */ res = (ms * US_PER_MS) + - (MAPLE_RELOAD_VAL + 1 - cycle_cnt)/CYCLES_PER_MICROSECOND; + (SYSTICK_RELOAD_VAL + 1 - cycle_cnt)/CYCLES_PER_MICROSECOND; return res; } |