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

Nordic: Fix multiple defined symbol. 

The symbol Systick_Handler was defined as a weak symbol in us_ticker.c and
startup_nRF51822.s. While it work as expected when an application is compiled
from mbed OS source code it creates a duplicate symbol issue when mbed OS is
bundled as a library.
pull/4760/head
Vincent Coubard 2017-07-03 15:07:06 +01:00 committed by adbridge
parent b1b419fc29
commit 1d9712b424
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
targets/TARGET_NORDIC/TARGET_NRF5/us_ticker.c
View File

@ -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()