You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ry...@apache.org on 2017/05/11 13:42:14 UTC
[2/5] incubator-mynewt-core git commit: nimble/ll: Change LL PDU name
to match spec
nimble/ll: Change LL PDU name to match spec
The LL_CONNECTION_UPDATE_REQ is renamed to LL_CONNECTION_UPDATE_IND in
the latest versions of spec, so let's follow this.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/fb476e71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/fb476e71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/fb476e71
Branch: refs/heads/master
Commit: fb476e7192c4f84b1eb9618c65f94eabd4ee3c23
Parents: 9f3452c
Author: Andrzej Kaczmarek <an...@codecoup.pl>
Authored: Tue Apr 25 08:19:00 2017 +0200
Committer: Andrzej Kaczmarek <an...@codecoup.pl>
Committed: Thu May 11 10:47:11 2017 +0200
----------------------------------------------------------------------
net/nimble/controller/include/controller/ble_ll_ctrl.h | 2 +-
net/nimble/controller/src/ble_ll_ctrl.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/fb476e71/net/nimble/controller/include/controller/ble_ll_ctrl.h
----------------------------------------------------------------------
diff --git a/net/nimble/controller/include/controller/ble_ll_ctrl.h b/net/nimble/controller/include/controller/ble_ll_ctrl.h
index ab302e4..a0b24a9 100644
--- a/net/nimble/controller/include/controller/ble_ll_ctrl.h
+++ b/net/nimble/controller/include/controller/ble_ll_ctrl.h
@@ -53,7 +53,7 @@ extern "C" {
* -> Opcode (1 byte)
* -> Data (0 - 26 bytes)
*/
-#define BLE_LL_CTRL_CONN_UPDATE_REQ (0)
+#define BLE_LL_CTRL_CONN_UPDATE_IND (0)
#define BLE_LL_CTRL_CHANNEL_MAP_REQ (1)
#define BLE_LL_CTRL_TERMINATE_IND (2)
#define BLE_LL_CTRL_ENC_REQ (3)
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/fb476e71/net/nimble/controller/src/ble_ll_ctrl.c
----------------------------------------------------------------------
diff --git a/net/nimble/controller/src/ble_ll_ctrl.c b/net/nimble/controller/src/ble_ll_ctrl.c
index 1535792..8db0727 100644
--- a/net/nimble/controller/src/ble_ll_ctrl.c
+++ b/net/nimble/controller/src/ble_ll_ctrl.c
@@ -295,7 +295,7 @@ ble_ll_ctrl_proc_unk_rsp(struct ble_ll_conn_sm *connsm, uint8_t *dptr)
case BLE_LL_CTRL_LENGTH_REQ:
ctrl_proc = BLE_LL_CTRL_PROC_DATA_LEN_UPD;
break;
- case BLE_LL_CTRL_CONN_UPDATE_REQ:
+ case BLE_LL_CTRL_CONN_UPDATE_IND:
ctrl_proc = BLE_LL_CTRL_PROC_CONN_UPDATE;
break;
case BLE_LL_CTRL_SLAVE_FEATURE_REQ:
@@ -911,7 +911,7 @@ ble_ll_ctrl_conn_param_reply(struct ble_ll_conn_sm *connsm, uint8_t *rsp,
} else {
/* Create a connection update pdu */
ble_ll_ctrl_conn_upd_make(connsm, rsp + 1, req);
- rsp_opcode = BLE_LL_CTRL_CONN_UPDATE_REQ;
+ rsp_opcode = BLE_LL_CTRL_CONN_UPDATE_IND;
}
return rsp_opcode;
@@ -1270,7 +1270,7 @@ ble_ll_ctrl_proc_init(struct ble_ll_conn_sm *connsm, int ctrl_proc)
switch (ctrl_proc) {
case BLE_LL_CTRL_PROC_CONN_UPDATE:
- opcode = BLE_LL_CTRL_CONN_UPDATE_REQ;
+ opcode = BLE_LL_CTRL_CONN_UPDATE_IND;
ble_ll_ctrl_conn_upd_make(connsm, ctrdata, NULL);
break;
case BLE_LL_CTRL_PROC_CHAN_MAP_UPD:
@@ -1628,7 +1628,7 @@ ble_ll_ctrl_rx_pdu(struct ble_ll_conn_sm *connsm, struct os_mbuf *om)
/* Process opcode */
rsp_opcode = BLE_ERR_MAX;
switch (opcode) {
- case BLE_LL_CTRL_CONN_UPDATE_REQ:
+ case BLE_LL_CTRL_CONN_UPDATE_IND:
rsp_opcode = ble_ll_ctrl_rx_conn_update(connsm, dptr, rspbuf);
break;
case BLE_LL_CTRL_CHANNEL_MAP_REQ: