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/07/11 23:49:52 UTC
[02/50] [abbrv] incubator-mynewt-core git commit: BLE Host -
ble_gap_cancel->ble_gap_conn_cancel
BLE Host - ble_gap_cancel->ble_gap_conn_cancel
This function was renamed accidentally.
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/b9a61e2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/b9a61e2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/b9a61e2e
Branch: refs/heads/ble_hs_api
Commit: b9a61e2e6a507a419c8443c9fd8119d906117d1a
Parents: dba9503
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Jun 21 20:19:49 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Jul 11 16:43:30 2016 -0700
----------------------------------------------------------------------
apps/bletiny/src/main.c | 2 +-
net/nimble/host/include/host/ble_gap.h | 2 +-
net/nimble/host/src/ble_gap.c | 2 +-
net/nimble/host/src/test/ble_hs_test_util.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/b9a61e2e/apps/bletiny/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c
index b63d5d0..d7548c8 100755
--- a/apps/bletiny/src/main.c
+++ b/apps/bletiny/src/main.c
@@ -1273,7 +1273,7 @@ bletiny_conn_cancel(void)
{
int rc;
- rc = ble_gap_cancel();
+ rc = ble_gap_conn_cancel();
return rc;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/b9a61e2e/net/nimble/host/include/host/ble_gap.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/include/host/ble_gap.h b/net/nimble/host/include/host/ble_gap.h
index b913b7c..da66ae6 100644
--- a/net/nimble/host/include/host/ble_gap.h
+++ b/net/nimble/host/include/host/ble_gap.h
@@ -259,7 +259,7 @@ int ble_gap_connect(uint8_t own_addr_type,
const struct ble_gap_conn_params *params,
ble_gap_event_fn *cb, void *cb_arg);
int ble_gap_terminate(uint16_t handle);
-int ble_gap_cancel(void);
+int ble_gap_conn_cancel(void);
int ble_gap_wl_set(struct ble_gap_white_entry *white_list,
uint8_t white_list_count);
int ble_gap_update_params(uint16_t conn_handle,
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/b9a61e2e/net/nimble/host/src/ble_gap.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_gap.c b/net/nimble/host/src/ble_gap.c
index 3a9b92c..b2308dc 100644
--- a/net/nimble/host/src/ble_gap.c
+++ b/net/nimble/host/src/ble_gap.c
@@ -1967,7 +1967,7 @@ done:
*****************************************************************************/
int
-ble_gap_cancel(void)
+ble_gap_conn_cancel(void)
{
uint8_t buf[BLE_HCI_CMD_HDR_LEN];
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/b9a61e2e/net/nimble/host/src/test/ble_hs_test_util.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_hs_test_util.c b/net/nimble/host/src/test/ble_hs_test_util.c
index 0a7f8bb..6acb9e7 100644
--- a/net/nimble/host/src/test/ble_hs_test_util.c
+++ b/net/nimble/host/src/test/ble_hs_test_util.c
@@ -381,7 +381,7 @@ ble_hs_test_util_conn_cancel(uint8_t ack_status)
BLE_HCI_OCF_LE_CREATE_CONN_CANCEL),
ack_status);
- rc = ble_gap_cancel();
+ rc = ble_gap_conn_cancel();
return rc;
}