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 #936 from jeremybrodt/issue934 

Fix issue #934: Handled condition when head is NULL.
pull/945/head
Martin Kojtal 2015-03-03 08:09:58 +01:00
parent 088b5c41a7 6bc00fda8a
commit 38514db08e
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,6 +117,16 @@ void us_ticker_remove_event(ticker_event_t *obj) {
__enable_irq();
}
timestamp_t us_ticker_get_next_timestamp(void) {
return head->timestamp;
int us_ticker_get_next_timestamp(timestamp_t *timestamp) {
int ret = 0;
/* if head is NULL, there are no pending events */
__disable_irq();
if (head != NULL) {
*timestamp = head->timestamp;
ret = 1;
}
__enable_irq();
return ret;
}

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

@ -43,7 +43,7 @@ void us_ticker_irq_handler(void);
void us_ticker_insert_event(ticker_event_t *obj, timestamp_t timestamp, uint32_t id);
void us_ticker_remove_event(ticker_event_t *obj);
timestamp_t us_ticker_get_next_timestamp(void);
int us_ticker_get_next_timestamp(timestamp_t *timestamp);
#ifdef __cplusplus
}