michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix to use max. tx power in DTM test mode

Browse source 
According to the Bluetooth Specification v5.0, Direct Test
Mode shall use maximum Tx power.

Fixed by adding nRF5x Radio HAL interfaces to get supported
maximum Tx power for SoC selected, and DTM testing sets the
Radio peripheral to use maximum Tx power.

Fixes #7243

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2018-06-02 07:06:47 +05:30 • committed by Carles Cufí
commit 362a6b34c7
6 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
subsys/bluetooth/controller/hal/nrf5/radio/radio.c
View file

@ -112,6 +112,11 @@ void radio_tx_power_set(u32_t power)
NRF_RADIO->TXPOWER = power;
}
void radio_tx_power_max_set(void)
{
NRF_RADIO->TXPOWER = hal_radio_tx_power_max_get();
}
void radio_freq_chan_set(u32_t chan)
{
NRF_RADIO->FREQUENCY = chan;

5
subsys/bluetooth/controller/hal/nrf5/radio/radio_nrf51.h
View file

@ -50,6 +50,11 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
return mode;
}
static inline u32_t hal_radio_tx_power_max_get(void)
{
return RADIO_TXPOWER_TXPOWER_Pos4dBm;
}
static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
{
ARG_UNUSED(phy);

5
subsys/bluetooth/controller/hal/nrf5/radio/radio_nrf52832.h
View file

@ -273,6 +273,11 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
return mode;
}
static inline u32_t hal_radio_tx_power_max_get(void)
{
return RADIO_TXPOWER_TXPOWER_Pos4dBm;
}
static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
{
ARG_UNUSED(flags);

5
subsys/bluetooth/controller/hal/nrf5/radio/radio_nrf52840.h
View file

@ -449,6 +449,11 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
return mode;
}
static inline u32_t hal_radio_tx_power_max_get(void)
{
return RADIO_TXPOWER_TXPOWER_Pos8dBm;
}
static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
{
switch (phy) {

1
subsys/bluetooth/controller/hal/radio.h
View file

@ -17,6 +17,7 @@ void radio_setup(void);
void radio_reset(void);
void radio_phy_set(u8_t phy, u8_t flags);
void radio_tx_power_set(u32_t power);
void radio_tx_power_max_set(void);
void radio_freq_chan_set(u32_t chan);
void radio_whiten_iv_set(u32_t iv);
void radio_aa_set(u8_t *aa);

2
subsys/bluetooth/controller/ll_sw/ll_test.c
View file

@ -186,7 +186,7 @@ static u32_t init(u8_t chan, u8_t phy, void (*isr)(void))
/* NOTE: No whitening in test mode. */
radio_phy_set(test_phy, test_phy_flags);
radio_tmr_tifs_set(150);
radio_tx_power_set(0);
radio_tx_power_max_set();
radio_freq_chan_set((chan << 1) + 2);
radio_aa_set((u8_t *)&test_sync_word);
radio_crc_configure(0x65b, 0x555555);