deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1705 from simonduq/pr/nrf52dk-rtimer-diff

Browse source 
Platform nrf52dk: use RTIMER_CLOCK_DIFF instead of RTIMER_CLOCK_LT
This commit is contained in:
Antonio Lignan 2016-06-03 21:59:25 +02:00
parent 04b618d342 704ec4e97c
commit c746ca105a
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/nrf52dk/platform-conf.h
View file

@ -131,10 +131,10 @@ typedef uint32_t uip_stats_t;
#define RTIMER_ARCH_SECOND 62500 #define RTIMER_ARCH_SECOND 62500
/* /*
* rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
* RTIMER_CLOCK_LT to override this * RTIMER_CLOCK_DIFF to override this
typedef uint32_t rtimer_clock_t;
#define RTIMER_CLOCK_LT(a, b) ((int32_t)((a) - (b)) < 0)
*/ */
typedef uint32_t rtimer_clock_t;
#define RTIMER_CLOCK_DIFF(a,b) ((int32_t)((a)-(b)))
/** @} */ /** @} */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

3
regression-tests/24-compile-nrf52-ports/Makefile
View file

@ -11,7 +11,8 @@ hello-world/nrf52dk \
nrf52dk/coap-demo/nrf52dk:coap-server \ nrf52dk/coap-demo/nrf52dk:coap-server \
nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \ nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
nrf52dk/mqtt-demo/nrf52dk \ nrf52dk/mqtt-demo/nrf52dk \
nrf52dk/blink-hello/nrf52dk nrf52dk/blink-hello/nrf52dk \
nrf52dk/timer-test/nrf52dk
TOOLS= TOOLS=