bletiny - make filenames consistent with bleprph

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

Branch: refs/heads/develop
Commit: 23fda2392dfd0625364ea6ff0f42557a112f3533
Parents: ce14aee
Author: Christopher Collins <[email protected]>
Authored: Tue May 24 18:51:33 2016 -0700
Committer: Christopher Collins <[email protected]>
Committed: Wed May 25 12:16:46 2016 -0700

----------------------------------------------------------------------
 apps/bletiny/src/bletiny.h      | 198 +++++++++++++++++++++++++++++++++++
 apps/bletiny/src/bletiny_priv.h | 198 -----------------------------------
 apps/bletiny/src/cmd.c          |   2 +-
 apps/bletiny/src/gatt_svr.c     |   2 +-
 apps/bletiny/src/main.c         |   2 +-
 apps/bletiny/src/misc.c         |  36 ++++++-
 apps/bletiny/src/parse.c        |  34 +-----
 apps/bletiny/src/store.c        |   2 +-
 8 files changed, 238 insertions(+), 236 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/23fda239/apps/bletiny/src/bletiny.h
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/bletiny.h b/apps/bletiny/src/bletiny.h
new file mode 100644
index 0000000..d3be8eb
--- /dev/null
+++ b/apps/bletiny/src/bletiny.h
@@ -0,0 +1,198 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLETINY_PRIV_
+#define H_BLETINY_PRIV_
+
+#include <inttypes.h>
+#include "nimble/nimble_opt.h"
+#include "log/log.h"
+#include "os/queue.h"
+
+#include "host/ble_gatt.h"
+struct ble_gap_white_entry;
+struct ble_hs_adv_fields;
+struct ble_gap_upd_params;
+struct ble_gap_crt_params;
+struct hci_adv_params;
+struct ble_l2cap_sig_update_req;
+struct ble_l2cap_sig_update_params;
+union ble_store_value;
+union ble_store_key;
+
+typedef int cmd_fn(int argc, char **argv);
+struct cmd_entry {
+    char *name;
+    cmd_fn *cb;
+};
+
+struct kv_pair {
+    char *key;
+    int val;
+};
+
+struct bletiny_dsc {
+    SLIST_ENTRY(bletiny_dsc) next;
+    struct ble_gatt_dsc dsc;
+};
+SLIST_HEAD(bletiny_dsc_list, bletiny_dsc);
+
+struct bletiny_chr {
+    SLIST_ENTRY(bletiny_chr) next;
+    struct ble_gatt_chr chr;
+
+    struct bletiny_dsc_list dscs;
+};
+SLIST_HEAD(bletiny_chr_list, bletiny_chr);
+
+struct bletiny_svc {
+    SLIST_ENTRY(bletiny_svc) next;
+    struct ble_gatt_service svc;
+
+    struct bletiny_chr_list chrs;
+};
+
+SLIST_HEAD(bletiny_svc_list, bletiny_svc);
+
+struct bletiny_conn {
+    uint16_t handle;
+    uint8_t addr_type;
+    uint8_t addr[6];
+
+    struct bletiny_svc_list svcs;
+};
+
+extern struct bletiny_conn bletiny_conns[NIMBLE_OPT(MAX_CONNECTIONS)];
+extern int bletiny_num_conns;
+
+extern const char *bletiny_device_name;
+extern const uint16_t bletiny_appearance;
+extern const uint8_t bletiny_privacy_flag;
+extern uint8_t bletiny_reconnect_addr[6];
+extern uint8_t bletiny_pref_conn_params[8];
+extern uint8_t bletiny_gatt_service_changed[4];
+
+extern struct nmgr_transport nm_ble_transport;
+extern uint16_t nm_attr_val_handle;
+
+extern struct log bletiny_log;
+
+void print_addr(void *addr);
+void print_uuid(void *uuid128);
+const struct cmd_entry *parse_cmd_find(const struct cmd_entry *cmds,
+                                       char *name);
+struct kv_pair *parse_kv_find(struct kv_pair *kvs, char *name);
+char *parse_arg_find(char *key);
+long parse_arg_long_bounds(char *name, long min, long max, int *out_status);
+uint64_t parse_arg_uint64_bounds(char *name, uint64_t min,
+                                 uint64_t max, int *out_status);
+long parse_arg_long(char *name, int *staus);
+uint8_t parse_arg_bool(char *name, int *status);
+uint8_t parse_arg_uint8(char *name, int *status);
+uint16_t parse_arg_uint16(char *name, int *status);
+uint16_t parse_arg_uint16_dflt(char *name, uint16_t dflt, int *out_status);
+uint32_t parse_arg_uint32(char *name, int *out_status);
+uint64_t parse_arg_uint64(char *name, int *out_status);
+int parse_arg_kv(char *name, struct kv_pair *kvs);
+int parse_arg_byte_stream(char *name, int max_len, uint8_t *dst, int *out_len);
+int parse_arg_byte_stream_exact_length(char *name, uint8_t *dst, int len);
+int parse_arg_mac(char *name, uint8_t *dst);
+int parse_arg_uuid(char *name, uint8_t *dst_uuid128);
+int parse_err_too_few_args(char *cmd_name);
+int parse_arg_all(int argc, char **argv);
+int cmd_init(void);
+int nm_chr_access(uint16_t conn_handle, uint16_t attr_handle,
+                  uint8_t op, union ble_gatt_access_ctxt *ctxt,
+                  void *arg);
+int nm_rx_rsp(uint8_t *attr_val, uint16_t attr_len);
+void nm_init(void);
+void bletiny_lock(void);
+void bletiny_unlock(void);
+int bletiny_exchange_mtu(uint16_t conn_handle);
+int bletiny_disc_svcs(uint16_t conn_handle);
+int bletiny_disc_svc_by_uuid(uint16_t conn_handle, uint8_t *uuid128);
+int bletiny_disc_all_chrs(uint16_t conn_handle, uint16_t start_handle,
+                           uint16_t end_handle);
+int bletiny_disc_chrs_by_uuid(uint16_t conn_handle, uint16_t start_handle,
+                               uint16_t end_handle, uint8_t *uuid128);
+int bletiny_disc_all_dscs(uint16_t conn_handle, uint16_t chr_val_handle,
+                           uint16_t chr_end_handle);
+int bletiny_find_inc_svcs(uint16_t conn_handle, uint16_t start_handle,
+                           uint16_t end_handle);
+int bletiny_read(uint16_t conn_handle, uint16_t attr_handle);
+int bletiny_read_long(uint16_t conn_handle, uint16_t attr_handle);
+int bletiny_read_by_uuid(uint16_t conn_handle, uint16_t start_handle,
+                          uint16_t end_handle, uint8_t *uuid128);
+int bletiny_read_mult(uint16_t conn_handle, uint16_t *attr_handles,
+                       int num_attr_handles);
+int bletiny_write(uint16_t conn_handle, uint16_t attr_handle, void *value,
+                   uint16_t value_len);
+int bletiny_write_no_rsp(uint16_t conn_handle, uint16_t attr_handle,
+                          void *value, uint16_t value_len);
+int bletiny_write_long(uint16_t conn_handle, uint16_t attr_handle,
+                        void *value, uint16_t value_len);
+int bletiny_write_reliable(uint16_t conn_handle, struct ble_gatt_attr *attrs,
+                            int num_attrs);
+int bletiny_adv_start(int disc, int conn, uint8_t *peer_addr, int addr_type,
+                       struct hci_adv_params *params);
+int bletiny_adv_stop(void);
+int bletiny_conn_initiate(int addr_type, uint8_t *peer_addr,
+                           struct ble_gap_crt_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,
+                    int white_list_count);
+int bletiny_scan(uint32_t dur_ms, uint8_t disc_mode, uint8_t scan_type,
+                  uint8_t filter_policy);
+int bletiny_set_adv_data(struct ble_hs_adv_fields *adv_fields);
+int bletiny_update_conn(uint16_t conn_handle,
+                         struct ble_gap_upd_params *params);
+void bletiny_chrup(uint16_t attr_handle);
+int bletiny_l2cap_update(uint16_t conn_handle,
+                          struct ble_l2cap_sig_update_params *params);
+int bletiny_sec_start(uint16_t conn_handle);
+int bletiny_sec_restart(uint16_t conn_handle, uint8_t *ltk, uint16_t ediv,
+                        uint64_t rand_val, int auth);
+
+#define BLETINY_LOG_MODULE  (LOG_MODULE_PERUSER + 0)
+#define BLETINY_LOG(lvl, ...) \
+    LOG_ ## lvl(&bletiny_log, BLETINY_LOG_MODULE, __VA_ARGS__)
+
+/** GATT server. */
+#define GATT_SVR_SVC_ALERT_UUID               0x1811
+#define GATT_SVR_CHR_SUP_NEW_ALERT_CAT_UUID   0x2A47
+#define GATT_SVR_CHR_NEW_ALERT                0x2A46
+#define GATT_SVR_CHR_SUP_UNR_ALERT_CAT_UUID   0x2A48
+#define GATT_SVR_CHR_UNR_ALERT_STAT_UUID      0x2A45
+#define GATT_SVR_CHR_ALERT_NOT_CTRL_PT        0x2A44
+extern const uint8_t gatt_svr_svc_bleprph[16];
+extern const uint8_t gatt_svr_chr_bleprph_read[16];
+extern const uint8_t gatt_svr_chr_bleprph_write[16];
+
+void gatt_svr_init(void);
+
+/** Store. */
+int store_read(int obj_type, union ble_store_key *key,
+               union ble_store_value *dst);
+int store_write(int obj_type, union ble_store_value *val);
+
+/** Misc. */
+void print_bytes(uint8_t *bytes, int len);
+
+#endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/23fda239/apps/bletiny/src/bletiny_priv.h
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/bletiny_priv.h b/apps/bletiny/src/bletiny_priv.h
deleted file mode 100644
index d3be8eb..0000000
--- a/apps/bletiny/src/bletiny_priv.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLETINY_PRIV_
-#define H_BLETINY_PRIV_
-
-#include <inttypes.h>
-#include "nimble/nimble_opt.h"
-#include "log/log.h"
-#include "os/queue.h"
-
-#include "host/ble_gatt.h"
-struct ble_gap_white_entry;
-struct ble_hs_adv_fields;
-struct ble_gap_upd_params;
-struct ble_gap_crt_params;
-struct hci_adv_params;
-struct ble_l2cap_sig_update_req;
-struct ble_l2cap_sig_update_params;
-union ble_store_value;
-union ble_store_key;
-
-typedef int cmd_fn(int argc, char **argv);
-struct cmd_entry {
-    char *name;
-    cmd_fn *cb;
-};
-
-struct kv_pair {
-    char *key;
-    int val;
-};
-
-struct bletiny_dsc {
-    SLIST_ENTRY(bletiny_dsc) next;
-    struct ble_gatt_dsc dsc;
-};
-SLIST_HEAD(bletiny_dsc_list, bletiny_dsc);
-
-struct bletiny_chr {
-    SLIST_ENTRY(bletiny_chr) next;
-    struct ble_gatt_chr chr;
-
-    struct bletiny_dsc_list dscs;
-};
-SLIST_HEAD(bletiny_chr_list, bletiny_chr);
-
-struct bletiny_svc {
-    SLIST_ENTRY(bletiny_svc) next;
-    struct ble_gatt_service svc;
-
-    struct bletiny_chr_list chrs;
-};
-
-SLIST_HEAD(bletiny_svc_list, bletiny_svc);
-
-struct bletiny_conn {
-    uint16_t handle;
-    uint8_t addr_type;
-    uint8_t addr[6];
-
-    struct bletiny_svc_list svcs;
-};
-
-extern struct bletiny_conn bletiny_conns[NIMBLE_OPT(MAX_CONNECTIONS)];
-extern int bletiny_num_conns;
-
-extern const char *bletiny_device_name;
-extern const uint16_t bletiny_appearance;
-extern const uint8_t bletiny_privacy_flag;
-extern uint8_t bletiny_reconnect_addr[6];
-extern uint8_t bletiny_pref_conn_params[8];
-extern uint8_t bletiny_gatt_service_changed[4];
-
-extern struct nmgr_transport nm_ble_transport;
-extern uint16_t nm_attr_val_handle;
-
-extern struct log bletiny_log;
-
-void print_addr(void *addr);
-void print_uuid(void *uuid128);
-const struct cmd_entry *parse_cmd_find(const struct cmd_entry *cmds,
-                                       char *name);
-struct kv_pair *parse_kv_find(struct kv_pair *kvs, char *name);
-char *parse_arg_find(char *key);
-long parse_arg_long_bounds(char *name, long min, long max, int *out_status);
-uint64_t parse_arg_uint64_bounds(char *name, uint64_t min,
-                                 uint64_t max, int *out_status);
-long parse_arg_long(char *name, int *staus);
-uint8_t parse_arg_bool(char *name, int *status);
-uint8_t parse_arg_uint8(char *name, int *status);
-uint16_t parse_arg_uint16(char *name, int *status);
-uint16_t parse_arg_uint16_dflt(char *name, uint16_t dflt, int *out_status);
-uint32_t parse_arg_uint32(char *name, int *out_status);
-uint64_t parse_arg_uint64(char *name, int *out_status);
-int parse_arg_kv(char *name, struct kv_pair *kvs);
-int parse_arg_byte_stream(char *name, int max_len, uint8_t *dst, int *out_len);
-int parse_arg_byte_stream_exact_length(char *name, uint8_t *dst, int len);
-int parse_arg_mac(char *name, uint8_t *dst);
-int parse_arg_uuid(char *name, uint8_t *dst_uuid128);
-int parse_err_too_few_args(char *cmd_name);
-int parse_arg_all(int argc, char **argv);
-int cmd_init(void);
-int nm_chr_access(uint16_t conn_handle, uint16_t attr_handle,
-                  uint8_t op, union ble_gatt_access_ctxt *ctxt,
-                  void *arg);
-int nm_rx_rsp(uint8_t *attr_val, uint16_t attr_len);
-void nm_init(void);
-void bletiny_lock(void);
-void bletiny_unlock(void);
-int bletiny_exchange_mtu(uint16_t conn_handle);
-int bletiny_disc_svcs(uint16_t conn_handle);
-int bletiny_disc_svc_by_uuid(uint16_t conn_handle, uint8_t *uuid128);
-int bletiny_disc_all_chrs(uint16_t conn_handle, uint16_t start_handle,
-                           uint16_t end_handle);
-int bletiny_disc_chrs_by_uuid(uint16_t conn_handle, uint16_t start_handle,
-                               uint16_t end_handle, uint8_t *uuid128);
-int bletiny_disc_all_dscs(uint16_t conn_handle, uint16_t chr_val_handle,
-                           uint16_t chr_end_handle);
-int bletiny_find_inc_svcs(uint16_t conn_handle, uint16_t start_handle,
-                           uint16_t end_handle);
-int bletiny_read(uint16_t conn_handle, uint16_t attr_handle);
-int bletiny_read_long(uint16_t conn_handle, uint16_t attr_handle);
-int bletiny_read_by_uuid(uint16_t conn_handle, uint16_t start_handle,
-                          uint16_t end_handle, uint8_t *uuid128);
-int bletiny_read_mult(uint16_t conn_handle, uint16_t *attr_handles,
-                       int num_attr_handles);
-int bletiny_write(uint16_t conn_handle, uint16_t attr_handle, void *value,
-                   uint16_t value_len);
-int bletiny_write_no_rsp(uint16_t conn_handle, uint16_t attr_handle,
-                          void *value, uint16_t value_len);
-int bletiny_write_long(uint16_t conn_handle, uint16_t attr_handle,
-                        void *value, uint16_t value_len);
-int bletiny_write_reliable(uint16_t conn_handle, struct ble_gatt_attr *attrs,
-                            int num_attrs);
-int bletiny_adv_start(int disc, int conn, uint8_t *peer_addr, int addr_type,
-                       struct hci_adv_params *params);
-int bletiny_adv_stop(void);
-int bletiny_conn_initiate(int addr_type, uint8_t *peer_addr,
-                           struct ble_gap_crt_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,
-                    int white_list_count);
-int bletiny_scan(uint32_t dur_ms, uint8_t disc_mode, uint8_t scan_type,
-                  uint8_t filter_policy);
-int bletiny_set_adv_data(struct ble_hs_adv_fields *adv_fields);
-int bletiny_update_conn(uint16_t conn_handle,
-                         struct ble_gap_upd_params *params);
-void bletiny_chrup(uint16_t attr_handle);
-int bletiny_l2cap_update(uint16_t conn_handle,
-                          struct ble_l2cap_sig_update_params *params);
-int bletiny_sec_start(uint16_t conn_handle);
-int bletiny_sec_restart(uint16_t conn_handle, uint8_t *ltk, uint16_t ediv,
-                        uint64_t rand_val, int auth);
-
-#define BLETINY_LOG_MODULE  (LOG_MODULE_PERUSER + 0)
-#define BLETINY_LOG(lvl, ...) \
-    LOG_ ## lvl(&bletiny_log, BLETINY_LOG_MODULE, __VA_ARGS__)
-
-/** GATT server. */
-#define GATT_SVR_SVC_ALERT_UUID               0x1811
-#define GATT_SVR_CHR_SUP_NEW_ALERT_CAT_UUID   0x2A47
-#define GATT_SVR_CHR_NEW_ALERT                0x2A46
-#define GATT_SVR_CHR_SUP_UNR_ALERT_CAT_UUID   0x2A48
-#define GATT_SVR_CHR_UNR_ALERT_STAT_UUID      0x2A45
-#define GATT_SVR_CHR_ALERT_NOT_CTRL_PT        0x2A44
-extern const uint8_t gatt_svr_svc_bleprph[16];
-extern const uint8_t gatt_svr_chr_bleprph_read[16];
-extern const uint8_t gatt_svr_chr_bleprph_write[16];
-
-void gatt_svr_init(void);
-
-/** Store. */
-int store_read(int obj_type, union ble_store_key *key,
-               union ble_store_value *dst);
-int store_write(int obj_type, union ble_store_value *val);
-
-/** Misc. */
-void print_bytes(uint8_t *bytes, int len);
-
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/23fda239/apps/bletiny/src/cmd.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/cmd.c b/apps/bletiny/src/cmd.c
index 88ea88b..535637f 100644
--- a/apps/bletiny/src/cmd.c
+++ b/apps/bletiny/src/cmd.c
@@ -31,7 +31,7 @@
 #include "../src/ble_l2cap_priv.h"
 #include "../src/ble_hs_priv.h"
 
-#include "bletiny_priv.h"
+#include "bletiny.h"
 
 #define CMD_BUF_SZ      256
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/23fda239/apps/bletiny/src/gatt_svr.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/gatt_svr.c b/apps/bletiny/src/gatt_svr.c
index 71df9b0..e380b3c 100644
--- a/apps/bletiny/src/gatt_svr.c
+++ b/apps/bletiny/src/gatt_svr.c
@@ -23,7 +23,7 @@
 #include "bsp/bsp.h"
 #include "console/console.h"
 #include "host/ble_hs.h"
-#include "bletiny_priv.h"
+#include "bletiny.h"
 
 /**
  * The vendor specific "bleprph" service consists of two characteristics:

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/23fda239/apps/bletiny/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c
index 6797b53..2bd6b1f 100755
--- a/apps/bletiny/src/main.c
+++ b/apps/bletiny/src/main.c
@@ -29,7 +29,7 @@
 #include "hal/hal_cputime.h"
 #include "console/console.h"
 #include "shell/shell.h"
-#include "bletiny_priv.h"
+#include "bletiny.h"
 
 /* BLE */
 #include "nimble/ble.h"

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/23fda239/apps/bletiny/src/misc.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/misc.c b/apps/bletiny/src/misc.c
index 702c6cb..52c76b0 100644
--- a/apps/bletiny/src/misc.c
+++ b/apps/bletiny/src/misc.c
@@ -18,7 +18,9 @@
  */
 
 #include "console/console.h"
-#include "bletiny_priv.h"
+#include "host/ble_uuid.h"
+
+#include "bletiny.h"
 
 /**
  * Utility function to log an array of bytes.
@@ -32,3 +34,35 @@ print_bytes(uint8_t *bytes, int len)
         console_printf("%s0x%02x", i != 0 ? ":" : "", bytes[i]);
     }
 }
+
+void
+print_addr(void *addr)
+{
+    uint8_t *u8p;
+
+    u8p = addr;
+    console_printf("%02x:%02x:%02x:%02x:%02x:%02x",
+                   u8p[5], u8p[4], u8p[3], u8p[2], u8p[1], u8p[0]);
+}
+
+void
+print_uuid(void *uuid128)
+{
+    uint16_t uuid16;
+    uint8_t *u8p;
+
+    uuid16 = ble_uuid_128_to_16(uuid128);
+    if (uuid16 != 0) {
+        console_printf("0x%04x", uuid16);
+        return;
+    }
+
+    u8p = uuid128;
+
+    /* 00001101-0000-1000-8000-00805f9b34fb */
+    console_printf("%02x%02x%02x%02x-", u8p[15], u8p[14], u8p[13], u8p[12]);
+    console_printf("%02x%02x-%02x%02x-", u8p[11], u8p[10], u8p[9], u8p[8]);
+    console_printf("%02x%02x%02x%02x%02x%02x%02x%02x",
+                   u8p[7], u8p[6], u8p[5], u8p[4],
+                   u8p[3], u8p[2], u8p[1], u8p[0]);
+}

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/23fda239/apps/bletiny/src/parse.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/parse.c b/apps/bletiny/src/parse.c
index c6b247f..457cb7c 100644
--- a/apps/bletiny/src/parse.c
+++ b/apps/bletiny/src/parse.c
@@ -25,45 +25,13 @@
 #include <assert.h>
 #include "console/console.h"
 #include "host/ble_uuid.h"
-#include "bletiny_priv.h"
+#include "bletiny.h"
 
 #define CMD_MAX_ARGS        16
 
 static char *cmd_args[CMD_MAX_ARGS][2];
 static int cmd_num_args;
 
-void
-print_addr(void *addr)
-{
-    uint8_t *u8p;
-
-    u8p = addr;
-    console_printf("%02x:%02x:%02x:%02x:%02x:%02x",
-                   u8p[5], u8p[4], u8p[3], u8p[2], u8p[1], u8p[0]);
-}
-
-void
-print_uuid(void *uuid128)
-{
-    uint16_t uuid16;
-    uint8_t *u8p;
-
-    uuid16 = ble_uuid_128_to_16(uuid128);
-    if (uuid16 != 0) {
-        console_printf("0x%04x", uuid16);
-        return;
-    }
-
-    u8p = uuid128;
-
-    /* 00001101-0000-1000-8000-00805f9b34fb */
-    console_printf("%02x%02x%02x%02x-", u8p[15], u8p[14], u8p[13], u8p[12]);
-    console_printf("%02x%02x-%02x%02x-", u8p[11], u8p[10], u8p[9], u8p[8]);
-    console_printf("%02x%02x%02x%02x%02x%02x%02x%02x",
-                   u8p[7], u8p[6], u8p[5], u8p[4],
-                   u8p[3], u8p[2], u8p[1], u8p[0]);
-}
-
 int
 parse_err_too_few_args(char *cmd_name)
 {

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/23fda239/apps/bletiny/src/store.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/store.c b/apps/bletiny/src/store.c
index b714d2d..904b328 100644
--- a/apps/bletiny/src/store.c
+++ b/apps/bletiny/src/store.c
@@ -33,7 +33,7 @@
 #include "console/console.h"
 #include "host/ble_hs.h"
 
-#include "bletiny_priv.h"
+#include "bletiny.h"
 
 #define STORE_MAX_OUR_LTKS   4
 

Reply via email to