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 2020/01/28 09:43:29 UTC
[mynewt-nimble] 03/04: nimble/ll: Rename feature flags related with
sync transfer
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 9ae8a9a186dac31a4841c8a341ce412214534951
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Mon Jan 27 16:31:59 2020 +0100
nimble/ll: Rename feature flags related with sync transfer
This patch changes name of two features related to sync
transfer:
BLE_LL_FEAT_SYNC_SEND -> BLE_LL_FEAT_SYNC_TRANS_SEND
BLE_LL_FEAT_SYNC_RECV ->BLE_LL_FEAT_SYNC_TRANS_RECV
as there is new feature call
BLE_LL_FEAT_SYNC_RECV (Synchronizer receiver)
added in following patch
---
nimble/controller/include/controller/ble_ll.h | 4 ++--
nimble/controller/src/ble_ll.c | 4 ++--
nimble/controller/src/ble_ll_adv.c | 2 +-
nimble/controller/src/ble_ll_ctrl.c | 2 +-
nimble/controller/src/ble_ll_sync.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/nimble/controller/include/controller/ble_ll.h b/nimble/controller/include/controller/ble_ll.h
index 75fdbac..99c0eba 100644
--- a/nimble/controller/include/controller/ble_ll.h
+++ b/nimble/controller/include/controller/ble_ll.h
@@ -223,8 +223,8 @@ extern STATS_SECT_DECL(ble_ll_stats) ble_ll_stats;
#define BLE_LL_FEAT_CTE_AOD (0x00200000)
#define BLE_LL_FEAT_CTE_AOA (0x00400000)
#define BLE_LL_FEAT_CTE_RECV (0x00800000)
-#define BLE_LL_FEAT_SYNC_SEND (0x01000000)
-#define BLE_LL_FEAT_SYNC_RECV (0x02000000)
+#define BLE_LL_FEAT_SYNC_TRANS_SEND (0x01000000)
+#define BLE_LL_FEAT_SYNC_TRANS_RECV (0x02000000)
#define BLE_LL_FEAT_SCA_UPDATE (0x04000000)
#define BLE_LL_FEAT_REM_PKEY (0x08000000)
diff --git a/nimble/controller/src/ble_ll.c b/nimble/controller/src/ble_ll.c
index 0968d11..8b1fb98 100644
--- a/nimble/controller/src/ble_ll.c
+++ b/nimble/controller/src/ble_ll.c
@@ -1631,8 +1631,8 @@ ble_ll_init(void)
#endif
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
- features |= BLE_LL_FEAT_SYNC_RECV;
- features |= BLE_LL_FEAT_SYNC_SEND;
+ features |= BLE_LL_FEAT_SYNC_TRANS_RECV;
+ features |= BLE_LL_FEAT_SYNC_TRANS_SEND;
#endif
/* Initialize random number generation */
diff --git a/nimble/controller/src/ble_ll_adv.c b/nimble/controller/src/ble_ll_adv.c
index 16cb5e5..60b60a9 100644
--- a/nimble/controller/src/ble_ll_adv.c
+++ b/nimble/controller/src/ble_ll_adv.c
@@ -3946,7 +3946,7 @@ ble_ll_adv_periodic_set_info_transfer(const uint8_t *cmdbuf, uint8_t len,
*
* Allow initiate LL procedure only if remote supports it.
*/
- if (!(connsm->remote_features[2] & (BLE_LL_FEAT_SYNC_RECV >> (8 * 3)))) {
+ if (!(connsm->remote_features[2] & (BLE_LL_FEAT_SYNC_TRANS_RECV >> (8 * 3)))) {
rc = BLE_ERR_UNSUPP_REM_FEATURE;
goto done;
}
diff --git a/nimble/controller/src/ble_ll_ctrl.c b/nimble/controller/src/ble_ll_ctrl.c
index 789f773..d8e8a58 100644
--- a/nimble/controller/src/ble_ll_ctrl.c
+++ b/nimble/controller/src/ble_ll_ctrl.c
@@ -2416,7 +2416,7 @@ ble_ll_ctrl_rx_pdu(struct ble_ll_conn_sm *connsm, struct os_mbuf *om)
feature = BLE_LL_FEAT_MIN_USED_CHAN;
break;
case BLE_LL_CTRL_PERIODIC_SYNC_IND:
- feature = BLE_LL_FEAT_SYNC_RECV;
+ feature = BLE_LL_FEAT_SYNC_TRANS_RECV;
break;
default:
feature = 0;
diff --git a/nimble/controller/src/ble_ll_sync.c b/nimble/controller/src/ble_ll_sync.c
index 8645e91..dffe122 100644
--- a/nimble/controller/src/ble_ll_sync.c
+++ b/nimble/controller/src/ble_ll_sync.c
@@ -2166,7 +2166,7 @@ ble_ll_sync_transfer(const uint8_t *cmdbuf, uint8_t len,
*
* Allow initiate LL procedure only if remote supports it.
*/
- if (!(connsm->remote_features[2] & (BLE_LL_FEAT_SYNC_RECV >> (8 * 3)))) {
+ if (!(connsm->remote_features[2] & (BLE_LL_FEAT_SYNC_TRANS_RECV >> (8 * 3)))) {
rc = BLE_ERR_UNSUPP_REM_FEATURE;
goto done;
}