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:09 UTC
[19/50] [abbrv] incubator-mynewt-core git commit: ble apps - Account
for const correctness.
ble apps - Account for const correctness.
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/34027955
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/34027955
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/34027955
Branch: refs/heads/ble_hs_api
Commit: 3402795548422a0cf5e18a510bb0140b5c104e89
Parents: 6353155
Author: Christopher Collins <cc...@apache.org>
Authored: Fri Jun 24 18:26:07 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Jul 11 16:43:32 2016 -0700
----------------------------------------------------------------------
apps/bleprph/src/bleprph.h | 4 +--
apps/bleprph/src/misc.c | 6 ++--
apps/bletiny/src/bletiny.h | 28 ++++++++--------
apps/bletiny/src/cmd.c | 2 +-
apps/bletiny/src/main.c | 72 +++++++++++++++++++++--------------------
apps/bletiny/src/misc.c | 20 ++++++------
6 files changed, 67 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/34027955/apps/bleprph/src/bleprph.h
----------------------------------------------------------------------
diff --git a/apps/bleprph/src/bleprph.h b/apps/bleprph/src/bleprph.h
index a353bac..6a7ffd4 100644
--- a/apps/bleprph/src/bleprph.h
+++ b/apps/bleprph/src/bleprph.h
@@ -59,7 +59,7 @@ int store_read(int obj_type, union ble_store_key *key,
int store_write(int obj_type, union ble_store_value *val);
/** Misc. */
-void print_bytes(uint8_t *bytes, int len);
-void print_addr(void *addr);
+void print_bytes(const uint8_t *bytes, int len);
+void print_addr(const void *addr);
#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/34027955/apps/bleprph/src/misc.c
----------------------------------------------------------------------
diff --git a/apps/bleprph/src/misc.c b/apps/bleprph/src/misc.c
index d5d4808..7e27765 100644
--- a/apps/bleprph/src/misc.c
+++ b/apps/bleprph/src/misc.c
@@ -23,7 +23,7 @@
* Utility function to log an array of bytes.
*/
void
-print_bytes(uint8_t *bytes, int len)
+print_bytes(const uint8_t *bytes, int len)
{
int i;
@@ -33,9 +33,9 @@ print_bytes(uint8_t *bytes, int len)
}
void
-print_addr(void *addr)
+print_addr(const void *addr)
{
- uint8_t *u8p;
+ const uint8_t *u8p;
u8p = addr;
BLEPRPH_LOG(INFO, "%02x:%02x:%02x:%02x:%02x:%02x",
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/34027955/apps/bletiny/src/bletiny.h
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/bletiny.h b/apps/bletiny/src/bletiny.h
index 90002e6..d6051bf 100644
--- a/apps/bletiny/src/bletiny.h
+++ b/apps/bletiny/src/bletiny.h
@@ -93,9 +93,6 @@ extern uint16_t nm_attr_val_handle;
extern struct log bletiny_log;
-void print_addr(void *addr);
-void print_uuid(void *uuid128);
-void print_bytes(uint8_t *bytes, int len);
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);
@@ -148,14 +145,14 @@ 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(uint16_t conn_handle, uint16_t attr_handle,
+ const 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);
+ const 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);
+ const void *value, uint16_t value_len);
+int bletiny_write_reliable(uint16_t conn_handle,
+ const struct ble_gatt_attr *attrs, int num_attrs);
int bletiny_adv_start(uint8_t own_addr_type, uint8_t peer_addr_type,
const uint8_t *peer_addr, int32_t duration_ms,
const struct ble_gap_adv_params *params);
@@ -209,10 +206,13 @@ int store_read(int obj_type, union ble_store_key *key,
int store_write(int obj_type, union ble_store_value *val);
/** Misc. */
-void print_bytes(uint8_t *bytes, int len);
-int svc_is_empty(struct bletiny_svc *svc);
-uint16_t chr_end_handle(struct bletiny_svc *svc, struct bletiny_chr *chr);
-int chr_is_empty(struct bletiny_svc *svc, struct bletiny_chr *chr);
-void print_conn_desc(struct ble_gap_conn_desc *desc);
+void print_bytes(const uint8_t *bytes, int len);
+void print_addr(const void *addr);
+void print_uuid(const void *uuid128);
+int svc_is_empty(const struct bletiny_svc *svc);
+uint16_t chr_end_handle(const struct bletiny_svc *svc,
+ const struct bletiny_chr *chr);
+int chr_is_empty(const struct bletiny_svc *svc, const struct bletiny_chr *chr);
+void print_conn_desc(const struct ble_gap_conn_desc *desc);
#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/34027955/apps/bletiny/src/cmd.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/cmd.c b/apps/bletiny/src/cmd.c
index d6e824d..eee8f22 100644
--- a/apps/bletiny/src/cmd.c
+++ b/apps/bletiny/src/cmd.c
@@ -1815,7 +1815,7 @@ cmd_write(int argc, char **argv)
return EINVAL;
}
rc = bletiny_write_no_rsp(conn_handle, attrs[0].handle,
- attrs[0].value, attrs[0].value_len);
+ attrs[0].value, attrs[0].value_len);
} else if (is_long) {
if (num_attrs != 1) {
return EINVAL;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/34027955/apps/bletiny/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c
index 764eb00..02f8566 100755
--- a/apps/bletiny/src/main.c
+++ b/apps/bletiny/src/main.c
@@ -149,7 +149,7 @@ int bletiny_full_disc_prev_chr_def;
static void
bletiny_print_error(char *msg, uint16_t conn_handle,
- struct ble_gatt_error *error)
+ const struct ble_gatt_error *error)
{
if (msg == NULL) {
msg = "ERROR";
@@ -160,7 +160,7 @@ bletiny_print_error(char *msg, uint16_t conn_handle,
}
static void
-bletiny_print_adv_fields(struct ble_hs_adv_fields *fields)
+bletiny_print_adv_fields(const struct ble_hs_adv_fields *fields)
{
uint32_t u32;
uint16_t u16;
@@ -338,7 +338,7 @@ bletiny_svc_find_prev(struct bletiny_conn *conn, uint16_t svc_start_handle)
static struct bletiny_svc *
bletiny_svc_find(struct bletiny_conn *conn, uint16_t svc_start_handle,
- struct bletiny_svc **out_prev)
+ struct bletiny_svc **out_prev)
{
struct bletiny_svc *prev;
struct bletiny_svc *svc;
@@ -403,7 +403,7 @@ bletiny_svc_delete(struct bletiny_svc *svc)
}
static struct bletiny_svc *
-bletiny_svc_add(uint16_t conn_handle, struct ble_gatt_svc *gatt_svc)
+bletiny_svc_add(uint16_t conn_handle, const struct ble_gatt_svc *gatt_svc)
{
struct bletiny_conn *conn;
struct bletiny_svc *prev;
@@ -443,7 +443,7 @@ bletiny_svc_add(uint16_t conn_handle, struct ble_gatt_svc *gatt_svc)
}
static struct bletiny_chr *
-bletiny_chr_find_prev(struct bletiny_svc *svc, uint16_t chr_def_handle)
+bletiny_chr_find_prev(const struct bletiny_svc *svc, uint16_t chr_def_handle)
{
struct bletiny_chr *prev;
struct bletiny_chr *chr;
@@ -461,8 +461,8 @@ bletiny_chr_find_prev(struct bletiny_svc *svc, uint16_t chr_def_handle)
}
static struct bletiny_chr *
-bletiny_chr_find(struct bletiny_svc *svc, uint16_t chr_def_handle,
- struct bletiny_chr **out_prev)
+bletiny_chr_find(const struct bletiny_svc *svc, uint16_t chr_def_handle,
+ struct bletiny_chr **out_prev)
{
struct bletiny_chr *prev;
struct bletiny_chr *chr;
@@ -487,7 +487,7 @@ bletiny_chr_find(struct bletiny_svc *svc, uint16_t chr_def_handle,
static struct bletiny_chr *
bletiny_chr_add(uint16_t conn_handle, uint16_t svc_start_handle,
- struct ble_gatt_chr *gatt_chr)
+ const struct ble_gatt_chr *gatt_chr)
{
struct bletiny_conn *conn;
struct bletiny_chr *prev;
@@ -534,7 +534,7 @@ bletiny_chr_add(uint16_t conn_handle, uint16_t svc_start_handle,
}
static struct bletiny_dsc *
-bletiny_dsc_find_prev(struct bletiny_chr *chr, uint16_t dsc_handle)
+bletiny_dsc_find_prev(const struct bletiny_chr *chr, uint16_t dsc_handle)
{
struct bletiny_dsc *prev;
struct bletiny_dsc *dsc;
@@ -552,8 +552,8 @@ bletiny_dsc_find_prev(struct bletiny_chr *chr, uint16_t dsc_handle)
}
static struct bletiny_dsc *
-bletiny_dsc_find(struct bletiny_chr *chr, uint16_t dsc_handle,
- struct bletiny_dsc **out_prev)
+bletiny_dsc_find(const struct bletiny_chr *chr, uint16_t dsc_handle,
+ struct bletiny_dsc **out_prev)
{
struct bletiny_dsc *prev;
struct bletiny_dsc *dsc;
@@ -577,7 +577,7 @@ bletiny_dsc_find(struct bletiny_chr *chr, uint16_t dsc_handle,
static struct bletiny_dsc *
bletiny_dsc_add(uint16_t conn_handle, uint16_t chr_def_handle,
- struct ble_gatt_dsc *gatt_dsc)
+ const struct ble_gatt_dsc *gatt_dsc)
{
struct bletiny_conn *conn;
struct bletiny_dsc *prev;
@@ -676,7 +676,7 @@ bletiny_conn_delete_idx(int idx)
}
static int
-bletiny_on_mtu(uint16_t conn_handle, struct ble_gatt_error *error,
+bletiny_on_mtu(uint16_t conn_handle, const struct ble_gatt_error *error,
uint16_t mtu, void *arg)
{
if (error != NULL) {
@@ -766,8 +766,8 @@ bletiny_disc_full_chrs(uint16_t conn_handle)
}
static int
-bletiny_on_disc_s(uint16_t conn_handle, struct ble_gatt_error *error,
- struct ble_gatt_svc *service, void *arg)
+bletiny_on_disc_s(uint16_t conn_handle, const struct ble_gatt_error *error,
+ const struct ble_gatt_svc *service, void *arg)
{
if (error != NULL) {
bletiny_print_error(NULL, conn_handle, error);
@@ -784,8 +784,8 @@ bletiny_on_disc_s(uint16_t conn_handle, struct ble_gatt_error *error,
}
static int
-bletiny_on_disc_c(uint16_t conn_handle, struct ble_gatt_error *error,
- struct ble_gatt_chr *chr, void *arg)
+bletiny_on_disc_c(uint16_t conn_handle, const struct ble_gatt_error *error,
+ const struct ble_gatt_chr *chr, void *arg)
{
intptr_t svc_start_handle;
@@ -806,9 +806,9 @@ bletiny_on_disc_c(uint16_t conn_handle, struct ble_gatt_error *error,
}
static int
-bletiny_on_disc_d(uint16_t conn_handle, struct ble_gatt_error *error,
- uint16_t chr_def_handle, struct ble_gatt_dsc *dsc,
- void *arg)
+bletiny_on_disc_d(uint16_t conn_handle, const struct ble_gatt_error *error,
+ uint16_t chr_def_handle, const struct ble_gatt_dsc *dsc,
+ void *arg)
{
if (error != NULL) {
bletiny_print_error(NULL, conn_handle, error);
@@ -825,8 +825,8 @@ bletiny_on_disc_d(uint16_t conn_handle, struct ble_gatt_error *error,
}
static int
-bletiny_on_read(uint16_t conn_handle, struct ble_gatt_error *error,
- struct ble_gatt_attr *attr, void *arg)
+bletiny_on_read(uint16_t conn_handle, const struct ble_gatt_error *error,
+ const struct ble_gatt_attr *attr, void *arg)
{
if (error != NULL) {
bletiny_print_error(NULL, conn_handle, error);
@@ -844,8 +844,8 @@ bletiny_on_read(uint16_t conn_handle, struct ble_gatt_error *error,
}
static int
-bletiny_on_write(uint16_t conn_handle, struct ble_gatt_error *error,
- struct ble_gatt_attr *attr, void *arg)
+bletiny_on_write(uint16_t conn_handle, const struct ble_gatt_error *error,
+ const struct ble_gatt_attr *attr, void *arg)
{
if (error != NULL) {
bletiny_print_error(NULL, conn_handle, error);
@@ -861,9 +861,10 @@ bletiny_on_write(uint16_t conn_handle, struct ble_gatt_error *error,
}
static int
-bletiny_on_write_reliable(uint16_t conn_handle, struct ble_gatt_error *error,
- struct ble_gatt_attr *attrs, uint8_t num_attrs,
- void *arg)
+bletiny_on_write_reliable(uint16_t conn_handle,
+ const struct ble_gatt_error *error,
+ const struct ble_gatt_attr *attrs, uint8_t num_attrs,
+ void *arg)
{
int i;
@@ -1192,8 +1193,8 @@ bletiny_read_mult(uint16_t conn_handle, uint16_t *attr_handles,
}
int
-bletiny_write(uint16_t conn_handle, uint16_t attr_handle, void *value,
- uint16_t value_len)
+bletiny_write(uint16_t conn_handle, uint16_t attr_handle, const void *value,
+ uint16_t value_len)
{
int rc;
@@ -1208,8 +1209,8 @@ bletiny_write(uint16_t conn_handle, uint16_t attr_handle, void *value,
}
int
-bletiny_write_no_rsp(uint16_t conn_handle, uint16_t attr_handle, void *value,
- uint16_t value_len)
+bletiny_write_no_rsp(uint16_t conn_handle, uint16_t attr_handle,
+ const void *value, uint16_t value_len)
{
int rc;
@@ -1219,8 +1220,8 @@ bletiny_write_no_rsp(uint16_t conn_handle, uint16_t attr_handle, void *value,
}
int
-bletiny_write_long(uint16_t conn_handle, uint16_t attr_handle, void *value,
- uint16_t value_len)
+bletiny_write_long(uint16_t conn_handle, uint16_t attr_handle,
+ const void *value, uint16_t value_len)
{
int rc;
@@ -1230,8 +1231,9 @@ bletiny_write_long(uint16_t conn_handle, uint16_t attr_handle, void *value,
}
int
-bletiny_write_reliable(uint16_t conn_handle, struct ble_gatt_attr *attrs,
- int num_attrs)
+bletiny_write_reliable(uint16_t conn_handle,
+ const struct ble_gatt_attr *attrs,
+ int num_attrs)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/34027955/apps/bletiny/src/misc.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/misc.c b/apps/bletiny/src/misc.c
index e9f8eee..0df5dee 100644
--- a/apps/bletiny/src/misc.c
+++ b/apps/bletiny/src/misc.c
@@ -27,7 +27,7 @@
* Utility function to log an array of bytes.
*/
void
-print_bytes(uint8_t *bytes, int len)
+print_bytes(const uint8_t *bytes, int len)
{
int i;
@@ -37,9 +37,9 @@ print_bytes(uint8_t *bytes, int len)
}
void
-print_addr(void *addr)
+print_addr(const void *addr)
{
- uint8_t *u8p;
+ const uint8_t *u8p;
u8p = addr;
console_printf("%02x:%02x:%02x:%02x:%02x:%02x",
@@ -47,10 +47,10 @@ print_addr(void *addr)
}
void
-print_uuid(void *uuid128)
+print_uuid(const void *uuid128)
{
uint16_t uuid16;
- uint8_t *u8p;
+ const uint8_t *u8p;
uuid16 = ble_uuid_128_to_16(uuid128);
if (uuid16 != 0) {
@@ -69,15 +69,15 @@ print_uuid(void *uuid128)
}
int
-svc_is_empty(struct bletiny_svc *svc)
+svc_is_empty(const struct bletiny_svc *svc)
{
return svc->svc.end_handle < svc->svc.start_handle;
}
uint16_t
-chr_end_handle(struct bletiny_svc *svc, struct bletiny_chr *chr)
+chr_end_handle(const struct bletiny_svc *svc, const struct bletiny_chr *chr)
{
- struct bletiny_chr *next_chr;
+ const struct bletiny_chr *next_chr;
next_chr = SLIST_NEXT(chr, next);
if (next_chr != NULL) {
@@ -88,13 +88,13 @@ chr_end_handle(struct bletiny_svc *svc, struct bletiny_chr *chr)
}
int
-chr_is_empty(struct bletiny_svc *svc, struct bletiny_chr *chr)
+chr_is_empty(const struct bletiny_svc *svc, const struct bletiny_chr *chr)
{
return chr_end_handle(svc, chr) <= chr->chr.val_handle;
}
void
-print_conn_desc(struct ble_gap_conn_desc *desc)
+print_conn_desc(const struct ble_gap_conn_desc *desc)
{
console_printf("handle=%d our_ota_addr_type=%d our_ota_addr=",
desc->conn_handle, desc->our_ota_addr_type);