diff options
author | Marti Bolivar <mbolivar@mit.edu> | 2010-09-26 21:47:55 -0400 |
---|---|---|
committer | Marti Bolivar <mbolivar@mit.edu> | 2010-09-26 21:47:55 -0400 |
commit | 849bc0f8f6abf42567a152cf6e01bf7349902aac (patch) | |
tree | 8d7dd363d7978e320fb71626e9ddc23285c26205 /wirish/time.h | |
parent | c13e850abe053edaa1aad6ef7b928c6bf9288cb3 (diff) | |
download | librambutan-849bc0f8f6abf42567a152cf6e01bf7349902aac.tar.gz librambutan-849bc0f8f6abf42567a152cf6e01bf7349902aac.zip |
wirish reformatted and code-styled
Diffstat (limited to 'wirish/time.h')
-rw-r--r-- | wirish/time.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/wirish/time.h b/wirish/time.h index ad39057..fad47a4 100644 --- a/wirish/time.h +++ b/wirish/time.h @@ -1,4 +1,4 @@ -/* ***************************************************************************** +/****************************************************************************** * The MIT License * * Copyright (c) 2010 Perry Hung. @@ -20,10 +20,10 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. - * ****************************************************************************/ + *****************************************************************************/ /** - * @brief + * @brief Timing and delay functions. */ #ifndef _TIME_H @@ -43,28 +43,28 @@ extern volatile uint32 systick_timer_millis; /* time in milliseconds since boot */ static inline uint32 millis(void) { - return systick_timer_millis; + return systick_timer_millis; } /* Time in microseconds since boot */ static inline uint32 micros(void) { - uint32 ms; - uint32 cycle_cnt; - uint32 res; + uint32 ms; + uint32 cycle_cnt; + uint32 res; - nvic_globalirq_disable(); + nvic_globalirq_disable(); - cycle_cnt = systick_get_count(); - ms = millis(); + cycle_cnt = systick_get_count(); + ms = millis(); - nvic_globalirq_enable(); + nvic_globalirq_enable(); - /* MAPLE_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; + /* MAPLE_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; - return res; + return res; } void delay(unsigned long ms); |