michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Support BT 5.0 feature set bit fields

Browse source 
Added support in the Controller for increased feature set
bit fields in Bluetooth 5.0. Cached feature set in the
connection context is increased to a uint32_t value to
accommodate 17 feature bits.

Change-id: I9ae15d6d90fa7a3de186905d3c68088ee22d2911
Signed-off-by: Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
This commit is contained in:
Vinayak Chettimada 2017-04-18 05:56:16 +02:00 • committed by Johan Hedberg
commit 11a32bf46d
4 changed files with 54 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/bluetooth/controller/hci/hci.c
View file

@ -335,7 +335,9 @@ static void le_read_local_features(struct net_buf *buf, struct net_buf **evt)
rp->status = 0x00;
memset(&rp->features[0], 0x00, sizeof(rp->features));
rp->features[0] = RADIO_BLE_FEATURES;
rp->features[0] = RADIO_BLE_FEAT & 0xFF;
rp->features[1] = (RADIO_BLE_FEAT >> 8) & 0xFF;
rp->features[2] = (RADIO_BLE_FEAT >> 16) & 0xFF;
}
static void le_set_random_address(struct net_buf *buf, struct net_buf **evt)

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

@ -1210,6 +1210,17 @@ isr_rx_conn_pkt_release(struct radio_pdu_node_tx *node_tx)
return NULL;
}
static inline uint32_t feat_get(uint8_t *features)
{
uint32_t feat;
feat = ~RADIO_BLE_FEAT_BIT_MASK_VALID | features[0] |
(features[1] << 8) | (features[2] << 16);
feat &= RADIO_BLE_FEAT_BIT_MASK;
return feat;
}
static inline void
isr_rx_conn_pkt_ctrl_rej(struct radio_pdu_node_rx *radio_pdu_node_rx,
uint8_t *rx_enqueue)
@ -1523,24 +1534,34 @@ isr_rx_conn_pkt_ctrl(struct radio_pdu_node_rx *radio_pdu_node_rx,
case PDU_DATA_LLCTRL_TYPE_FEATURE_REQ:
case PDU_DATA_LLCTRL_TYPE_SLAVE_FEATURE_REQ:
{
struct pdu_data_llctrl_feature_req *req;
req = &pdu_data_rx->payload.llctrl.ctrldata.feature_req;
/* AND the feature set to get Feature USED */
_radio.conn_curr->llcp_features &=
pdu_data_rx->payload.llctrl.ctrldata.feature_req.features[0];
_radio.conn_curr->llcp_features &= feat_get(&req->features[0]);
feature_rsp_send(_radio.conn_curr);
break;
}
break;
case PDU_DATA_LLCTRL_TYPE_FEATURE_RSP:
{
struct pdu_data_llctrl_feature_rsp *rsp;
rsp = &pdu_data_rx->payload.llctrl.ctrldata.feature_rsp;
/* AND the feature set to get Feature USED */
_radio.conn_curr->llcp_features &=
pdu_data_rx->payload.llctrl.ctrldata.feature_rsp.features[0];
_radio.conn_curr->llcp_features &= feat_get(&rsp->features[0]);
/* enqueue the feature resp */
*rx_enqueue = 1;
/* Procedure complete */
_radio.conn_curr->procedure_expire = 0;
break;
}
break;
case PDU_DATA_LLCTRL_TYPE_PAUSE_ENC_REQ:
pause_enc_rsp_send(_radio.conn_curr);
@ -5110,7 +5131,7 @@ static inline void event_fex_prep(struct connection *conn)
conn->llcp_ack = conn->llcp_req;
/* use initial feature bitmap */
conn->llcp_features = RADIO_BLE_FEATURES;
conn->llcp_features = RADIO_BLE_FEAT;
/* place the feature exchange req packet as next in tx queue */
pdu_ctrl_tx->ll_id = PDU_DATA_LLID_CTRL;
@ -5123,9 +5144,12 @@ static inline void event_fex_prep(struct connection *conn)
memset(&pdu_ctrl_tx->payload.llctrl.ctrldata.feature_req.features[0],
0x00,
sizeof(pdu_ctrl_tx->payload.llctrl.ctrldata.feature_req.features));
pdu_ctrl_tx->payload.llctrl.ctrldata.feature_req.features[0] =
conn->llcp_features;
conn->llcp_features & 0xFF;
pdu_ctrl_tx->payload.llctrl.ctrldata.feature_req.features[1] =
(conn->llcp_features >> 8) & 0xFF;
pdu_ctrl_tx->payload.llctrl.ctrldata.feature_req.features[2] =
(conn->llcp_features >> 16) & 0xFF;
ctrl_tx_enqueue(conn, node_tx);
@ -6615,8 +6639,12 @@ static void feature_rsp_send(struct connection *conn)
memset(&pdu_ctrl_tx->payload.llctrl.ctrldata.feature_rsp.features[0],
0x00,
sizeof(pdu_ctrl_tx->payload.llctrl.ctrldata.feature_rsp.features));
pdu_ctrl_tx->payload.llctrl.ctrldata.feature_rsp.features[0] =
conn->llcp_features;
pdu_ctrl_tx->payload.llctrl.ctrldata.feature_req.features[0] =
conn->llcp_features & 0xFF;
pdu_ctrl_tx->payload.llctrl.ctrldata.feature_req.features[1] =
(conn->llcp_features >> 8) & 0xFF;
pdu_ctrl_tx->payload.llctrl.ctrldata.feature_req.features[2] =
(conn->llcp_features >> 16) & 0xFF;
ctrl_tx_enqueue(conn, node_tx);
}
@ -7092,7 +7120,7 @@ uint32_t radio_adv_enable(uint16_t interval, uint8_t chl_map,
}
conn->handle = 0xFFFF;
conn->llcp_features = RADIO_BLE_FEATURES;
conn->llcp_features = RADIO_BLE_FEAT;
conn->data_chan_use = 0;
conn->event_counter = 0;
conn->latency_prepare = 0;
@ -7423,7 +7451,7 @@ uint32_t radio_connect_enable(uint8_t adv_addr_type, uint8_t *adv_addr,
RADIO_TX_READY_DELAY_US + 328 + 328 + 150);
conn->handle = 0xFFFF;
conn->llcp_features = RADIO_BLE_FEATURES;
conn->llcp_features = RADIO_BLE_FEAT;
access_addr = access_addr_get();
memcpy(&conn->access_addr[0], &access_addr, sizeof(conn->access_addr));
memcpy(&conn->crc_init[0], &conn, 3);

16
subsys/bluetooth/controller/ll_sw/ctrl.h
View file

@ -33,17 +33,17 @@
#endif
#if defined(CONFIG_BLUETOOTH_CONTROLLER_LE_PING)
#define RADIO_BLE_FEATURES_BIT_PING BIT(BT_LE_FEAT_BIT_PING)
#define RADIO_BLE_FEAT_BIT_PING BIT(BT_LE_FEAT_BIT_PING)
#else /* !CONFIG_BLUETOOTH_CONTROLLER_LE_PING */
#define RADIO_BLE_FEATURES_BIT_PING 0
#define RADIO_BLE_FEAT_BIT_PING 0
#endif /* !CONFIG_BLUETOOTH_CONTROLLER_LE_PING */
#if defined(CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH_MAX)
#define RADIO_BLE_FEATURES_BIT_DLE BIT(BT_LE_FEAT_BIT_DLE)
#define RADIO_BLE_FEAT_BIT_DLE BIT(BT_LE_FEAT_BIT_DLE)
#define RADIO_LL_LENGTH_OCTETS_RX_MAX \
CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH_MAX
#else
#define RADIO_BLE_FEATURES_BIT_DLE 0
#define RADIO_BLE_FEAT_BIT_DLE 0
#define RADIO_LL_LENGTH_OCTETS_RX_MAX 27
#endif /* CONFIG_BLUETOOTH_CONTROLLER_DATA_LENGTH_MAX */
@ -96,12 +96,14 @@
#define RADIO_BLE_SUB_VERSION_NUMBER 0xFFFF
#endif
#define RADIO_BLE_FEATURES (BIT(BT_LE_FEAT_BIT_ENC) | \
#define RADIO_BLE_FEAT_BIT_MASK 0x1FFFF
#define RADIO_BLE_FEAT_BIT_MASK_VALID 0x1CF2F
#define RADIO_BLE_FEAT (BIT(BT_LE_FEAT_BIT_ENC) | \
BIT(BT_LE_FEAT_BIT_CONN_PARAM_REQ) | \
BIT(BT_LE_FEAT_BIT_EXT_REJ_IND) | \
BIT(BT_LE_FEAT_BIT_SLAVE_FEAT_REQ) | \
RADIO_BLE_FEATURES_BIT_PING | \
RADIO_BLE_FEATURES_BIT_DLE)
RADIO_BLE_FEAT_BIT_PING | \
RADIO_BLE_FEAT_BIT_DLE)
#if defined(CONFIG_BLUETOOTH_CONTROLLER_WORKER_PRIO)
#define RADIO_TICKER_USER_ID_WORKER_PRIO CONFIG_BLUETOOTH_CONTROLLER_WORKER_PRIO

2
subsys/bluetooth/controller/ll_sw/ctrl_internal.h
View file

@ -129,7 +129,7 @@ struct connection {
} encryption;
} llcp;
uint8_t llcp_features;
uint32_t llcp_features;
struct {
uint8_t tx:1;