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

switch to timer 2 due to conflict

pull/13228/head
Paul Szczeanek 2020-06-10 13:16:44 +01:00 committed by Vincent Coubard
parent 7f23b6df0f
commit a04102ae39
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_timer.c
View File

@ -162,10 +162,10 @@ static uint32_t palTimerGetCurrentTime(void)
/* Read and return the captured count value from capture register 1 */ /* Read and return the captured count value from capture register 1 */
return PalRtcCounterGet(); return PalRtcCounterGet();
#else #else
/* Capture current TIMER1 count to capture register 1 */ /* Capture current TIMER2 count to capture register 1 */
NRF_TIMER1->TASKS_CAPTURE[TIMER_CHANNEL_READ_TICK] = 1; NRF_TIMER2->TASKS_CAPTURE[TIMER_CHANNEL_READ_TICK] = 1;
/* Read and return the captured count value from capture register 1 */ /* Read and return the captured count value from capture register 1 */
return NRF_TIMER1->CC[TIMER_CHANNEL_READ_TICK]; return NRF_TIMER2->CC[TIMER_CHANNEL_READ_TICK];
#endif #endif
} }
return 0; return 0;
@ -192,28 +192,28 @@ void PalTimerInit(PalTimerCompCback_t expCback)
PalRtcIrqRegister(RTC_CHANNEL_START_BB, palTimerRtcIrqHandler); PalRtcIrqRegister(RTC_CHANNEL_START_BB, palTimerRtcIrqHandler);
#else #else
/* Give scheduler timer the highest priority. */ /* Give scheduler timer the highest priority. */
NVIC_SetPriority(TIMER1_IRQn, 0); /* highest priority */ NVIC_SetPriority(TIMER2_IRQn, 0); /* highest priority */
NVIC_DisableIRQ(TIMER1_IRQn); NVIC_DisableIRQ(TIMER2_IRQn);
/* stop timer if it was somehow running (timer must be stopped for configuration) */ /* stop timer if it was somehow running (timer must be stopped for configuration) */
NRF_TIMER1->TASKS_STOP = 1; NRF_TIMER2->TASKS_STOP = 1;
/* clear timer to zero count */ /* clear timer to zero count */
NRF_TIMER1->TASKS_CLEAR = 1; NRF_TIMER2->TASKS_CLEAR = 1;
/* configure timer */ /* configure timer */
NRF_TIMER1->MODE = TIMER_MODE_MODE_Timer; NRF_TIMER2->MODE = TIMER_MODE_MODE_Timer;
NRF_TIMER1->BITMODE = TIMER_BITMODE_BITMODE_32Bit; NRF_TIMER2->BITMODE = TIMER_BITMODE_BITMODE_32Bit;
NRF_TIMER1->PRESCALER = PAL_TIMER_1MHZ_PRESCALER; /* f = 16MHz / (2 ^ TIMER_PRESCALER) */ NRF_TIMER2->PRESCALER = PAL_TIMER_1MHZ_PRESCALER; /* f = 16MHz / (2 ^ TIMER_PRESCALER) */
/* timer1 is a free running clock. */ /* timer1 is a free running clock. */
NRF_TIMER1->TASKS_START = 1; NRF_TIMER2->TASKS_START = 1;
/* Clear out and enable timer1 interrupt at system level. */ /* Clear out and enable timer1 interrupt at system level. */
NRF_TIMER1->INTENCLR = 0xFFFFFFFF; NRF_TIMER2->INTENCLR = 0xFFFFFFFF;
NRF_TIMER1->EVENTS_COMPARE[TIMER_CHANNEL_START_BB] = 0; NRF_TIMER2->EVENTS_COMPARE[TIMER_CHANNEL_START_BB] = 0;
NVIC_ClearPendingIRQ(TIMER1_IRQn); NVIC_ClearPendingIRQ(TIMER2_IRQn);
NVIC_EnableIRQ(TIMER1_IRQn); NVIC_EnableIRQ(TIMER2_IRQn);
#endif #endif
#endif #endif
@ -231,10 +231,10 @@ void PalTimerDeInit(void)
{ {
#if SCH_TIMER_REQUIRED == TRUE #if SCH_TIMER_REQUIRED == TRUE
#if BB_CLK_RATE_HZ != 32768 #if BB_CLK_RATE_HZ != 32768
NVIC_DisableIRQ(TIMER1_IRQn); NVIC_DisableIRQ(TIMER2_IRQn);
/* stop timer */ /* stop timer */
NRF_TIMER1->TASKS_STOP = 1; NRF_TIMER2->TASKS_STOP = 1;
#endif #endif
#endif #endif
@ -284,13 +284,13 @@ void PalTimerStart(uint32_t expTimeUsec)
uint32_t startTimeTick = palTimerGetCurrentTime() + PAL_TIMER_US_TO_TICKS(expTimeUsec); uint32_t startTimeTick = palTimerGetCurrentTime() + PAL_TIMER_US_TO_TICKS(expTimeUsec);
/* Clear pending events. */ /* Clear pending events. */
NRF_TIMER1->EVENTS_COMPARE[TIMER_CHANNEL_START_BB] = 0; NRF_TIMER2->EVENTS_COMPARE[TIMER_CHANNEL_START_BB] = 0;
/* Set compare value. */ /* Set compare value. */
NRF_TIMER1->CC[TIMER_CHANNEL_START_BB] = startTimeTick; NRF_TIMER2->CC[TIMER_CHANNEL_START_BB] = startTimeTick;
/* Enable timer1 interrupt source for CC[0]. */ /* Enable timer1 interrupt source for CC[0]. */
NRF_TIMER1->INTENSET = TIMER_INTENSET_COMPARE0_Msk; NRF_TIMER2->INTENSET = TIMER_INTENSET_COMPARE0_Msk;
#endif #endif
palTimerCb.compareVal = startTimeTick; palTimerCb.compareVal = startTimeTick;
@ -317,7 +317,7 @@ void PalTimerStop()
PalRtcDisableCompareIrq(RTC_CHANNEL_START_BB); PalRtcDisableCompareIrq(RTC_CHANNEL_START_BB);
#else #else
/* Disable this interrupt */ /* Disable this interrupt */
NRF_TIMER1->INTENCLR = TIMER_INTENCLR_COMPARE0_Msk; NRF_TIMER2->INTENCLR = TIMER_INTENCLR_COMPARE0_Msk;
#endif #endif
palTimerCb.state = PAL_TIMER_STATE_READY; palTimerCb.state = PAL_TIMER_STATE_READY;
@ -328,10 +328,10 @@ void PalTimerStop()
/*************************************************************************************************/ /*************************************************************************************************/
/*! /*!
* \brief TIMER1 interrupt handler dedicated to scheduler timer. * \brief TIMER2 interrupt handler dedicated to scheduler timer.
*/ */
/*************************************************************************************************/ /*************************************************************************************************/
void TIMER1_IRQHandler(void) void TIMER2_IRQHandler(void)
{ {
#ifdef DEBUG #ifdef DEBUG
nrf_gpio_pin_set(PAL_TIMER_DEBUG_0_PIN); nrf_gpio_pin_set(PAL_TIMER_DEBUG_0_PIN);
@ -339,14 +339,14 @@ void TIMER1_IRQHandler(void)
PAL_TIMER_CHECK(palTimerCb.state == PAL_TIMER_STATE_BUSY); PAL_TIMER_CHECK(palTimerCb.state == PAL_TIMER_STATE_BUSY);
/* Check hardware status */ /* Check hardware status */
PAL_TIMER_CHECK(NRF_TIMER1->EVENTS_COMPARE[TIMER_CHANNEL_START_BB]); PAL_TIMER_CHECK(NRF_TIMER2->EVENTS_COMPARE[TIMER_CHANNEL_START_BB]);
PAL_TIMER_CHECK(NRF_TIMER1->CC[TIMER_CHANNEL_START_BB] == palTimerCb.compareVal); PAL_TIMER_CHECK(NRF_TIMER2->CC[TIMER_CHANNEL_START_BB] == palTimerCb.compareVal);
PAL_TIMER_CHECK(NRF_TIMER1->INTENSET == TIMER_INTENSET_COMPARE0_Msk); PAL_TIMER_CHECK(NRF_TIMER2->INTENSET == TIMER_INTENSET_COMPARE0_Msk);
/* Callback function could restart timer1. However, we blindly stop timer1 first. */ /* Callback function could restart timer1. However, we blindly stop timer1 first. */
NRF_TIMER1->INTENCLR = TIMER_INTENCLR_COMPARE0_Msk; NRF_TIMER2->INTENCLR = TIMER_INTENCLR_COMPARE0_Msk;
/* Clear event again just in case. */ /* Clear event again just in case. */
NRF_TIMER1->EVENTS_COMPARE[TIMER_CHANNEL_START_BB] = 0; NRF_TIMER2->EVENTS_COMPARE[TIMER_CHANNEL_START_BB] = 0;
palTimerCb.state = PAL_TIMER_STATE_READY; palTimerCb.state = PAL_TIMER_STATE_READY;