Skip to content

Commit 06ff4f8

Browse files
authored
Merge pull request #4693 from pan-/fix#4658
Nordic: Fix multiple defined symbol.
2 parents 58d0aa5 + 17b68d7 commit 06ff4f8

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

targets/TARGET_NORDIC/TARGET_NRF5/us_ticker.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -303,22 +303,6 @@ static uint32_t os_rtc_period;
303303
static uint32_t frozen_sub_tick = 0;
304304

305305

306-
/*
307-
RTX provide the following definitions which are used by the tick code:
308-
* osRtxConfig.tick_freq: The RTX tick frequency.
309-
* osRtxInfo.kernel.tick: Count of RTX ticks.
310-
311-
* SysTick_Handler: The function which handle a tick event.
312-
This function is special because it never returns.
313-
Those definitions are used by the code which handle the os tick.
314-
To allow compilation of us_ticker programs without RTOS, those symbols are
315-
exported from this module as weak ones.
316-
*/
317-
MBED_WEAK void SysTick_Handler(void)
318-
{
319-
}
320-
321-
322306
#ifdef MBED_CONF_RTOS_PRESENT
323307
#include "rtx_os.h" //import osRtxInfo, SysTick_Handler()
324308

0 commit comments

Comments
 (0)