Steve Kim / mbed-src

mbed library sources(for async_print)

Dependents:   AsyncPrint

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 453:a290c6acf95e, committed 2015-01-26

Comitter:
mbed_official
Date:
Mon Jan 26 17:45:07 2015 +0000
Parent:
452:a2b30f7d1bc5
Child:
454:a07e52520545
Commit message:
Synchronized with git revision 18a61f8a2a132c6c869d50eac7cb656fa994cff1

Full URL: https://github.com/mbedmicro/mbed/commit/18a61f8a2a132c6c869d50eac7cb656fa994cff1/

Tools - expoters init file - tempdir name fix

Changed in this revision

common/us_ticker_api.c Show annotated file Show diff for this revision Revisions of this file
hal/us_ticker_api.h Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/us_ticker.c Show annotated file Show diff for this revision Revisions of this file 
--- a/common/us_ticker_api.c	Mon Jan 26 14:15:07 2015 +0000
+++ b/common/us_ticker_api.c	Mon Jan 26 17:45:07 2015 +0000
@@ -70,7 +70,7 @@
     ticker_event_t *prev = NULL, *p = head;
     while (p != NULL) {
         /* check if we come before p */
-        if ((signedTimestamp_t)(timestamp - p->timestamp) < 0) {
+        if ((int)(timestamp - p->timestamp) < 0) {
             break;
         }
         /* go to the next element */

--- a/hal/us_ticker_api.h	Mon Jan 26 14:15:07 2015 +0000
+++ b/hal/us_ticker_api.h	Mon Jan 26 17:45:07 2015 +0000
@@ -23,7 +23,6 @@
 #endif
 
 typedef uint32_t timestamp_t;
-typedef int32_t  signedTimestamp_t; /* The signed version of the above declaration. */
 
 uint32_t us_ticker_read(void);
 

--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/us_ticker.c	Mon Jan 26 14:15:07 2015 +0000
+++ b/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/us_ticker.c	Mon Jan 26 17:45:07 2015 +0000
@@ -18,7 +18,6 @@
 #include "cmsis.h"
 #include "PeripheralNames.h"
 #include "app_timer.h"
-#include "projectconfig.h"
 
 static bool           us_ticker_inited          = false;
 static volatile bool  us_ticker_appTimerRunning = false;
@@ -30,8 +29,7 @@
         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;
 }