Skip to content

Nordic: Fix multiple defined symbol. #4693

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

Merged
merged 1 commit into from
Jul 13, 2017
Merged

Nordic: Fix multiple defined symbol. #4693

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
16 changes: 0 additions & 16 deletions targets/TARGET_NORDIC/TARGET_NRF5/us_ticker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,22 +303,6 @@ static uint32_t os_rtc_period;
static uint32_t frozen_sub_tick = 0;


/*
RTX provide the following definitions which are used by the tick code:
* osRtxConfig.tick_freq: The RTX tick frequency.
* osRtxInfo.kernel.tick: Count of RTX ticks.

* SysTick_Handler: The function which handle a tick event.
This function is special because it never returns.
Those definitions are used by the code which handle the os tick.
To allow compilation of us_ticker programs without RTOS, those symbols are
exported from this module as weak ones.
*/
MBED_WEAK void SysTick_Handler(void)
{
}


#ifdef MBED_CONF_RTOS_PRESENT
#include "rtx_os.h" //import osRtxInfo, SysTick_Handler()

Expand Down