Commit adaef465 authored by Ioannis Glaropoulos's avatar Ioannis Glaropoulos Committed by Carles Cufi
Browse files

Bluetooth: controller: minor refactoring in nrf5 radio driver 



This commit moves the radio enable on-tick functionality in
function hal_radio_enable_on_tick_ppi_config_and_enable() in
radio_nrf5_ppi.h.

Signed-off-by: default avatarIoannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
parent 36ded0b5

subsys/bluetooth/controller/hal/nrf5/radio/radio.c

+3 −19
Original line number Diff line number Diff line
@@ -646,12 +646,7 @@ u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder) 
	HAL_EVENT_TIMER_START_PPI_REGISTER_TASK = HAL_EVENT_TIMER_START_TASK;

	NRF_PPI->CHENSET = HAL_EVENT_TIMER_START_PPI_ENABLE;



	HAL_RADIO_ENABLE_ON_TICK_PPI_REGISTER_EVT =

		HAL_RADIO_ENABLE_ON_TICK_PPI_EVT;

	HAL_RADIO_ENABLE_ON_TICK_PPI_REGISTER_TASK =

		(trx) ? HAL_RADIO_ENABLE_ON_TICK_PPI_TASK_TX :

			HAL_RADIO_ENABLE_ON_TICK_PPI_TASK_RX;

	NRF_PPI->CHENSET = HAL_RADIO_ENABLE_ON_TICK_PPI_ENABLE;

	hal_radio_enable_on_tick_ppi_config_and_enable(trx);



#if !defined(CONFIG_BT_CTLR_TIFS_HW)

	SW_SWITCH_TIMER->TASKS_CLEAR = 1;
@@ -703,30 +698,19 @@ u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder) 
	return remainder;

}



static inline void radio_enable_on_timer_tick(u8_t trx)

{

	/* Setup PPI for Radio start */

	HAL_RADIO_ENABLE_ON_TICK_PPI_REGISTER_EVT =

		HAL_RADIO_ENABLE_ON_TICK_PPI_EVT;

	HAL_RADIO_ENABLE_ON_TICK_PPI_REGISTER_TASK =

		(trx) ? HAL_RADIO_ENABLE_ON_TICK_PPI_TASK_TX :

			HAL_RADIO_ENABLE_ON_TICK_PPI_TASK_RX;

	NRF_PPI->CHENSET = HAL_RADIO_ENABLE_ON_TICK_PPI_ENABLE;

}



void radio_tmr_start_us(u8_t trx, u32_t us)

{

	EVENT_TIMER->CC[0] = us;

	EVENT_TIMER->EVENTS_COMPARE[0] = 0;



	radio_enable_on_timer_tick(trx);

	hal_radio_enable_on_tick_ppi_config_and_enable(trx);

}



u32_t radio_tmr_start_now(u8_t trx)

{

	u32_t now, start;



	radio_enable_on_timer_tick(trx);

	hal_radio_enable_on_tick_ppi_config_and_enable(trx);



	/* Capture the current time */

	EVENT_TIMER->TASKS_CAPTURE[1] = 1;

subsys/bluetooth/controller/hal/nrf5/radio/radio_nrf5_ppi.h

+10 −0
Original line number Diff line number Diff line
@@ -26,6 +26,16 @@ 
#define HAL_RADIO_ENABLE_ON_TICK_PPI_TASK_RX \

	((u32_t)&(NRF_RADIO->TASKS_RXEN))



static inline void hal_radio_enable_on_tick_ppi_config_and_enable(u8_t trx)

{

	HAL_RADIO_ENABLE_ON_TICK_PPI_REGISTER_EVT =

		HAL_RADIO_ENABLE_ON_TICK_PPI_EVT;

	HAL_RADIO_ENABLE_ON_TICK_PPI_REGISTER_TASK =

		(trx) ? HAL_RADIO_ENABLE_ON_TICK_PPI_TASK_TX :

			HAL_RADIO_ENABLE_ON_TICK_PPI_TASK_RX;

	NRF_PPI->CHENSET = HAL_RADIO_ENABLE_ON_TICK_PPI_ENABLE;

}



/* Start event timer on RTC tick:

 * wire the RTC0 EVENTS_COMPARE[2] event to EVENT_TIMER  TASKS_START task.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE