Skip to content

Commit 99c2f61

Browse files
author
Arto Kinnunen
committed
Squashed 'features/nanostack/sal-stack-nanostack-eventloop/' changes from 778c4db..b8b664b
b8b664b (via Mbed OS) Require dependencies from nanostack mbed_lib.json (#41) 213dbf8 Remove references to yotta (#39) 3344181 minar_hal_timer.cpp: Change license header from ARM to APACHE-2.0 git-subtree-dir: features/nanostack/sal-stack-nanostack-eventloop git-subtree-split: b8b664b163e0f281187f988d5e0628d9f6cd7add
1 parent 623607c commit 99c2f61

File tree

5 files changed

+3
-107
lines changed

5 files changed

+3
-107
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
*.a
22
output/*
33
build
4-
yotta_modules
5-
yotta_targets
64
*.lib

mbed_lib.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "nanostack-eventloop",
3+
"requires": ["nanostack-hal"],
34
"config": {
45
"use_platform_tick_timer": {
56
"help": "Use platform provided low resolution tick timer for eventloop",

module.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

nanostack-event-loop/platform/eventloop_config.h

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#define EVENTLOOP_CONFIG_H_
1818

1919
/*
20-
* Options can be picked up from mbed-cli JSON configuration, or from
21-
* Yotta JSON configuration, or from a user configuration file - see below.
20+
* Options can be picked up from mbed-cli JSON configuration or from
21+
* a user configuration file - see below.
2222
*
2323
* Undefine all internal flags before evaluating the configuration.
2424
*/
@@ -39,13 +39,6 @@
3939
#define NS_EXCLUDE_HIGHRES_TIMER 1
4040
#endif
4141

42-
/*
43-
* For mbedOS 3 and minar use platform tick timer by default, highres timers should come from eventloop adaptor
44-
*/
45-
#ifdef YOTTA_CFG_MINAR
46-
#define NS_EVENTLOOP_USE_TICK_TIMER 1
47-
#endif
48-
4942
/*
5043
* Include the user config file if defined
5144
*/

source/minar_hal_timer.cpp

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)