From 5b60c2942d476af970ebfbfd05df91efd70d5a22 Mon Sep 17 00:00:00 2001 From: tkuyucu Date: Wed, 11 Jun 2014 09:21:24 +0200 Subject: [PATCH] Revert "Re-init Timer if powered down" This reverts commit 21a8a92e874543c2867c63b6e13f4cc839c3586f. --- libraries/mbed/common/error.c | 8 -------- .../hal/TARGET_NORDIC/TARGET_NRF51822/us_ticker.c | 14 +++++++------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/libraries/mbed/common/error.c b/libraries/mbed/common/error.c index 0af7fd1caf..7c6a556c03 100644 --- a/libraries/mbed/common/error.c +++ b/libraries/mbed/common/error.c @@ -21,10 +21,6 @@ #include #endif -#ifdef __cplusplus -extern "C" { -#endif - WEAK void error(const char* format, ...); WEAK void error(const char* format, ...) { #if DEVICE_STDIO_MESSAGES @@ -35,7 +31,3 @@ WEAK void error(const char* format, ...) { #endif exit(1); } - -#ifdef __cplusplus -} -#endif diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/us_ticker.c b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/us_ticker.c index b650d52e0e..b6b2551753 100644 --- a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/us_ticker.c +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_NRF51822/us_ticker.c @@ -62,7 +62,7 @@ void TIMER1_IRQHandler(void){ } #endif void us_ticker_init(void){ - if (us_ticker_inited && US_TICKER_TIMER->POWER){ + if (us_ticker_inited){ return; } @@ -75,18 +75,18 @@ void us_ticker_init(void){ US_TICKER_TIMER->PRESCALER = 4; US_TICKER_TIMER->BITMODE = TIMER_BITMODE_BITMODE_16Bit; - US_TICKER_TIMER->TASKS_CLEAR =1; - US_TICKER_TIMER->CC[1] = 0xFFFF; - US_TICKER_TIMER->INTENSET = TIMER_INTENSET_COMPARE1_Set << TIMER_INTENSET_COMPARE1_Pos; + US_TICKER_TIMER->TASKS_CLEAR =1; + US_TICKER_TIMER->CC[1] = 0xFFFF; + US_TICKER_TIMER->INTENSET = TIMER_INTENSET_COMPARE1_Set << TIMER_INTENSET_COMPARE1_Pos; - NVIC_SetPriority(US_TICKER_TIMER_IRQn, 3); + NVIC_SetPriority(US_TICKER_TIMER_IRQn, 3); NVIC_EnableIRQ(US_TICKER_TIMER_IRQn); US_TICKER_TIMER->TASKS_START = 0x01; } uint32_t us_ticker_read(){ - if (!us_ticker_inited || US_TICKER_TIMER->POWER==0){ + if (!us_ticker_inited){ us_ticker_init(); } @@ -101,7 +101,7 @@ uint32_t us_ticker_read(){ } void us_ticker_set_interrupt(unsigned int timestamp){ - if (!us_ticker_inited || US_TICKER_TIMER->POWER==0) + if (!us_ticker_inited) { us_ticker_init(); }