[03/50] [abbrv] incubator-mynewt-core git commit: bletiny - deal with changes to ble_gap_connect API

[cc...@apache.org]

bletiny - deal with changes to ble_gap_connect API


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

Branch: refs/heads/ble_hs_api
Commit: dba9503b22055f1fb0080b3b8cebb48405bfc03d
Parents: 5f4967d
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Jun 21 20:17:21 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Jul 11 16:43:30 2016 -0700

----------------------------------------------------------------------
 apps/bletiny/src/bletiny.h |  5 +++--
 apps/bletiny/src/cmd.c     | 20 +++++++++++---------
 apps/bletiny/src/main.c    |  8 ++++----
 3 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dba9503b/apps/bletiny/src/bletiny.h
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/bletiny.h b/apps/bletiny/src/bletiny.h
index e154fd4..1ec08c9 100644
--- a/apps/bletiny/src/bletiny.h
+++ b/apps/bletiny/src/bletiny.h
@@ -155,8 +155,9 @@ int bletiny_adv_start(int disc, int conn,
                      uint8_t *peer_addr, uint8_t peer_addr_type,
                      struct ble_gap_adv_params *params);
 int bletiny_adv_stop(void);
-int bletiny_conn_initiate(int addr_type, uint8_t *peer_addr,
-                           struct ble_gap_conn_params *params);
+int bletiny_conn_initiate(uint8_t own_addr_type,
+                          uint8_t peer_addr_type, uint8_t *peer_addr,
+                          struct ble_gap_conn_params *params);
 int bletiny_conn_cancel(void);
 int bletiny_term_conn(uint16_t conn_handle);
 int bletiny_wl_set(struct ble_gap_white_entry *white_list,

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dba9503b/apps/bletiny/src/cmd.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/cmd.c b/apps/bletiny/src/cmd.c
index 71f001f..26fa807 100644
--- a/apps/bletiny/src/cmd.c
+++ b/apps/bletiny/src/cmd.c
@@ -369,7 +369,8 @@ cmd_conn(int argc, char **argv)
 {
     struct ble_gap_conn_params params;
     uint8_t peer_addr[6];
-    int addr_type;
+    int peer_addr_type;
+    int own_addr_type;
     int rc;
 
     if (argc > 1 && strcmp(argv[1], "cancel") == 0) {
@@ -382,12 +383,12 @@ cmd_conn(int argc, char **argv)
         return 0;
     }
 
-    addr_type = parse_arg_kv("peer_addr_type", cmd_conn_peer_addr_types);
-    if (addr_type == -1) {
+    peer_addr_type = parse_arg_kv("peer_addr_type", cmd_conn_peer_addr_types);
+    if (peer_addr_type == -1) {
         return -1;
     }
 
-    if (addr_type != BLE_GAP_ADDR_TYPE_WL) {
+    if (peer_addr_type != BLE_GAP_ADDR_TYPE_WL) {
         rc = parse_arg_mac("peer_addr", peer_addr);
         if (rc == ENOENT) {
             /* Allow "addr" for backwards compatibility. */
@@ -401,12 +402,12 @@ cmd_conn(int argc, char **argv)
         memset(peer_addr, 0, sizeof peer_addr);
     }
 
-    rc = parse_arg_kv_default("own_addr_type",
-                        cmd_conn_own_addr_types, BLE_ADDR_TYPE_PUBLIC);
-    if (rc < 0) {
+    own_addr_type = parse_arg_kv_default("own_addr_type",
+                                         cmd_conn_own_addr_types,
+                                         BLE_ADDR_TYPE_PUBLIC);
+    if (own_addr_type < 0) {
         return rc;
     }
-    params.our_addr_type = rc;
 
     params.scan_itvl = parse_arg_uint16_dflt("scan_itvl", 0x0010, &rc);
     if (rc != 0) {
@@ -450,7 +451,8 @@ cmd_conn(int argc, char **argv)
         return rc;
     }
 
-    rc = bletiny_conn_initiate(addr_type, peer_addr, &params);
+    rc = bletiny_conn_initiate(own_addr_type, peer_addr_type, peer_addr,
+                               &params);
     if (rc != 0) {
         return rc;
     }

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dba9503b/apps/bletiny/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c
index 48e7324..b63d5d0 100755
--- a/apps/bletiny/src/main.c
+++ b/apps/bletiny/src/main.c
@@ -1258,13 +1258,13 @@ bletiny_adv_start(int disc, int conn,
 }
 
 int
-bletiny_conn_initiate(int addr_type, uint8_t *peer_addr,
-                       struct ble_gap_conn_params *params)
+bletiny_conn_initiate(uint8_t own_addr_type, uint8_t peer_addr_type,
+                      uint8_t *peer_addr, struct ble_gap_conn_params *params)
 {
     int rc;
 
-    rc = ble_gap_conn_initiate(addr_type, peer_addr, params, bletiny_gap_event,
-                               NULL);
+    rc = ble_gap_connect(own_addr_type, peer_addr_type, peer_addr, params,
+                         bletiny_gap_event, NULL);
     return rc;
 }