mynewt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccoll...@apache.org
Subject incubator-mynewt-core git commit: BLE Host - Fix compiler errors!
Date Thu, 09 Jun 2016 00:01:40 GMT
Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/upf54 b0f2a9eb5 -> b3c0e9881


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/b3c0e988
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/b3c0e988
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/b3c0e988

Branch: refs/heads/upf54
Commit: b3c0e9881aab3990c1875119bcd8460484b050fb
Parents: b0f2a9e
Author: Christopher Collins <ccollins@apache.org>
Authored: Thu Jun 9 08:00:54 2016 +0800
Committer: Christopher Collins <ccollins@apache.org>
Committed: Thu Jun 9 08:01:27 2016 +0800

----------------------------------------------------------------------
 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/b3c0e988/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/b3c0e988/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) {


Mime
View raw message