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 #2688 from artokin/master 

Avoid type collision by renaming callback variable
pull/2160/merge
Sam Grove 2016-09-16 14:22:59 -05:00 committed by GitHub
parent 3a05cdd259 1b46d2bbf9
commit e4c8d76ba9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ static osThreadId timer_thread_id;
static Timer timer; static Timer timer;
static Timeout timeout; static Timeout timeout;
static uint32_t due; static uint32_t due;
static void (*callback)(void); static void (*arm_hal_callback)(void);
static void timer_thread(const void *) static void timer_thread(const void *)
{ {
@ -25,7 +25,7 @@ static void timer_thread(const void *)
// !!! We don't do our own enter/exit critical - we rely on callback // !!! We don't do our own enter/exit critical - we rely on callback
// doing it (ns_timer_interrupt_handler does) // doing it (ns_timer_interrupt_handler does)
//platform_enter_critical(); //platform_enter_critical();
callback(); arm_hal_callback();
//platform_exit_critical(); //platform_exit_critical();
} }
} }
@ -47,7 +47,7 @@ void platform_timer_disable(void)
// Not called while running, fortunately // Not called while running, fortunately
void platform_timer_set_cb(void (*new_fp)(void)) void platform_timer_set_cb(void (*new_fp)(void))
{ {
callback = new_fp; arm_hal_callback = new_fp;
} }
static void timer_callback(void) static void timer_callback(void)