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 2016/05/25 19:17:01 UTC
[8/9] incubator-mynewt-core git commit: fixup
fixup
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/62db4fe2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/62db4fe2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/62db4fe2
Branch: refs/heads/develop
Commit: 62db4fe210509b51b9e77825e69d29f98735c007
Parents: ba96fba
Author: Christopher Collins <cc...@apache.org>
Authored: Wed May 25 11:59:48 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed May 25 12:16:46 2016 -0700
----------------------------------------------------------------------
.../host/src/test/ble_hs_test_util_store.c | 62 ++++++++++----------
1 file changed, 31 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/62db4fe2/net/nimble/host/src/test/ble_hs_test_util_store.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_hs_test_util_store.c b/net/nimble/host/src/test/ble_hs_test_util_store.c
index 50188cd..a466f42 100644
--- a/net/nimble/host/src/test/ble_hs_test_util_store.c
+++ b/net/nimble/host/src/test/ble_hs_test_util_store.c
@@ -23,15 +23,15 @@
#include "ble_hs_test_util.h"
#include "ble_hs_test_util_store.h"
-static int ble_hs_test_util_store_max_our_ltks;
-static int ble_hs_test_util_store_max_peer_ltks;
+static int ble_hs_test_util_store_max_slv_ltks;
+static int ble_hs_test_util_store_max_mst_ltks;
static int ble_hs_test_util_store_max_cccds;
-static struct ble_store_value_ltk *ble_hs_test_util_store_our_ltks;
-static struct ble_store_value_ltk *ble_hs_test_util_store_peer_ltks;
+static struct ble_store_value_ltk *ble_hs_test_util_store_slv_ltks;
+static struct ble_store_value_ltk *ble_hs_test_util_store_mst_ltks;
static struct ble_store_value_cccd *ble_hs_test_util_store_cccds;
-int ble_hs_test_util_store_num_our_ltks;
-int ble_hs_test_util_store_num_peer_ltks;
+int ble_hs_test_util_store_num_slv_ltks;
+int ble_hs_test_util_store_num_mst_ltks;
int ble_hs_test_util_store_num_cccds;
@@ -51,32 +51,32 @@ int ble_hs_test_util_store_num_cccds;
} while (0)
void
-ble_hs_test_util_store_init(int max_our_ltks, int max_peer_ltks, int max_cccds)
+ble_hs_test_util_store_init(int max_slv_ltks, int max_mst_ltks, int max_cccds)
{
- free(ble_hs_test_util_store_our_ltks);
- free(ble_hs_test_util_store_peer_ltks);
+ free(ble_hs_test_util_store_slv_ltks);
+ free(ble_hs_test_util_store_mst_ltks);
free(ble_hs_test_util_store_cccds);
- ble_hs_test_util_store_our_ltks = malloc(
- ble_hs_test_util_store_max_our_ltks *
- sizeof *ble_hs_test_util_store_our_ltks);
- TEST_ASSERT_FATAL(ble_hs_test_util_store_our_ltks != NULL);
+ ble_hs_test_util_store_slv_ltks = malloc(
+ ble_hs_test_util_store_max_slv_ltks *
+ sizeof *ble_hs_test_util_store_slv_ltks);
+ TEST_ASSERT_FATAL(ble_hs_test_util_store_slv_ltks != NULL);
- ble_hs_test_util_store_peer_ltks = malloc(
- ble_hs_test_util_store_max_peer_ltks *
- sizeof *ble_hs_test_util_store_peer_ltks);
- TEST_ASSERT_FATAL(ble_hs_test_util_store_peer_ltks != NULL);
+ ble_hs_test_util_store_mst_ltks = malloc(
+ ble_hs_test_util_store_max_mst_ltks *
+ sizeof *ble_hs_test_util_store_mst_ltks);
+ TEST_ASSERT_FATAL(ble_hs_test_util_store_mst_ltks != NULL);
ble_hs_test_util_store_cccds = malloc(
ble_hs_test_util_store_max_cccds *
sizeof *ble_hs_test_util_store_cccds);
TEST_ASSERT_FATAL(ble_hs_test_util_store_cccds != NULL);
- ble_hs_test_util_store_max_our_ltks = max_our_ltks;
- ble_hs_test_util_store_max_peer_ltks = max_peer_ltks;
+ ble_hs_test_util_store_max_slv_ltks = max_slv_ltks;
+ ble_hs_test_util_store_max_mst_ltks = max_mst_ltks;
ble_hs_test_util_store_max_cccds = max_cccds;
- ble_hs_test_util_store_num_our_ltks = 0;
- ble_hs_test_util_store_num_peer_ltks = 0;
+ ble_hs_test_util_store_num_slv_ltks = 0;
+ ble_hs_test_util_store_num_mst_ltks = 0;
ble_hs_test_util_store_num_cccds = 0;
}
@@ -178,15 +178,15 @@ ble_hs_test_util_store_read(int obj_type, union ble_store_key *key,
switch (obj_type) {
case BLE_STORE_OBJ_TYPE_MST_LTK:
return ble_hs_test_util_store_read_ltk(
- ble_hs_test_util_store_our_ltks,
- ble_hs_test_util_store_num_our_ltks,
+ ble_hs_test_util_store_slv_ltks,
+ ble_hs_test_util_store_num_slv_ltks,
&key->ltk,
&dst->ltk);
case BLE_STORE_OBJ_TYPE_SLV_LTK:
return ble_hs_test_util_store_read_ltk(
- ble_hs_test_util_store_peer_ltks,
- ble_hs_test_util_store_num_peer_ltks,
+ ble_hs_test_util_store_mst_ltks,
+ ble_hs_test_util_store_num_mst_ltks,
&key->ltk,
&dst->ltk);
@@ -208,16 +208,16 @@ ble_hs_test_util_store_write(int obj_type, union ble_store_value *value)
switch (obj_type) {
case BLE_STORE_OBJ_TYPE_MST_LTK:
BLE_HS_TEST_UTIL_STORE_WRITE_GEN(
- ble_hs_test_util_store_our_ltks,
- ble_hs_test_util_store_num_our_ltks,
- ble_hs_test_util_store_max_our_ltks,
+ ble_hs_test_util_store_slv_ltks,
+ ble_hs_test_util_store_num_slv_ltks,
+ ble_hs_test_util_store_max_slv_ltks,
value->ltk, -1);
case BLE_STORE_OBJ_TYPE_SLV_LTK:
BLE_HS_TEST_UTIL_STORE_WRITE_GEN(
- ble_hs_test_util_store_peer_ltks,
- ble_hs_test_util_store_num_peer_ltks,
- ble_hs_test_util_store_max_peer_ltks,
+ ble_hs_test_util_store_mst_ltks,
+ ble_hs_test_util_store_num_mst_ltks,
+ ble_hs_test_util_store_max_mst_ltks,
value->ltk, -1);
case BLE_STORE_OBJ_TYPE_CCCD: