You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2017/02/13 19:38:22 UTC
[2/3] incubator-mynewt-core git commit: nimble: Cleanup address types
usage
nimble: Cleanup address types usage
The symbols and variable names should be used properly for own_address
and peer_address everywhere (even though they have the same values) to
make code easier to follow.
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/0a79ee07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/0a79ee07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/0a79ee07
Branch: refs/heads/develop
Commit: 0a79ee07cfe7961cbfb99fa3ea14c9733e95e538
Parents: f4a9711
Author: Andrzej Kaczmarek <an...@codecoup.pl>
Authored: Fri Feb 3 13:21:24 2017 +0100
Committer: Andrzej Kaczmarek <an...@codecoup.pl>
Committed: Fri Feb 3 14:39:06 2017 +0100
----------------------------------------------------------------------
apps/blecent/src/main.c | 4 ++--
apps/bleprph_oic/src/main.c | 2 +-
apps/blesplit/src/main.c | 2 +-
apps/bleuart/src/main.c | 2 +-
apps/ocf_sample/src/ocf_ble.c | 2 +-
net/nimble/host/src/ble_hs_id.c | 8 ++++----
net/nimble/host/src/ble_hs_misc.c | 12 ++++++------
net/nimble/host/test/src/ble_gap_test.c | 24 ++++++++++++------------
net/nimble/host/test/src/ble_hs_test_util.c | 2 +-
net/nimble/host/test/src/ble_os_test.c | 2 +-
net/nimble/host/test/src/ble_sm_lgcy_test.c | 24 ++++++++++++------------
net/nimble/host/test/src/ble_sm_sc_test.c | 24 ++++++++++++------------
12 files changed, 54 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/apps/blecent/src/main.c
----------------------------------------------------------------------
diff --git a/apps/blecent/src/main.c b/apps/blecent/src/main.c
index 18f7045..4c271ca 100755
--- a/apps/blecent/src/main.c
+++ b/apps/blecent/src/main.c
@@ -243,7 +243,7 @@ blecent_scan(void)
disc_params.filter_policy = 0;
disc_params.limited = 0;
- rc = ble_gap_disc(BLE_ADDR_PUBLIC, BLE_HS_FOREVER, &disc_params,
+ rc = ble_gap_disc(BLE_OWN_ADDR_PUBLIC, BLE_HS_FOREVER, &disc_params,
blecent_gap_event, NULL);
if (rc != 0) {
BLECENT_LOG(ERROR, "Error initiating GAP discovery procedure; rc=%d\n",
@@ -312,7 +312,7 @@ blecent_connect_if_interesting(const struct ble_gap_disc_desc *disc)
/* Try to connect the the advertiser. Allow 30 seconds (30000 ms) for
* timeout.
*/
- rc = ble_gap_connect(BLE_ADDR_PUBLIC, &disc->addr, 30000, NULL,
+ rc = ble_gap_connect(BLE_OWN_ADDR_PUBLIC, &disc->addr, 30000, NULL,
blecent_gap_event, NULL);
if (rc != 0) {
BLECENT_LOG(ERROR, "Error: Failed to connect to device; addr_type=%d "
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/apps/bleprph_oic/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bleprph_oic/src/main.c b/apps/bleprph_oic/src/main.c
index 8a01a14..1c45ffa 100755
--- a/apps/bleprph_oic/src/main.c
+++ b/apps/bleprph_oic/src/main.c
@@ -133,7 +133,7 @@ bleprph_advertise(void)
memset(&adv_params, 0, sizeof adv_params);
adv_params.conn_mode = BLE_GAP_CONN_MODE_UND;
adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN;
- rc = ble_gap_adv_start(BLE_ADDR_PUBLIC, NULL, BLE_HS_FOREVER,
+ rc = ble_gap_adv_start(BLE_OWN_ADDR_PUBLIC, NULL, BLE_HS_FOREVER,
&adv_params, bleprph_gap_event, NULL);
if (rc != 0) {
BLEPRPH_LOG(ERROR, "error enabling advertisement; rc=%d\n", rc);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/apps/blesplit/src/main.c
----------------------------------------------------------------------
diff --git a/apps/blesplit/src/main.c b/apps/blesplit/src/main.c
index 020934f..054e1ae 100755
--- a/apps/blesplit/src/main.c
+++ b/apps/blesplit/src/main.c
@@ -127,7 +127,7 @@ blesplit_advertise(void)
memset(&adv_params, 0, sizeof adv_params);
adv_params.conn_mode = BLE_GAP_CONN_MODE_UND;
adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN;
- rc = ble_gap_adv_start(BLE_ADDR_PUBLIC, 0, NULL, BLE_HS_FOREVER,
+ rc = ble_gap_adv_start(BLE_OWN_ADDR_PUBLIC, NULL, BLE_HS_FOREVER,
&adv_params, blesplit_gap_event, NULL);
if (rc != 0) {
BLESPLIT_LOG(ERROR, "error enabling advertisement; rc=%d\n", rc);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/apps/bleuart/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bleuart/src/main.c b/apps/bleuart/src/main.c
index 6da390d..e13712c 100755
--- a/apps/bleuart/src/main.c
+++ b/apps/bleuart/src/main.c
@@ -112,7 +112,7 @@ bleuart_advertise(void)
memset(&adv_params, 0, sizeof adv_params);
adv_params.conn_mode = BLE_GAP_CONN_MODE_UND;
adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN;
- rc = ble_gap_adv_start(BLE_ADDR_PUBLIC, NULL, BLE_HS_FOREVER,
+ rc = ble_gap_adv_start(BLE_OWN_ADDR_PUBLIC, NULL, BLE_HS_FOREVER,
&adv_params, bleuart_gap_event, NULL);
if (rc != 0) {
return;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/apps/ocf_sample/src/ocf_ble.c
----------------------------------------------------------------------
diff --git a/apps/ocf_sample/src/ocf_ble.c b/apps/ocf_sample/src/ocf_ble.c
index e52155d..3fe3f9a 100644
--- a/apps/ocf_sample/src/ocf_ble.c
+++ b/apps/ocf_sample/src/ocf_ble.c
@@ -145,7 +145,7 @@ ocf_ble_advertise(void)
memset(&adv_params, 0, sizeof adv_params);
adv_params.conn_mode = BLE_GAP_CONN_MODE_UND;
adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN;
- rc = ble_gap_adv_start(BLE_ADDR_PUBLIC, 0, NULL, BLE_HS_FOREVER,
+ rc = ble_gap_adv_start(BLE_OWN_ADDR_PUBLIC, 0, NULL, BLE_HS_FOREVER,
&adv_params, ocf_ble_gap_event, NULL);
if (rc != 0) {
OCF_BLE_LOG(ERROR, "error enabling advertisement; rc=%d\n", rc);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/net/nimble/host/src/ble_hs_id.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_id.c b/net/nimble/host/src/ble_hs_id.c
index 5c3fae0..6130c1f 100644
--- a/net/nimble/host/src/ble_hs_id.c
+++ b/net/nimble/host/src/ble_hs_id.c
@@ -210,16 +210,16 @@ ble_hs_id_copy_addr(uint8_t id_addr_type, uint8_t *out_id_addr,
}
int
-ble_hs_id_use_addr(uint8_t addr_type)
+ble_hs_id_use_addr(uint8_t own_addr_type)
{
uint8_t id_addr_type;
int nrpa;
int rc;
- switch (addr_type) {
+ switch (own_addr_type) {
case BLE_OWN_ADDR_PUBLIC:
case BLE_OWN_ADDR_RANDOM:
- rc = ble_hs_id_addr(addr_type, NULL, NULL);
+ rc = ble_hs_id_addr(own_addr_type, NULL, NULL);
if (rc != 0) {
return rc;
}
@@ -227,7 +227,7 @@ ble_hs_id_use_addr(uint8_t addr_type)
case BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT:
case BLE_OWN_ADDR_RPA_RANDOM_DEFAULT:
- id_addr_type = ble_hs_misc_addr_type_to_id(addr_type);
+ id_addr_type = ble_hs_misc_addr_type_to_id(own_addr_type);
rc = ble_hs_id_addr(id_addr_type, NULL, &nrpa);
if (rc != 0) {
return rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/net/nimble/host/src/ble_hs_misc.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_misc.c b/net/nimble/host/src/ble_hs_misc.c
index 1c85c51..578c7e4 100644
--- a/net/nimble/host/src/ble_hs_misc.c
+++ b/net/nimble/host/src/ble_hs_misc.c
@@ -78,15 +78,15 @@ ble_hs_misc_conn_chan_find_reqd(uint16_t conn_handle, uint16_t cid,
}
uint8_t
-ble_hs_misc_addr_type_to_id(uint8_t addr_type)
+ble_hs_misc_addr_type_to_id(uint8_t own_addr_type)
{
- switch (addr_type) {
- case BLE_ADDR_PUBLIC:
- case BLE_ADDR_PUBLIC_ID:
+ switch (own_addr_type) {
+ case BLE_OWN_ADDR_PUBLIC:
+ case BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT:
return BLE_ADDR_PUBLIC;
- case BLE_ADDR_RANDOM:
- case BLE_ADDR_RANDOM_ID:
+ case BLE_OWN_ADDR_RANDOM:
+ case BLE_OWN_ADDR_RPA_RANDOM_DEFAULT:
return BLE_ADDR_RANDOM;
default:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/net/nimble/host/test/src/ble_gap_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/test/src/ble_gap_test.c b/net/nimble/host/test/src/ble_gap_test.c
index 0a047d6..a13255e 100644
--- a/net/nimble/host/test/src/ble_gap_test.c
+++ b/net/nimble/host/test/src/ble_gap_test.c
@@ -441,7 +441,7 @@ TEST_CASE(ble_gap_test_case_wl_bad_args)
TEST_ASSERT(rc == BLE_HS_EINVAL);
/*** White-list-using connection in progress. */
- rc = ble_hs_test_util_connect(BLE_ADDR_PUBLIC, NULL, 0, NULL,
+ rc = ble_hs_test_util_connect(BLE_OWN_ADDR_PUBLIC, NULL, 0, NULL,
ble_gap_test_util_connect_cb, NULL, 0);
TEST_ASSERT(rc == 0);
@@ -562,7 +562,7 @@ TEST_CASE(ble_gap_test_case_disc_bad_args)
/*** Invalid filter policy. */
params.filter_policy = 6;
- rc = ble_gap_disc(BLE_ADDR_PUBLIC, 0, ¶ms,
+ rc = ble_gap_disc(BLE_OWN_ADDR_PUBLIC, 0, ¶ms,
ble_gap_test_util_disc_cb, NULL);
TEST_ASSERT(rc == BLE_HS_EINVAL);
}
@@ -729,7 +729,7 @@ ble_gap_test_util_disc_dflts_once(int limited)
exp_window = BLE_GAP_SCAN_FAST_WINDOW;
}
ble_gap_test_util_verify_tx_set_scan_params(
- BLE_ADDR_PUBLIC,
+ BLE_OWN_ADDR_PUBLIC,
BLE_HCI_SCAN_TYPE_ACTIVE,
exp_itvl,
exp_window,
@@ -758,7 +758,7 @@ TEST_CASE(ble_gap_test_case_disc_already)
TEST_ASSERT_FATAL(rc == 0);
/* Ensure host indicates BLE_HS_EALREADY if we try to discover. */
- rc = ble_gap_disc(BLE_ADDR_PUBLIC, BLE_HS_FOREVER, &disc_params,
+ rc = ble_gap_disc(BLE_OWN_ADDR_PUBLIC, BLE_HS_FOREVER, &disc_params,
ble_gap_test_util_disc_cb, NULL);
TEST_ASSERT(rc == BLE_HS_EALREADY);
}
@@ -777,7 +777,7 @@ TEST_CASE(ble_gap_test_case_disc_busy)
TEST_ASSERT_FATAL(rc == 0);
/* Ensure host indicates BLE_HS_EBUSY if we try to discover. */
- rc = ble_gap_disc(BLE_ADDR_PUBLIC, BLE_HS_FOREVER, &disc_params,
+ rc = ble_gap_disc(BLE_OWN_ADDR_PUBLIC, BLE_HS_FOREVER, &disc_params,
ble_gap_test_util_disc_cb, NULL);
TEST_ASSERT(rc == BLE_HS_EBUSY);
}
@@ -943,13 +943,13 @@ TEST_CASE(ble_gap_test_case_conn_gen_busy)
ble_gap_test_util_init();
/* Start a discovery procedure. */
- rc = ble_hs_test_util_disc(BLE_ADDR_PUBLIC, BLE_HS_FOREVER,
+ rc = ble_hs_test_util_disc(BLE_OWN_ADDR_PUBLIC, BLE_HS_FOREVER,
&disc_params, ble_gap_test_util_disc_cb,
NULL, -1, 0);
TEST_ASSERT_FATAL(rc == 0);
/* Ensure host indicates BLE_HS_EBUSY if we try to connect. */
- rc = ble_gap_connect(BLE_ADDR_PUBLIC, &peer_addr, BLE_HS_FOREVER,
+ rc = ble_gap_connect(BLE_OWN_ADDR_PUBLIC, &peer_addr, BLE_HS_FOREVER,
&conn_params, ble_gap_test_util_connect_cb, NULL);
TEST_ASSERT(rc == BLE_HS_EBUSY);
}
@@ -1009,7 +1009,7 @@ ble_gap_test_util_conn_and_cancel(uint8_t *peer_addr, uint8_t hci_status)
memcpy(addr.val, peer_addr, 6);
/* Begin creating a connection. */
- rc = ble_hs_test_util_connect(BLE_ADDR_PUBLIC, &addr, 0, NULL,
+ rc = ble_hs_test_util_connect(BLE_OWN_ADDR_PUBLIC, &addr, 0, NULL,
ble_gap_test_util_connect_cb, NULL, 0);
TEST_ASSERT(rc == 0);
TEST_ASSERT(ble_gap_master_in_progress());
@@ -1231,7 +1231,7 @@ TEST_CASE(ble_gap_test_case_conn_find)
ble_gap_test_util_init();
ble_hs_test_util_create_rpa_conn(8,
- BLE_ADDR_PUBLIC,
+ BLE_OWN_ADDR_PUBLIC,
((uint8_t[6]){0,0,0,0,0,0}),
BLE_ADDR_PUBLIC,
((uint8_t[6]){2,3,4,5,6,7}),
@@ -1281,7 +1281,7 @@ TEST_CASE(ble_gap_test_case_conn_find)
ble_hs_test_util_create_rpa_conn(54,
BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT,
((uint8_t[6]){0x40,1,2,3,4,5}),
- BLE_OWN_ADDR_RPA_RANDOM_DEFAULT,
+ BLE_ADDR_RANDOM_ID,
((uint8_t[6]){3,4,5,6,7,8}),
((uint8_t[6]){0x50,1,2,3,4,5}),
ble_gap_test_util_connect_cb,
@@ -2653,7 +2653,7 @@ ble_gap_test_util_disc_forever(void)
memset(¶ms, 0, sizeof params);
/* Initiate a discovery procedure with no timeout. */
- ble_hs_test_util_disc(BLE_ADDR_PUBLIC,
+ ble_hs_test_util_disc(BLE_OWN_ADDR_PUBLIC,
BLE_HS_FOREVER, ¶ms, ble_gap_test_util_disc_cb,
NULL, -1, 0);
@@ -2680,7 +2680,7 @@ ble_gap_test_util_disc_timeout(int32_t duration_ms)
memset(¶ms, 0, sizeof params);
/* Initiate a discovery procedure with the specified timeout. */
- ble_hs_test_util_disc(BLE_ADDR_PUBLIC,
+ ble_hs_test_util_disc(BLE_OWN_ADDR_PUBLIC,
duration_ms, ¶ms, ble_gap_test_util_disc_cb,
NULL, -1, 0);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/net/nimble/host/test/src/ble_hs_test_util.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/test/src/ble_hs_test_util.c b/net/nimble/host/test/src/ble_hs_test_util.c
index 687920e..0bd065c 100644
--- a/net/nimble/host/test/src/ble_hs_test_util.c
+++ b/net/nimble/host/test/src/ble_hs_test_util.c
@@ -407,7 +407,7 @@ ble_hs_test_util_create_conn(uint16_t handle, const uint8_t *peer_id_addr,
{
static uint8_t null_addr[6];
- ble_hs_test_util_create_rpa_conn(handle, BLE_ADDR_PUBLIC, null_addr,
+ ble_hs_test_util_create_rpa_conn(handle, BLE_OWN_ADDR_PUBLIC, null_addr,
BLE_ADDR_PUBLIC, peer_id_addr,
null_addr, cb, cb_arg);
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/net/nimble/host/test/src/ble_os_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/test/src/ble_os_test.c b/net/nimble/host/test/src/ble_os_test.c
index 4dda7e7..74ad65d 100644
--- a/net/nimble/host/test/src/ble_os_test.c
+++ b/net/nimble/host/test/src/ble_os_test.c
@@ -213,7 +213,7 @@ ble_os_disc_test_task_handler(void *arg)
/* Initiate the general discovery procedure with a 300 ms timeout. */
memset(&disc_params, 0, sizeof disc_params);
- rc = ble_hs_test_util_disc(BLE_ADDR_PUBLIC, 300, &disc_params,
+ rc = ble_hs_test_util_disc(BLE_OWN_ADDR_PUBLIC, 300, &disc_params,
ble_os_disc_test_cb,
&cb_called, 0, 0);
TEST_ASSERT(rc == 0);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/net/nimble/host/test/src/ble_sm_lgcy_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/test/src/ble_sm_lgcy_test.c b/net/nimble/host/test/src/ble_sm_lgcy_test.c
index 52c5761..c3cbc88 100644
--- a/net/nimble/host/test/src/ble_sm_lgcy_test.c
+++ b/net/nimble/host/test/src/ble_sm_lgcy_test.c
@@ -37,8 +37,8 @@
* Initiator IO capabilities: 4
* Responder IO capabilities: 3
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_PUBLIC
- * Responder address type: BLE_ADDR_TYPE_PUBLIC
+ * Initiator address type: BLE_ADDR_PUBLIC
+ * Responder address type: BLE_ADDR_PUBLIC
* Initiator key distribution: 7
* Responder key distribution: 7
*/
@@ -171,8 +171,8 @@ TEST_CASE(ble_sm_lgcy_peer_jw_iio4_rio3_b1_iat0_rat0_ik7_rk7)
* Initiator IO capabilities: 4
* Responder IO capabilities: 0
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_PUBLIC
- * Responder address type: BLE_ADDR_TYPE_PUBLIC
+ * Initiator address type: BLE_ADDR_PUBLIC
+ * Responder address type: BLE_ADDR_PUBLIC
* Initiator key distribution: 7
* Responder key distribution: 7
*/
@@ -306,8 +306,8 @@ TEST_CASE(ble_sm_lgcy_peer_pk_iio4_rio0_b1_iat0_rat0_ik7_rk7)
* Initiator IO capabilities: 3
* Responder IO capabilities: 3
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_PUBLIC
- * Responder address type: BLE_ADDR_TYPE_RANDOM
+ * Initiator address type: BLE_ADDR_PUBLIC
+ * Responder address type: BLE_ADDR_RANDOM
* Initiator key distribution: 7
* Responder key distribution: 5
*/
@@ -429,8 +429,8 @@ TEST_CASE(ble_sm_lgcy_us_jw_iio3_rio3_b1_iat0_rat1_ik7_rk5)
* Initiator IO capabilities: 4
* Responder IO capabilities: 2
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_PUBLIC
- * Responder address type: BLE_ADDR_TYPE_RANDOM
+ * Initiator address type: BLE_ADDR_PUBLIC
+ * Responder address type: BLE_ADDR_RANDOM
* Initiator key distribution: 7
* Responder key distribution: 5
*/
@@ -553,8 +553,8 @@ TEST_CASE(ble_sm_lgcy_us_pk_iio4_rio2_b1_iat0_rat1_ik7_rk5)
* Initiator IO capabilities: 3
* Responder IO capabilities: 3
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_PUBLIC
- * Responder address type: BLE_ADDR_TYPE_PUBLIC
+ * Initiator address type: BLE_ADDR_PUBLIC
+ * Responder address type: BLE_ADDR_PUBLIC
* Initiator key distribution: 7
* Responder key distribution: 7
*/
@@ -691,8 +691,8 @@ TEST_CASE(ble_sm_lgcy_us_ob_iio3_rio3_b1_iat0_rat0_ik7_rk7)
* Initiator IO capabilities: 4
* Responder IO capabilities: 4
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_PUBLIC
- * Responder address type: BLE_ADDR_TYPE_PUBLIC
+ * Initiator address type: BLE_ADDR_PUBLIC
+ * Responder address type: BLE_ADDR_PUBLIC
* Initiator key distribution: 7
* Responder key distribution: 7
*/
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0a79ee07/net/nimble/host/test/src/ble_sm_sc_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/test/src/ble_sm_sc_test.c b/net/nimble/host/test/src/ble_sm_sc_test.c
index 21fc4c7..921c4e5 100644
--- a/net/nimble/host/test/src/ble_sm_sc_test.c
+++ b/net/nimble/host/test/src/ble_sm_sc_test.c
@@ -3029,8 +3029,8 @@ TEST_CASE(ble_sm_sc_us_nc_iio1_rio4_b1_iat0_rat0_ik7_rk5)
* Initiator IO capabilities: 3
* Responder IO capabilities: 3
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
- * Responder address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
+ * Initiator address type: BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT
+ * Responder address type: BLE_ADDR_PUBLIC_ID
* Initiator key distribution: 7
* Responder key distribution: 7
*/
@@ -3191,8 +3191,8 @@ TEST_CASE(ble_sm_sc_peer_jw_iio3_rio3_b1_iat2_rat2_ik7_rk7)
* Initiator IO capabilities: 1
* Responder IO capabilities: 1
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
- * Responder address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
+ * Initiator address type: BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT
+ * Responder address type: BLE_ADDR_PUBLIC_ID
* Initiator key distribution: 3
* Responder key distribution: 3
*/
@@ -3343,8 +3343,8 @@ TEST_CASE(ble_sm_sc_peer_nc_iio1_rio1_b1_iat2_rat2_ik3_rk3)
* Initiator IO capabilities: 2
* Responder IO capabilities: 0
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
- * Responder address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
+ * Initiator address type: BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT
+ * Responder address type: BLE_ADDR_PUBLIC_ID
* Initiator key distribution: 7
* Responder key distribution: 3
*/
@@ -3962,8 +3962,8 @@ TEST_CASE(ble_sm_sc_peer_pk_iio2_rio0_b1_iat2_rat2_ik7_rk3)
* Initiator IO capabilities: 3
* Responder IO capabilities: 3
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
- * Responder address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
+ * Initiator address type: BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT
+ * Responder address type: BLE_ADDR_PUBLIC_ID
* Initiator key distribution: 3
* Responder key distribution: 3
*/
@@ -4112,8 +4112,8 @@ TEST_CASE(ble_sm_sc_us_jw_iio3_rio3_b1_iat2_rat2_ik3_rk3)
* Initiator IO capabilities: 1
* Responder IO capabilities: 1
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
- * Responder address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
+ * Initiator address type: BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT
+ * Responder address type: BLE_ADDR_PUBLIC_ID
* Initiator key distribution: 3
* Responder key distribution: 3
*/
@@ -4264,8 +4264,8 @@ TEST_CASE(ble_sm_sc_us_nc_iio1_rio1_b1_iat2_rat2_ik3_rk3)
* Initiator IO capabilities: 2
* Responder IO capabilities: 0
* Bonding: true
- * Initiator address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
- * Responder address type: BLE_ADDR_TYPE_RPA_PUB_DEFAULT
+ * Initiator address type: BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT
+ * Responder address type: BLE_ADDR_PUBLIC_ID
* Initiator key distribution: 7
* Responder key distribution: 3
*/