michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Refactor host auto initiated LL procedures

Browse source 
Refactor the handling of the host auto initiated LL procedures.
This makes it easier to add new auto initiated procedures as well as
reduced the maintenance by reducing code duplication.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-12-12 14:28:44 +01:00 • committed by Johan Hedberg
commit 32bde4fe78
2 changed files with 53 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

3
subsys/bluetooth/host/conn_internal.h
View file

@ -31,6 +31,9 @@ enum {
BT_CONN_SLAVE_PARAM_L2CAP, /* If should force L2CAP for CPUP */ BT_CONN_SLAVE_PARAM_L2CAP, /* If should force L2CAP for CPUP */
BT_CONN_FORCE_PAIR, /* Pairing even with existing keys. */ BT_CONN_FORCE_PAIR, /* Pairing even with existing keys. */
BT_CONN_AUTO_PHY_COMPLETE, /* Auto-initiated PHY procedure done */
BT_CONN_AUTO_FEATURE_EXCH, /* Auto-initiated LE Feat done */
/* Total number of flags - must be at the end of the enum */ /* Total number of flags - must be at the end of the enum */
BT_CONN_NUM_FLAGS, BT_CONN_NUM_FLAGS,
}; };

119
subsys/bluetooth/host/hci_core.c
View file

@ -1078,12 +1078,53 @@ static struct bt_conn *find_pending_connect(bt_addr_le_t *peer_addr)
return bt_conn_lookup_state_le(peer_addr, BT_CONN_CONNECT_DIR_ADV); return bt_conn_lookup_state_le(peer_addr, BT_CONN_CONNECT_DIR_ADV);
} }
static void conn_auto_initiate(struct bt_conn *conn)
{
int err;
if (conn->state != BT_CONN_CONNECTED) {
/* It is possible that connection was disconnected directly from
* connected callback so we must check state before doing
* connection parameters update.
*/
return;
}
if (!atomic_test_bit(conn->flags, BT_CONN_AUTO_FEATURE_EXCH) &&
((conn->role == BT_HCI_ROLE_MASTER) ||
BT_FEAT_LE_SLAVE_FEATURE_XCHG(bt_dev.le.features))) {
err = hci_le_read_remote_features(conn);
if (!err) {
return;
}
}
if (IS_ENABLED(CONFIG_BT_AUTO_PHY_UPDATE) &&
!atomic_test_bit(conn->flags, BT_CONN_AUTO_PHY_COMPLETE) &&
BT_FEAT_LE_PHY_2M(bt_dev.le.features)) {
err = hci_le_set_phy(conn);
if (!err) {
atomic_set_bit(conn->flags, BT_CONN_AUTO_PHY_UPDATE);
return;
}
}
if (IS_ENABLED(CONFIG_BT_DATA_LEN_UPDATE) &&
BT_FEAT_LE_DLE(bt_dev.le.features)) {
hci_le_set_data_len(conn);
}
if (IS_ENABLED(CONFIG_BT_PERIPHERAL) &&
conn->role == BT_CONN_ROLE_SLAVE) {
slave_update_conn_param(conn);
}
}
static void enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt) static void enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt)
{ {
u16_t handle = sys_le16_to_cpu(evt->handle); u16_t handle = sys_le16_to_cpu(evt->handle);
bt_addr_le_t peer_addr, id_addr; bt_addr_le_t peer_addr, id_addr;
struct bt_conn *conn; struct bt_conn *conn;
int err;
BT_DBG("status 0x%02x handle %u role %u %s", evt->status, handle, BT_DBG("status 0x%02x handle %u role %u %s", evt->status, handle,
evt->role, bt_addr_le_str(&evt->peer_addr)); evt->role, bt_addr_le_str(&evt->peer_addr));
@ -1256,41 +1297,8 @@ static void enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt)
bt_conn_set_state(conn, BT_CONN_CONNECTED); bt_conn_set_state(conn, BT_CONN_CONNECTED);
/* /* Start auto-initiated procedures */
* it is possible that connection was disconnected directly from conn_auto_initiate(conn);
* connected callback so we must check state before doing connection
* parameters update
*/
if (conn->state != BT_CONN_CONNECTED) {
goto done;
}
if ((evt->role == BT_HCI_ROLE_MASTER) ||
BT_FEAT_LE_SLAVE_FEATURE_XCHG(bt_dev.le.features)) {
err = hci_le_read_remote_features(conn);
if (!err) {
goto done;
}
}
if (IS_ENABLED(CONFIG_BT_AUTO_PHY_UPDATE) &&
BT_FEAT_LE_PHY_2M(bt_dev.le.features)) {
err = hci_le_set_phy(conn);
if (!err) {
atomic_set_bit(conn->flags, BT_CONN_AUTO_PHY_UPDATE);
goto done;
}
}
if (IS_ENABLED(CONFIG_BT_DATA_LEN_UPDATE) &&
BT_FEAT_LE_DLE(bt_dev.le.features)) {
hci_le_set_data_len(conn);
}
if (IS_ENABLED(CONFIG_BT_PERIPHERAL) &&
conn->role == BT_CONN_ROLE_SLAVE) {
slave_update_conn_param(conn);
}
done: done:
bt_conn_unref(conn); bt_conn_unref(conn);
@ -1363,30 +1371,10 @@ static void le_remote_feat_complete(struct net_buf *buf)
sizeof(conn->le.features)); sizeof(conn->le.features));
} }
if (IS_ENABLED(CONFIG_BT_AUTO_PHY_UPDATE) && atomic_set_bit(conn->flags, BT_CONN_AUTO_FEATURE_EXCH);
BT_FEAT_LE_PHY_2M(bt_dev.le.features) && /* Continue with auto-initiated procedures */
BT_FEAT_LE_PHY_2M(conn->le.features)) { conn_auto_initiate(conn);
int err;
err = hci_le_set_phy(conn);
if (!err) {
atomic_set_bit(conn->flags, BT_CONN_AUTO_PHY_UPDATE);
goto done;
}
}
if (IS_ENABLED(CONFIG_BT_DATA_LEN_UPDATE) &&
BT_FEAT_LE_DLE(bt_dev.le.features) &&
BT_FEAT_LE_DLE(conn->le.features)) {
hci_le_set_data_len(conn);
}
if (IS_ENABLED(CONFIG_BT_PERIPHERAL) &&
conn->role == BT_CONN_ROLE_SLAVE) {
slave_update_conn_param(conn);
}
done:
bt_conn_unref(conn); bt_conn_unref(conn);
} }
@ -1437,16 +1425,9 @@ static void le_phy_update_complete(struct net_buf *buf)
goto done; goto done;
} }
if (IS_ENABLED(CONFIG_BT_DATA_LEN_UPDATE) && atomic_set_bit(conn->flags, BT_CONN_AUTO_PHY_COMPLETE);
BT_FEAT_LE_DLE(bt_dev.le.features) && /* Continue with auto-initiated procedures */
BT_FEAT_LE_DLE(conn->le.features)) { conn_auto_initiate(conn);
hci_le_set_data_len(conn);
}
if (IS_ENABLED(CONFIG_BT_PERIPHERAL) &&
conn->role == BT_CONN_ROLE_SLAVE) {
slave_update_conn_param(conn);
}
done: done:
bt_conn_unref(conn); bt_conn_unref(conn);