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/06/15 02:27:50 UTC
[28/50] [abbrv] incubator-mynewt-core git commit: BLE Host - Fix
compiler errors!
BLE Host - Fix compiler errors!
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/89d36b5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/89d36b5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/89d36b5c
Branch: refs/heads/develop
Commit: 89d36b5cd24490a142bf5d371a9111dce1614712
Parents: af8610a
Author: Christopher Collins <cc...@apache.org>
Authored: Thu Jun 9 08:00:54 2016 +0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Jun 14 19:23:37 2016 -0700
----------------------------------------------------------------------
net/nimble/host/src/ble_gattc.c | 5 ++---
net/nimble/host/src/ble_hs_conn.c | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/89d36b5c/net/nimble/host/src/ble_gattc.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_gattc.c b/net/nimble/host/src/ble_gattc.c
index db5ab5f..fb7e26d 100644
--- a/net/nimble/host/src/ble_gattc.c
+++ b/net/nimble/host/src/ble_gattc.c
@@ -3406,9 +3406,8 @@ ble_gattc_write_reliable_err(struct ble_gattc_proc *proc, int status,
/* If we have successfully queued any data, and the failure occurred before
* we could send the execute write command, then erase all queued data.
*/
- if (proc->write_reliable.attr.offset > 0 &&
- proc->write_reliable.attr.offset <
- proc->write_reliable.attr.value_len) {
+ if (proc->write_reliable.cur_attr > 0 &&
+ proc->write_reliable.cur_attr < proc->write_reliable.num_attrs) {
exec_req.baeq_flags = 0;
ble_att_clt_tx_exec_write(proc->conn_handle, &exec_req);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/89d36b5c/net/nimble/host/src/ble_hs_conn.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_conn.c b/net/nimble/host/src/ble_hs_conn.c
index 967e8b3..87374e1 100644
--- a/net/nimble/host/src/ble_hs_conn.c
+++ b/net/nimble/host/src/ble_hs_conn.c
@@ -385,7 +385,7 @@ ble_hs_conn_addrs(struct ble_hs_conn *conn,
default:
BLE_HS_DBG_ASSERT(0);
- break;
+ return;
}
if (out_our_ota_addr_type != NULL) {