ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #864 from 0xc0170/fix_revert_nordic_usticker_#839 

HAL - NRF51822 - us ticker fix for the #839
pull/629/merge
Martin Kojtal 2015-01-26 18:40:23 +01:00
parent e979bd60eb 1fca34a068
commit 60e511b0f8
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mbed/common/us_ticker_api.c
View File

@ -70,7 +70,7 @@ void us_ticker_insert_event(ticker_event_t *obj, timestamp_t timestamp, uint32_t
ticker_event_t *prev = NULL, *p = head; ticker_event_t *prev = NULL, *p = head;
while (p != NULL) { while (p != NULL) {
/* check if we come before p */ /* check if we come before p */
if ((signedTimestamp_t)(timestamp - p->timestamp) < 0) { if ((int)(timestamp - p->timestamp) < 0) {
break; break;
} }
/* go to the next element */ /* go to the next element */

1
libraries/mbed/hal/us_ticker_api.h
View File

@ -23,7 +23,6 @@ extern "C" {
#endif #endif
typedef uint32_t timestamp_t; typedef uint32_t timestamp_t;
typedef int32_t signedTimestamp_t; /* The signed version of the above declaration. */
uint32_t us_ticker_read(void); uint32_t us_ticker_read(void);

4
libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/us_ticker.c
View File

@ -18,7 +18,6 @@
#include "cmsis.h" #include "cmsis.h"
#include "PeripheralNames.h" #include "PeripheralNames.h"
#include "app_timer.h" #include "app_timer.h"
#include "projectconfig.h"
static bool us_ticker_inited = false; static bool us_ticker_inited = false;
static volatile bool us_ticker_appTimerRunning = false; static volatile bool us_ticker_appTimerRunning = false;
@ -30,8 +29,7 @@ void us_ticker_init(void)
return; return;
} }
APP_TIMER_INIT(CFG_TIMER_PRESCALER, CFG_TIMER_MAX_INSTANCE, CFG_TIMER_OPERATION_QUEUE_SIZE, CFG_SCHEDULER_ENABLE); APP_TIMER_INIT(0 /*CFG_TIMER_PRESCALER*/ , 1 /*CFG_TIMER_MAX_INSTANCE*/, 1 /*CFG_TIMER_OPERATION_QUEUE_SIZE*/, false /*CFG_SCHEDULER_ENABLE*/);
us_ticker_inited = true; us_ticker_inited = true;
} }