You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2022/02/24 14:33:18 UTC
[mynewt-nimble] 08/10: nimble/ll: Rename func to match other one
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 51cb4dca67d0ad55bf92379050a223e20e538cd2
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Thu Feb 24 00:01:46 2022 +0100
nimble/ll: Rename func to match other one
---
nimble/controller/include/controller/ble_ll_conn.h | 7 +----
nimble/controller/src/ble_ll_adv.c | 2 +-
nimble/controller/src/ble_ll_conn.c | 8 ++---
nimble/controller/src/ble_ll_conn_hci.c | 36 +++++++++++-----------
nimble/controller/src/ble_ll_conn_priv.h | 2 +-
nimble/controller/src/ble_ll_sync.c | 2 +-
6 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/nimble/controller/include/controller/ble_ll_conn.h b/nimble/controller/include/controller/ble_ll_conn.h
index a75457e..ec13d00 100644
--- a/nimble/controller/include/controller/ble_ll_conn.h
+++ b/nimble/controller/include/controller/ble_ll_conn.h
@@ -389,12 +389,7 @@ struct ble_ll_conn_sm
#define CONN_IS_PERIPHERAL(csm) (false)
#endif
-/*
- * Given a handle, returns an active connection state machine (or NULL if the
- * handle does not exist
- *
- */
-struct ble_ll_conn_sm *ble_ll_conn_find_active_conn(uint16_t handle);
+struct ble_ll_conn_sm *ble_ll_conn_find_by_handle(uint16_t handle);
struct ble_ll_conn_sm *ble_ll_conn_find_by_peer_addr(const uint8_t* addr,
uint8_t addr_type);
diff --git a/nimble/controller/src/ble_ll_adv.c b/nimble/controller/src/ble_ll_adv.c
index feafadc..070c89c 100644
--- a/nimble/controller/src/ble_ll_adv.c
+++ b/nimble/controller/src/ble_ll_adv.c
@@ -4084,7 +4084,7 @@ ble_ll_adv_periodic_set_info_transfer(const uint8_t *cmdbuf, uint8_t len,
goto done;
}
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
goto done;
diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c
index e383435..0d41d10 100644
--- a/nimble/controller/src/ble_ll_conn.c
+++ b/nimble/controller/src/ble_ll_conn.c
@@ -384,7 +384,7 @@ ble_ll_conn_cth_flow_process_cmd(const uint8_t *cmdbuf)
* case we can simply ignore command for that connection since credits
* are returned by LL already.
*/
- connsm = ble_ll_conn_find_active_conn(cp->h[i].handle);
+ connsm = ble_ll_conn_find_by_handle(cp->h[i].handle);
if (connsm) {
ble_ll_conn_cth_flow_free_credit(connsm, cp->h[i].count);
}
@@ -670,7 +670,7 @@ ble_ll_conn_current_sm_over(struct ble_ll_conn_sm *connsm)
* @return struct ble_ll_conn_sm*
*/
struct ble_ll_conn_sm *
-ble_ll_conn_find_active_conn(uint16_t handle)
+ble_ll_conn_find_by_handle(uint16_t handle)
{
struct ble_ll_conn_sm *connsm;
@@ -3146,7 +3146,7 @@ ble_ll_conn_rx_data_pdu(struct os_mbuf *rxpdu, struct ble_mbuf_hdr *hdr)
/* XXX: there is a chance that the connection was thrown away and
re-used before processing packets here. Fix this. */
/* We better have a connection state machine */
- connsm = ble_ll_conn_find_active_conn(hdr->rxinfo.handle);
+ connsm = ble_ll_conn_find_by_handle(hdr->rxinfo.handle);
if (!connsm) {
STATS_INC(ble_ll_conn_stats, no_conn_sm);
goto conn_rx_data_pdu_end;
@@ -3704,7 +3704,7 @@ ble_ll_conn_tx_pkt_in(struct os_mbuf *om, uint16_t handle, uint16_t length)
/* See if we have an active matching connection handle */
conn_handle = handle & 0x0FFF;
- connsm = ble_ll_conn_find_active_conn(conn_handle);
+ connsm = ble_ll_conn_find_by_handle(conn_handle);
if (connsm) {
/* Construct LL header in buffer (NOTE: pb already checked) */
pb = handle & 0x3000;
diff --git a/nimble/controller/src/ble_ll_conn_hci.c b/nimble/controller/src/ble_ll_conn_hci.c
index bcc98a5..97d2421 100644
--- a/nimble/controller/src/ble_ll_conn_hci.c
+++ b/nimble/controller/src/ble_ll_conn_hci.c
@@ -891,7 +891,7 @@ ble_ll_conn_hci_read_rem_features(const uint8_t *cmdbuf, uint8_t len)
}
/* If no connection handle exit with error */
- connsm = ble_ll_conn_find_active_conn(le16toh(cmd->conn_handle));
+ connsm = ble_ll_conn_find_by_handle(le16toh(cmd->conn_handle));
if (!connsm) {
return BLE_ERR_UNK_CONN_ID;
}
@@ -950,7 +950,7 @@ ble_ll_conn_hci_update(const uint8_t *cmdbuf, uint8_t len)
/* If no connection handle exit with error */
handle = le16toh(cmd->conn_handle);
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
return BLE_ERR_UNK_CONN_ID;
}
@@ -1066,7 +1066,7 @@ ble_ll_conn_hci_param_rr(const uint8_t *cmdbuf, uint8_t len,
}
/* If we dont have a handle we cant do anything */
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
goto done;
@@ -1132,7 +1132,7 @@ ble_ll_conn_hci_param_nrr(const uint8_t *cmdbuf, uint8_t len,
}
/* If we dont have a handle we cant do anything */
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
goto done;
@@ -1244,7 +1244,7 @@ ble_ll_conn_hci_disconnect_cmd(const struct ble_hci_lc_disconnect_cp *cmd)
case BLE_ERR_UNSUPP_REM_FEATURE:
case BLE_ERR_UNIT_KEY_PAIRING:
case BLE_ERR_CONN_PARMS:
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (connsm) {
/* Do not allow command if we are in process of disconnecting */
if (connsm->disconnect_reason) {
@@ -1293,7 +1293,7 @@ ble_ll_conn_hci_rd_rem_ver_cmd(const uint8_t *cmdbuf, uint8_t len)
}
/* Check for valid parameters */
- connsm = ble_ll_conn_find_active_conn(le16toh(cmd->conn_handle));
+ connsm = ble_ll_conn_find_by_handle(le16toh(cmd->conn_handle));
if (!connsm) {
return BLE_ERR_UNK_CONN_ID;
}
@@ -1343,7 +1343,7 @@ ble_ll_conn_hci_rd_rssi(const uint8_t *cmdbuf, uint8_t len, uint8_t *rspbuf, uin
rsp->handle = cmd->handle;
- connsm = ble_ll_conn_find_active_conn(le16toh(cmd->handle));
+ connsm = ble_ll_conn_find_by_handle(le16toh(cmd->handle));
if (!connsm) {
rsp->rssi = 127;
rc = BLE_ERR_UNK_CONN_ID;
@@ -1380,7 +1380,7 @@ ble_ll_conn_hci_rd_chan_map(const uint8_t *cmdbuf, uint8_t len,
}
handle = le16toh(cmd->conn_handle);
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
memset(rsp->chan_map, 0, sizeof(rsp->chan_map));
@@ -1453,7 +1453,7 @@ ble_ll_conn_hci_set_data_len(const uint8_t *cmdbuf, uint8_t len,
/* Find connection */
handle = le16toh(cmd->conn_handle);
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
goto done;
@@ -1518,7 +1518,7 @@ ble_ll_conn_hci_le_start_encrypt(const uint8_t *cmdbuf, uint8_t len)
return BLE_ERR_INV_HCI_CMD_PARMS;
}
- connsm = ble_ll_conn_find_active_conn(le16toh(cmd->conn_handle));
+ connsm = ble_ll_conn_find_by_handle(le16toh(cmd->conn_handle));
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
#if MYNEWT_VAL(BLE_LL_ROLE_PERIPHERAL)
@@ -1571,7 +1571,7 @@ ble_ll_conn_hci_le_ltk_reply(const uint8_t *cmdbuf, uint8_t len,
/* Find connection handle */
handle = le16toh(cmd->conn_handle);
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
goto ltk_key_cmd_complete;
@@ -1630,7 +1630,7 @@ ble_ll_conn_hci_le_ltk_neg_reply(const uint8_t *cmdbuf, uint8_t len,
/* Find connection handle */
handle = le16toh(cmd->conn_handle);
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
goto ltk_key_cmd_complete;
@@ -1673,7 +1673,7 @@ ble_ll_conn_req_peer_sca(const uint8_t *cmdbuf, uint8_t len,
const struct ble_hci_le_request_peer_sca_cp *params = (const void *)cmdbuf;
struct ble_ll_conn_sm *connsm;
- connsm = ble_ll_conn_find_active_conn(le16toh(params->conn_handle));
+ connsm = ble_ll_conn_find_by_handle(le16toh(params->conn_handle));
if (!connsm) {
return BLE_ERR_UNK_CONN_ID;
}
@@ -1718,7 +1718,7 @@ ble_ll_conn_hci_rd_auth_pyld_tmo(const uint8_t *cmdbuf, uint8_t len,
}
handle = le16toh(cmd->conn_handle);
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
rsp->tmo = 0;
@@ -1761,7 +1761,7 @@ ble_ll_conn_hci_wr_auth_pyld_tmo(const uint8_t *cmdbuf, uint8_t len,
handle = le16toh(cmd->conn_handle);
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
} else {
@@ -1814,7 +1814,7 @@ ble_ll_conn_hci_le_rd_phy(const uint8_t *cmdbuf, uint8_t len,
}
handle = le16toh(cmd->conn_handle);
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
rsp->tx_phy = 0;
rsp->rx_phy = 0;
@@ -1854,7 +1854,7 @@ ble_ll_conn_hci_le_set_phy(const uint8_t *cmdbuf, uint8_t len)
}
handle = le16toh(cmd->conn_handle);
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
return BLE_ERR_UNK_CONN_ID;
}
@@ -1965,7 +1965,7 @@ ble_ll_set_sync_transfer_params(const uint8_t *cmdbuf, uint8_t len,
goto done;
}
- connsm = ble_ll_conn_find_active_conn(le16toh(cmd->conn_handle));
+ connsm = ble_ll_conn_find_by_handle(le16toh(cmd->conn_handle));
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
goto done;
diff --git a/nimble/controller/src/ble_ll_conn_priv.h b/nimble/controller/src/ble_ll_conn_priv.h
index c2c1a0a..7541f64 100644
--- a/nimble/controller/src/ble_ll_conn_priv.h
+++ b/nimble/controller/src/ble_ll_conn_priv.h
@@ -163,7 +163,7 @@ void ble_ll_conn_central_init(struct ble_ll_conn_sm *connsm,
struct ble_ll_conn_create_scan *cc_scan,
struct ble_ll_conn_create_params *cc_params);
-struct ble_ll_conn_sm *ble_ll_conn_find_active_conn(uint16_t handle);
+struct ble_ll_conn_sm *ble_ll_conn_find_by_handle(uint16_t handle);
void ble_ll_conn_update_eff_data_len(struct ble_ll_conn_sm *connsm);
/* Advertising interface */
diff --git a/nimble/controller/src/ble_ll_sync.c b/nimble/controller/src/ble_ll_sync.c
index 8912cec..e5ef0ef 100644
--- a/nimble/controller/src/ble_ll_sync.c
+++ b/nimble/controller/src/ble_ll_sync.c
@@ -2177,7 +2177,7 @@ ble_ll_sync_transfer(const uint8_t *cmdbuf, uint8_t len,
goto done;
}
- connsm = ble_ll_conn_find_active_conn(handle);
+ connsm = ble_ll_conn_find_by_handle(handle);
if (!connsm) {
rc = BLE_ERR_UNK_CONN_ID;
OS_EXIT_CRITICAL(sr);