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:50:18 UTC
[28/50] [abbrv] incubator-mynewt-core git commit: BLE Host -
BLE_HS_ERR_SM_THEM ->BLE_HS_ERR_SM_PEER
BLE Host - BLE_HS_ERR_SM_THEM ->BLE_HS_ERR_SM_PEER
This is just a rename.
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/0ebad0f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/0ebad0f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/0ebad0f9
Branch: refs/heads/ble_hs_api
Commit: 0ebad0f9519c921edf4d3ad5b3be9b0c99f0bdf2
Parents: cd4283e
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Jul 5 13:28:29 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Jul 11 16:43:33 2016 -0700
----------------------------------------------------------------------
net/nimble/host/include/host/ble_hs.h | 4 ++--
net/nimble/host/src/ble_sm.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0ebad0f9/net/nimble/host/include/host/ble_hs.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/include/host/ble_hs.h b/net/nimble/host/include/host/ble_hs.h
index e6a825d..ea06411 100644
--- a/net/nimble/host/include/host/ble_hs.h
+++ b/net/nimble/host/include/host/ble_hs.h
@@ -70,8 +70,8 @@ struct os_event;
#define BLE_HS_ERR_SM_US_BASE 0x400 /* 1024 */
#define BLE_HS_SM_US_ERR(x) ((x) ? BLE_HS_ERR_SM_US_BASE + (x) : 0)
-#define BLE_HS_ERR_SM_THEM_BASE 0x500 /* 1280 */
-#define BLE_HS_SM_THEM_ERR(x) ((x) ? BLE_HS_ERR_SM_THEM_BASE + (x) : 0)
+#define BLE_HS_ERR_SM_PEER_BASE 0x500 /* 1280 */
+#define BLE_HS_SM_PEER_ERR(x) ((x) ? BLE_HS_ERR_SM_PEER_BASE + (x) : 0)
/* defines the input output (io) capabilities for the host device */
#define BLE_HS_IO_DISPLAY_ONLY 0x00
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0ebad0f9/net/nimble/host/src/ble_sm.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_sm.c b/net/nimble/host/src/ble_sm.c
index 6b53dce..3f3def0 100644
--- a/net/nimble/host/src/ble_sm.c
+++ b/net/nimble/host/src/ble_sm.c
@@ -2035,7 +2035,7 @@ ble_sm_fail_rx(uint16_t conn_handle, uint8_t op, struct os_mbuf **om,
ble_sm_pair_fail_parse((*om)->om_data, (*om)->om_len, &cmd);
BLE_SM_LOG_CMD(0, "fail", conn_handle, ble_sm_pair_fail_log, &cmd);
- res->app_status = BLE_HS_SM_THEM_ERR(cmd.reason);
+ res->app_status = BLE_HS_SM_PEER_ERR(cmd.reason);
}
}