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 #6627 from TeroJaasko/nanostack_hal_timer_shortcut 

Nanostack hal timer shortcut
pull/6538/merge
Cruz Monrreal 2018-04-17 10:55:26 -05:00 committed by GitHub
parent 43bf01008a a23b7cffea
commit 853384a5ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
features/FEATURE_COMMON_PAL/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp
View File

@ -12,15 +12,26 @@
static Timer timer; static Timer timer;
static Timeout timeout; static Timeout timeout;
// If critical sections are implemented using mutexes, timers must be called in thread context, and
// we use the high-priority event queue for this.
// If critical sections disable interrupts, we can call timers directly from interrupt. Avoiding the
// event queue can save ~1600B of RAM if the rest of the system is not using the event queue either.
// Caveats of this tunable are listed on arm_hal_interrupt.c.
#if !MBED_CONF_NANOSTACK_HAL_CRITICAL_SECTION_USABLE_FROM_INTERRUPT
static EventQueue *equeue; static EventQueue *equeue;
#endif
static uint32_t due; static uint32_t due;
static void (*arm_hal_callback)(void); static void (*arm_hal_callback)(void);
// Called once at boot // Called once at boot
void platform_timer_enable(void) void platform_timer_enable(void)
{ {
#if !MBED_CONF_NANOSTACK_HAL_CRITICAL_SECTION_USABLE_FROM_INTERRUPT
equeue = mbed_highprio_event_queue(); equeue = mbed_highprio_event_queue();
MBED_ASSERT(equeue != NULL); MBED_ASSERT(equeue != NULL);
#endif
} }
// Actually cancels a timer, not the opposite of enable // Actually cancels a timer, not the opposite of enable
@ -38,7 +49,14 @@ void platform_timer_set_cb(void (*new_fp)(void))
static void timer_callback(void) static void timer_callback(void)
{ {
due = 0; due = 0;
#if MBED_CONF_NANOSTACK_HAL_CRITICAL_SECTION_USABLE_FROM_INTERRUPT
// Callback is interrupt safe so it can be called directly without
// bouncing via event queue thread.
arm_hal_callback();
#else
equeue->call(arm_hal_callback); equeue->call(arm_hal_callback);
#endif
} }
// This is called from inside platform_enter_critical - IRQs can't happen // This is called from inside platform_enter_critical - IRQs can't happen

3
features/FEATURE_COMMON_PAL/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.c
View File

@ -41,7 +41,10 @@ static const osThreadAttr_t event_thread_attr = {
}; };
#endif #endif
#if !MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_DISPATCH_FROM_APPLICATION
static osThreadId_t event_thread_id; static osThreadId_t event_thread_id;
#endif
static mbed_rtos_storage_mutex_t event_mutex; static mbed_rtos_storage_mutex_t event_mutex;
static const osMutexAttr_t event_mutex_attr = { static const osMutexAttr_t event_mutex_attr = {
.name = "nanostack_event_mutex", .name = "nanostack_event_mutex",