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
The following commit(s) were added to refs/heads/master by this push:
new 3cd999ad0 nimble/ll: Remove unused parameter
3cd999ad0 is described below
commit 3cd999ad0eaa2d60fdaef55f8697974927c61d1c
Author: Andrzej Kaczmarek <[email protected]>
AuthorDate: Mon Jul 7 16:55:06 2025 +0200
nimble/ll: Remove unused parameter
This was used in the past, but no longer needed.
---
nimble/controller/include/controller/ble_ll_ctrl.h | 3 +--
nimble/controller/src/ble_ll_conn.c | 17 ++++++++---------
nimble/controller/src/ble_ll_conn_hci.c | 10 +++++-----
nimble/controller/src/ble_ll_ctrl.c | 17 ++++++++---------
4 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/nimble/controller/include/controller/ble_ll_ctrl.h
b/nimble/controller/include/controller/ble_ll_ctrl.h
index 89502a45a..402755988 100644
--- a/nimble/controller/include/controller/ble_ll_ctrl.h
+++ b/nimble/controller/include/controller/ble_ll_ctrl.h
@@ -294,8 +294,7 @@ struct ble_ll_len_req
/* API */
struct ble_ll_conn_sm;
-void ble_ll_ctrl_proc_start(struct ble_ll_conn_sm *connsm, int ctrl_proc,
- void *data);
+void ble_ll_ctrl_proc_start(struct ble_ll_conn_sm *connsm, int ctrl_proc);
void ble_ll_ctrl_proc_stop(struct ble_ll_conn_sm *connsm, int ctrl_proc);
int ble_ll_ctrl_rx_pdu(struct ble_ll_conn_sm *connsm, struct os_mbuf *om);
void ble_ll_ctrl_chk_proc_start(struct ble_ll_conn_sm *connsm);
diff --git a/nimble/controller/src/ble_ll_conn.c
b/nimble/controller/src/ble_ll_conn.c
index e9e5fc6f1..bd3f2f64d 100644
--- a/nimble/controller/src/ble_ll_conn.c
+++ b/nimble/controller/src/ble_ll_conn.c
@@ -586,7 +586,7 @@ ble_ll_conn_phy_update_if_needed(struct ble_ll_conn_sm
*connsm)
connsm->phy_data.pref_mask_tx_req = connsm->phy_data.pref_mask_tx;
connsm->phy_data.pref_mask_rx_req = connsm->phy_data.pref_mask_rx;
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_PHY_UPDATE, NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_PHY_UPDATE);
return 0;
}
@@ -1727,7 +1727,7 @@ ble_ll_conn_auth_pyld_timer_cb(struct ble_npl_event *ev)
connsm = (struct ble_ll_conn_sm *)ble_npl_event_get_arg(ev);
ble_ll_auth_pyld_tmo_event_send(connsm);
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_LE_PING, NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_LE_PING);
ble_ll_conn_auth_pyld_timer_start(connsm);
}
@@ -2325,7 +2325,7 @@ ble_ll_conn_move_anchor(struct ble_ll_conn_sm *connsm,
uint16_t offset)
}
connsm->conn_update_anchor_offset_req = offset;
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_CONN_UPDATE, NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_CONN_UPDATE);
return 0;
}
@@ -2900,8 +2900,7 @@ ble_ll_conn_created(struct ble_ll_conn_sm *connsm, struct
ble_mbuf_hdr *rxhdr)
* models; for peripheral just assume central will initiate
features xchg
* if it has some additional features to use.
*/
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_FEATURE_XCHG,
- NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_FEATURE_XCHG);
break;
#endif
#if MYNEWT_VAL(BLE_LL_ROLE_PERIPHERAL)
@@ -4109,7 +4108,7 @@ ble_ll_conn_chan_map_update(void)
/* Perform channel map update */
SLIST_FOREACH(connsm, &g_ble_ll_conn_active_list, act_sle) {
if (connsm->conn_role == BLE_LL_CONN_ROLE_CENTRAL) {
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_CHAN_MAP_UPD,
NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_CHAN_MAP_UPD);
}
}
#endif
@@ -4305,14 +4304,14 @@ ble_ll_conn_subrate_req_hci(struct ble_ll_conn_sm
*connsm,
connsm->subrate_trans.cont_num = srp->cont_num;
connsm->subrate_trans.supervision_tmo = srp->supervision_tmo;
connsm->flags.subrate_host_req = 1;
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_SUBRATE_UPDATE, NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_SUBRATE_UPDATE);
break;
#endif
#if MYNEWT_VAL(BLE_LL_ROLE_PERIPHERAL)
case BLE_LL_CONN_ROLE_PERIPHERAL:
connsm->subrate_req = *srp;
connsm->flags.subrate_host_req = 1;
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_SUBRATE_REQ, NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_SUBRATE_REQ);
break;
#endif
default:
@@ -4361,7 +4360,7 @@ ble_ll_conn_subrate_req_llcp(struct ble_ll_conn_sm
*connsm,
connsm->subrate_trans.supervision_tmo = MIN(connsm->supervision_tmo,
srp->supervision_tmo);
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_SUBRATE_UPDATE, NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_SUBRATE_UPDATE);
return 0;
}
diff --git a/nimble/controller/src/ble_ll_conn_hci.c
b/nimble/controller/src/ble_ll_conn_hci.c
index 877a10038..925bab8b4 100644
--- a/nimble/controller/src/ble_ll_conn_hci.c
+++ b/nimble/controller/src/ble_ll_conn_hci.c
@@ -943,7 +943,7 @@ ble_ll_conn_hci_read_rem_features(const uint8_t *cmdbuf,
uint8_t len)
}
#endif
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_FEATURE_XCHG, NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_FEATURE_XCHG);
}
connsm->flags.features_host_req = 1;
@@ -1139,7 +1139,7 @@ ble_ll_conn_hci_update(const uint8_t *cmdbuf, uint8_t len)
connsm->flags.conn_update_host_initd = 1;
/* Start the control procedure */
- ble_ll_ctrl_proc_start(connsm, ctrl_proc, NULL);
+ ble_ll_ctrl_proc_start(connsm, ctrl_proc);
}
return rc;
@@ -1416,7 +1416,7 @@ ble_ll_conn_hci_rd_rem_ver_cmd(const uint8_t *cmdbuf,
uint8_t len)
* be queued before the command status.
*/
if (!connsm->flags.version_ind_txd) {
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_VERSION_XCHG, NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_VERSION_XCHG);
} else {
connsm->pending_ctrl_procs |= (1 << BLE_LL_CTRL_PROC_VERSION_XCHG);
}
@@ -1588,7 +1588,7 @@ ble_ll_conn_hci_le_start_encrypt(const uint8_t *cmdbuf,
uint8_t len)
connsm->enc_data.host_rand_num = le64toh(cmd->rand);
connsm->enc_data.enc_div = le16toh(cmd->div);
swap_buf(connsm->enc_data.enc_block.key, cmd->ltk, 16);
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_ENCRYPT, NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_ENCRYPT);
rc = BLE_ERR_SUCCESS;
}
@@ -1738,7 +1738,7 @@ ble_ll_conn_req_peer_sca(const uint8_t *cmdbuf, uint8_t
len,
return BLE_ERR_CTLR_BUSY;
}
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_SCA_UPDATE, NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_SCA_UPDATE);
return 0;
}
diff --git a/nimble/controller/src/ble_ll_ctrl.c
b/nimble/controller/src/ble_ll_ctrl.c
index a05b5c9d8..bfb9de7e3 100644
--- a/nimble/controller/src/ble_ll_ctrl.c
+++ b/nimble/controller/src/ble_ll_ctrl.c
@@ -2135,7 +2135,7 @@ ble_ll_ctrl_initiate_dle(struct ble_ll_conn_sm *connsm,
bool initial)
}
}
- ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_DATA_LEN_UPD, NULL);
+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_DATA_LEN_UPD);
}
static void
@@ -2467,7 +2467,7 @@ ble_ll_ctrl_rx_chanmap_req(struct ble_ll_conn_sm *connsm,
uint8_t *dptr)
* @param ctrl_proc
*/
static struct os_mbuf *
-ble_ll_ctrl_proc_init(struct ble_ll_conn_sm *connsm, int ctrl_proc, void *data)
+ble_ll_ctrl_proc_init(struct ble_ll_conn_sm *connsm, int ctrl_proc)
{
uint8_t len;
uint8_t opcode = 0;
@@ -2486,7 +2486,7 @@ ble_ll_ctrl_proc_init(struct ble_ll_conn_sm *connsm, int
ctrl_proc, void *data)
switch (ctrl_proc) {
case BLE_LL_CTRL_PROC_CONN_UPDATE:
opcode = BLE_LL_CTRL_CONN_UPDATE_IND;
- ble_ll_ctrl_conn_update_init_proc(connsm, data);
+ ble_ll_ctrl_conn_update_init_proc(connsm, NULL);
break;
case BLE_LL_CTRL_PROC_CHAN_MAP_UPD:
opcode = BLE_LL_CTRL_CHANNEL_MAP_REQ;
@@ -2644,7 +2644,7 @@ ble_ll_ctrl_terminate_start(struct ble_ll_conn_sm *connsm)
BLE_LL_ASSERT(connsm->disconnect_reason != 0);
ctrl_proc = BLE_LL_CTRL_PROC_TERMINATE;
- om = ble_ll_ctrl_proc_init(connsm, ctrl_proc, NULL);
+ om = ble_ll_ctrl_proc_init(connsm, ctrl_proc);
if (om) {
connsm->flags.terminate_started = 1;
@@ -2664,8 +2664,7 @@ ble_ll_ctrl_terminate_start(struct ble_ll_conn_sm *connsm)
* @param connsm Pointer to connection state machine.
*/
void
-ble_ll_ctrl_proc_start(struct ble_ll_conn_sm *connsm, int ctrl_proc,
- void *data)
+ble_ll_ctrl_proc_start(struct ble_ll_conn_sm *connsm, int ctrl_proc)
{
struct os_mbuf *om;
@@ -2674,7 +2673,7 @@ ble_ll_ctrl_proc_start(struct ble_ll_conn_sm *connsm, int
ctrl_proc,
om = NULL;
if (connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_IDLE) {
/* Initiate the control procedure. */
- om = ble_ll_ctrl_proc_init(connsm, ctrl_proc, data);
+ om = ble_ll_ctrl_proc_init(connsm, ctrl_proc);
if (om) {
/* Set the current control procedure */
connsm->cur_ctrl_proc = ctrl_proc;
@@ -2735,7 +2734,7 @@ ble_ll_ctrl_chk_proc_start(struct ble_ll_conn_sm *connsm)
BLE_LL_ASSERT(connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_ENCRYPT);
BLE_LL_ASSERT(IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_ENCRYPT));
- om = ble_ll_ctrl_proc_init(connsm, BLE_LL_CTRL_PROC_ENCRYPT, NULL);
+ om = ble_ll_ctrl_proc_init(connsm, BLE_LL_CTRL_PROC_ENCRYPT);
if (om) {
connsm->flags.pending_encrypt_restart = 0;
}
@@ -2760,7 +2759,7 @@ ble_ll_ctrl_chk_proc_start(struct ble_ll_conn_sm *connsm)
ble_ll_hci_ev_rd_rem_ver(connsm, BLE_ERR_SUCCESS);
CLR_PENDING_CTRL_PROC(connsm, i);
} else {
- ble_ll_ctrl_proc_start(connsm, i, NULL);
+ ble_ll_ctrl_proc_start(connsm, i);
break;
}
}
