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/13 20:55:59 UTC
[46/50] [abbrv] incubator-mynewt-core git commit: bletiny - Account
for new dsc desc API.
bletiny - Account for new dsc desc 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/ed21cfa4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/ed21cfa4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/ed21cfa4
Branch: refs/heads/develop
Commit: ed21cfa4fa238a877d75e4095dcb484635865521
Parents: df81d18
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Jul 13 12:05:29 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Jul 13 12:11:37 2016 -0700
----------------------------------------------------------------------
apps/bletiny/src/main.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ed21cfa4/apps/bletiny/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c
index 042660f..e3a13d2 100755
--- a/apps/bletiny/src/main.c
+++ b/apps/bletiny/src/main.c
@@ -136,7 +136,7 @@ struct bletiny_tx_data_s
uint16_t tx_len;
};
static struct bletiny_tx_data_s bletiny_tx_data;
-int bletiny_full_disc_prev_chr_def;
+int bletiny_full_disc_prev_chr_val;
#define XSTR(s) STR(s)
#define STR(s) #s
@@ -697,7 +697,7 @@ static void
bletiny_full_disc_complete(int rc)
{
console_printf("full discovery complete; rc=%d\n", rc);
- bletiny_full_disc_prev_chr_def = 0;
+ bletiny_full_disc_prev_chr_val = 0;
}
static void
@@ -720,16 +720,16 @@ bletiny_disc_full_dscs(uint16_t conn_handle)
SLIST_FOREACH(chr, &svc->chrs, next) {
if (!chr_is_empty(svc, chr) &&
SLIST_EMPTY(&chr->dscs) &&
- bletiny_full_disc_prev_chr_def <= chr->chr.def_handle) {
+ bletiny_full_disc_prev_chr_val <= chr->chr.def_handle) {
rc = bletiny_disc_all_dscs(conn_handle,
- chr->chr.def_handle,
+ chr->chr.val_handle,
chr_end_handle(svc, chr));
if (rc != 0) {
bletiny_full_disc_complete(rc);
}
- bletiny_full_disc_prev_chr_def = chr->chr.val_handle;
+ bletiny_full_disc_prev_chr_val = chr->chr.val_handle;
return;
}
}
@@ -780,7 +780,7 @@ bletiny_on_disc_s(uint16_t conn_handle, const struct ble_gatt_error *error,
case BLE_HS_EDONE:
console_printf("service discovery successful\n");
- if (bletiny_full_disc_prev_chr_def > 0) {
+ if (bletiny_full_disc_prev_chr_val > 0) {
bletiny_disc_full_chrs(conn_handle);
}
break;
@@ -808,7 +808,7 @@ bletiny_on_disc_c(uint16_t conn_handle, const struct ble_gatt_error *error,
case BLE_HS_EDONE:
console_printf("characteristic discovery successful\n");
- if (bletiny_full_disc_prev_chr_def > 0) {
+ if (bletiny_full_disc_prev_chr_val > 0) {
bletiny_disc_full_chrs(conn_handle);
}
break;
@@ -833,7 +833,7 @@ bletiny_on_disc_d(uint16_t conn_handle, const struct ble_gatt_error *error,
case BLE_HS_EDONE:
console_printf("descriptor discovery successful\n");
- if (bletiny_full_disc_prev_chr_def > 0) {
+ if (bletiny_full_disc_prev_chr_val > 0) {
bletiny_disc_full_dscs(conn_handle);
}
break;
@@ -1161,7 +1161,7 @@ bletiny_disc_full(uint16_t conn_handle)
bletiny_svc_delete(svc);
}
- bletiny_full_disc_prev_chr_def = 1;
+ bletiny_full_disc_prev_chr_val = 1;
bletiny_disc_svcs(conn_handle);
return 0;