Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid type collision by renaming callback variable #2688

Merged
merged 1 commit into from
Sep 16, 2016
Merged

Avoid type collision by renaming callback variable #2688

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions features/FEATURE_COMMON_PAL/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ static osThreadId timer_thread_id;
static Timer timer;
static Timeout timeout;
static uint32_t due;
static void (*callback)(void);
static void (*arm_hal_callback)(void);

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

static void timer_callback(void)
Expand Down