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/17 20:51:48 UTC
[25/50] [abbrv] incubator-mynewt-core git commit: BLE host - rename
struct with appropriate prefix.
BLE host - rename struct with appropriate prefix.
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/9eeec05f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/9eeec05f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/9eeec05f
Branch: refs/heads/master
Commit: 9eeec05f0dd52219bf46a2a031d1e5d1fae1da0f
Parents: ffd58ca
Author: Christopher Collins <cc...@apache.org>
Authored: Wed May 11 20:39:07 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed May 11 20:39:07 2016 -0700
----------------------------------------------------------------------
apps/bletiny/src/cmd.c | 2 +-
net/nimble/host/include/host/ble_l2cap.h | 5 +++--
net/nimble/host/src/ble_l2cap_sm.c | 2 +-
net/nimble/host/src/test/ble_l2cap_sm_test.c | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/9eeec05f/apps/bletiny/src/cmd.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/cmd.c b/apps/bletiny/src/cmd.c
index 8c96bd1..4510c3e 100644
--- a/apps/bletiny/src/cmd.c
+++ b/apps/bletiny/src/cmd.c
@@ -1703,7 +1703,7 @@ cmd_passkey(int argc, char **argv)
#endif
uint16_t conn_handle;
- struct passkey_action pk;
+ struct ble_l2cap_sm_passkey pk;
int rc;
conn_handle = parse_arg_uint16("conn", &rc);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/9eeec05f/net/nimble/host/include/host/ble_l2cap.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/include/host/ble_l2cap.h b/net/nimble/host/include/host/ble_l2cap.h
index 26666b2..a50138a 100644
--- a/net/nimble/host/include/host/ble_l2cap.h
+++ b/net/nimble/host/include/host/ble_l2cap.h
@@ -126,7 +126,7 @@ int ble_l2cap_sig_update(uint16_t conn_handle,
ble_l2cap_sig_update_fn *cb, void *cb_arg);
/* Strucure to pass the passkey info back to the l2cap */
-struct passkey_action
+struct ble_l2cap_sm_passkey
{
uint8_t action;
union
@@ -140,7 +140,8 @@ struct passkey_action
* and then call this function to notify the host that the action is
* complete
*/
-int ble_l2cap_sm_set_tk(uint16_t conn_handle, struct passkey_action *pkey);
+int ble_l2cap_sm_set_tk(uint16_t conn_handle,
+ struct ble_l2cap_sm_passkey *pkey);
void ble_l2cap_sm_connection_broken(uint16_t conn_handle);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/9eeec05f/net/nimble/host/src/ble_l2cap_sm.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_l2cap_sm.c b/net/nimble/host/src/ble_l2cap_sm.c
index fd9ba5d..81b5996 100644
--- a/net/nimble/host/src/ble_l2cap_sm.c
+++ b/net/nimble/host/src/ble_l2cap_sm.c
@@ -1912,7 +1912,7 @@ ble_l2cap_sm_create_chan(void)
}
int
-ble_l2cap_sm_set_tk(uint16_t conn_handle, struct passkey_action *pkey)
+ble_l2cap_sm_set_tk(uint16_t conn_handle, struct ble_l2cap_sm_passkey *pkey)
{
struct ble_l2cap_sm_proc *proc;
struct ble_l2cap_sm_proc *prev;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/9eeec05f/net/nimble/host/src/test/ble_l2cap_sm_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_l2cap_sm_test.c b/net/nimble/host/src/test/ble_l2cap_sm_test.c
index f5553f1..e6adb05 100644
--- a/net/nimble/host/src/test/ble_l2cap_sm_test.c
+++ b/net/nimble/host/src/test/ble_l2cap_sm_test.c
@@ -58,7 +58,7 @@ struct ble_l2cap_sm_test_pair_params {
uint64_t r;
uint16_t ediv;
- struct passkey_action passkey;
+ struct ble_l2cap_sm_passkey passkey;
struct ble_l2cap_sm_pair_fail pair_fail;
unsigned has_enc_info_req:1;
@@ -94,7 +94,7 @@ static int
ble_l2cap_sm_test_util_conn_cb(int event, int status,
struct ble_gap_conn_ctxt *ctxt, void *arg)
{
- struct passkey_action *passkey;
+ struct ble_l2cap_sm_passkey *passkey;
struct ble_l2cap_sm_test_ltk_info *ltk_info;
int rc;