summaryrefslogtreecommitdiff
path: root/android/tester-main.h
diff options
context:
space:
mode:
authorGrzegorz Kolodziejczyk <grzegorz.kolodziejczyk@tieto.com>2014-09-25 16:03:09 +0200
committerSzymon Janc <szymon.janc@tieto.com>2014-09-29 16:10:19 +0200
commitc9ddc13a26092708de6df11344e77848456af7be (patch)
treeae73d4ce4941680f7759b8516aa597da23f69cd2 /android/tester-main.h
parent16dffece61b6282e4944516fe29ad931665eafb8 (diff)
downloadbluez-c9ddc13a26092708de6df11344e77848456af7be.tar.gz
android/tester: Make client and server id unified
This makes unified id numers for both gatt server and client defined as application id.
Diffstat (limited to 'android/tester-main.h')
-rw-r--r--android/tester-main.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/android/tester-main.h b/android/tester-main.h
index 6afc553a4..86291d889 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -132,7 +132,7 @@
.callback_result.properties = cb_prop, \
.callback_result.num_properties = 1, \
.callback_result.conn_id = cb_conn_id, \
- .callback_result.client_id = cb_client_id, \
+ .callback_result.gatt_app_id = cb_client_id, \
}
#define CALLBACK_GATTC_SEARCH_RESULT(cb_conn_id, cb_service) { \
@@ -209,7 +209,7 @@
.callback_result.properties = cb_prop, \
.callback_result.num_properties = 1, \
.callback_result.conn_id = cb_conn_id, \
- .callback_result.client_id = cb_client_id, \
+ .callback_result.gatt_app_id = cb_client_id, \
}
#define CALLBACK_PAN_CTRL_STATE(cb, cb_res, cb_state, cb_local_role) { \
@@ -440,7 +440,7 @@ struct bt_callback_data {
bool adv_data;
- int client_id;
+ int gatt_app_id;
int conn_id;
btgatt_srvc_id_t *service;
btgatt_gatt_id_t *characteristic;