michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix tx power level set and get

Browse source 
Fix implementation to correctly return the configured
default Tx Power Level.

Also, fix the missing use of RADIO_TXP_DEFAULT in the new
ULL/LLL implementation of Advertiser and Observer states.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2019-02-14 16:00:07 +05:30 • committed by Carles Cufí
commit d570e139dc
4 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -11529,8 +11529,10 @@ u8_t ll_tx_pwr_lvl_get(u16_t handle, u8_t type, s8_t *tx_pwr_lvl)
/*TODO: check type here for current or maximum */
/* TODO: Support TX Power Level other than 0dBm */
*tx_pwr_lvl = 0;
/* TODO: Support TX Power Level other than default when dynamic
* updates is implemented.
*/
*tx_pwr_lvl = RADIO_TXP_DEFAULT;
return 0;
}

44
subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c
View file

@ -1,32 +1,52 @@
/*
* Copyright (c) 2016-2017 Nordic Semiconductor ASA
* Copyright (c) 2016-2019 Nordic Semiconductor ASA
* Copyright (c) 2016 Vinayak Kariappa Chettimada
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr/types.h>
/* TODO: Remove weak attribute when refactored architecture replaces the old
* controller implementation. */
#include <toolchain.h>
#include <soc.h>
#include <bluetooth/hci.h>
u8_t __weak ll_tx_pwr_lvl_get(u16_t handle, u8_t type, s8_t *tx_pwr_lvl)
#include "hal/ccm.h"
#include "hal/radio.h"
#include "util/memq.h"
#include "pdu.h"
#include "lll.h"
#include "lll_conn.h"
#include "ull_conn_internal.h"
#if defined(CONFIG_BT_LL_SW_SPLIT)
u8_t ll_tx_pwr_lvl_get(u16_t handle, u8_t type, s8_t *tx_pwr_lvl)
{
/* TODO: check for active connection */
struct ll_conn *conn;
conn = ll_connected_get(handle);
if (!conn) {
return BT_HCI_ERR_UNKNOWN_CONN_ID;
}
/* TODO: check type here for current or maximum */
/* TODO: Support TX Power Level other than 0dBm */
*tx_pwr_lvl = 0;
/* TODO: Support TX Power Level other than default when dynamic
* updates is implemented.
*/
*tx_pwr_lvl = RADIO_TXP_DEFAULT;
return 0;
}
#endif
void ll_tx_pwr_get(s8_t *min, s8_t *max)
{
/* TODO: Support TX Power Level other than 0dBm */
*min = 0;
*max = 0;
/* TODO: Support TX Power Level other than default when dynamic
* updates is implemented.
*/
*min = RADIO_TXP_DEFAULT;
*max = RADIO_TXP_DEFAULT;
}

2
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
View file

@ -142,7 +142,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
radio_reset();
/* TODO: other Tx Power settings */
radio_tx_power_set(0);
radio_tx_power_set(RADIO_TXP_DEFAULT);
#if defined(CONFIG_BT_CTLR_ADV_EXT)
/* TODO: if coded we use S8? */

2
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
View file

@ -146,7 +146,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
radio_reset();
/* TODO: other Tx Power settings */
radio_tx_power_set(0);
radio_tx_power_set(RADIO_TXP_DEFAULT);
#if defined(CONFIG_BT_CTLR_ADV_EXT)
/* TODO: if coded we use S8? */