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

Merge commit '99c2f61463ded19baa49346f6210f9eb3e62161f' 

* commit '99c2f61463ded19baa49346f6210f9eb3e62161f':
  Squashed 'features/nanostack/sal-stack-nanostack-eventloop/' changes from 778c4db..b8b664b
pull/9838/head
Arto Kinnunen 2019-02-25 12:56:24 +02:00
parent 5f38878f3a 99c2f61463
commit 220470c577
3 changed files with 2 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/nanostack/sal-stack-nanostack-eventloop/.gitignore vendored
View File

@ -1,6 +1,4 @@
*.a
output/*
build
yotta_modules
yotta_targets
*.lib

11
features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/eventloop_config.h
View File

@ -17,8 +17,8 @@
#define EVENTLOOP_CONFIG_H_
/*
* Options can be picked up from mbed-cli JSON configuration, or from
* Yotta JSON configuration, or from a user configuration file - see below.
* Options can be picked up from mbed-cli JSON configuration or from
* a user configuration file - see below.
*
* Undefine all internal flags before evaluating the configuration.
*/
@ -39,13 +39,6 @@
#define NS_EXCLUDE_HIGHRES_TIMER 1
#endif
/*
* For mbedOS 3 and minar use platform tick timer by default, highres timers should come from eventloop adaptor
*/
#ifdef YOTTA_CFG_MINAR
#define NS_EVENTLOOP_USE_TICK_TIMER 1
#endif
/*
* Include the user config file if defined
*/

71
features/nanostack/sal-stack-nanostack-eventloop/source/minar_hal_timer.cpp
View File

@ -1,71 +0,0 @@
/*
* Copyright (c) 2016 ARM Limited, All Rights Reserved
*/
// Include before mbed.h to properly get UINT*_C()
#include "ns_types.h"
#include "platform/arm_hal_timer.h"
#include "platform/arm_hal_interrupt.h"
#if defined(NS_EVENTLOOP_USE_TICK_TIMER) && defined(YOTTA_CFG_MINAR)
#include "minar/minar.h"
#include "mbed-drivers/mbed.h"
#include "core-util/FunctionPointer.h"
#include "core-util/Event.h"
#define TICK_TIMER_ID 1
using minar::Scheduler;
using minar::milliseconds;
using minar::callback_handle_t;
using namespace mbed::util;
static callback_handle_t sys_timer_handle;
static void (*tick_timer_callback)(void);
void timer_callback(void const *funcArgument)
{
(void)funcArgument;
if (NULL != tick_timer_callback) {
tick_timer_callback();
}
}
// Low precision platform tick timer
int8_t platform_tick_timer_register(void (*tick_timer_cb_handler)(void))
{
tick_timer_callback = tick_timer_cb_handler;
return TICK_TIMER_ID;
}
int8_t platform_tick_timer_start(uint32_t period_ms)
{
int8_t retval = -1;
if (sys_timer_handle != NULL) {
return 0; // Timer already started already so return success
}
Event e = FunctionPointer1<void, void const *>(timer_callback).bind(NULL);
if (e != NULL) {
sys_timer_handle = Scheduler::postCallback(e).period(milliseconds(period_ms)).getHandle();
if (sys_timer_handle != NULL) {
retval = 0;
}
}
return retval;
}
int8_t platform_tick_timer_stop(void)
{
int8_t retval = -1;
if (sys_timer_handle != NULL) {
Scheduler::cancelCallback(sys_timer_handle);
sys_timer_handle = NULL;
retval = 0;
}
return retval;
}
#endif // defined(NS_EVENTLOOP_USE_TICK_TIMER) && defined(YOTTA_CFG)