diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2014-11-07 12:42:00 +0200 |
|---|---|---|
| committer | Szymon Janc <szymon.janc@tieto.com> | 2014-11-07 12:51:27 +0100 |
| commit | 4c150a0a5b35fdf273ecda674c19c5a3ec1dfbe8 (patch) | |
| tree | ff7a04376655df4706fa6d695b2edd40e8215f4d /android/tester-gatt.c | |
| parent | cf495fb1f0c45b9d0a7c7bbdfb386f155b75015f (diff) | |
| download | bluez-4c150a0a5b35fdf273ecda674c19c5a3ec1dfbe8.tar.gz | |
android: Update Android system headers to 5.0 API
Android headers are used for Linux host build.
Diffstat (limited to 'android/tester-gatt.c')
| -rw-r--r-- | android/tester-gatt.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/android/tester-gatt.c b/android/tester-gatt.c index 97473e5a3..85f22bb79 100644 --- a/android/tester-gatt.c +++ b/android/tester-gatt.c @@ -19,6 +19,7 @@ #include "emulator/bthost.h" #include "tester-main.h" +#include "hal-msg.h" #include "src/shared/util.h" #define ATT_HANDLE_SIZE 2 @@ -1227,11 +1228,9 @@ static void gatt_client_unregister_action(void) static void gatt_client_start_scan_action(void) { struct test_data *data = tester_get_data(); - struct step *current_data_step = queue_peek_head(data->steps); - int32_t cl_id = PTR_TO_INT(current_data_step->set_data); struct step *step = g_new0(struct step, 1); - step->action_status = data->if_gatt->client->scan(cl_id, TRUE); + step->action_status = data->if_gatt->client->scan(TRUE); schedule_action_verification(step); } @@ -1239,11 +1238,9 @@ static void gatt_client_start_scan_action(void) static void gatt_client_stop_scan_action(void) { struct test_data *data = tester_get_data(); - struct step *current_data_step = queue_peek_head(data->steps); - int32_t cl_id = PTR_TO_INT(current_data_step->set_data); struct step *step = g_new0(struct step, 1); - step->action_status = data->if_gatt->client->scan(cl_id, FALSE); + step->action_status = data->if_gatt->client->scan(FALSE); schedule_action_verification(step); } @@ -1258,7 +1255,8 @@ static void gatt_client_connect_action(void) step->action_status = data->if_gatt->client->connect( conn_data->app_id, &emu_remote_bdaddr_val, - 0); + 0, + BT_TRANSPORT_UNKNOWN); schedule_action_verification(step); } @@ -1490,7 +1488,8 @@ static void gatt_server_connect_action(void) step->action_status = data->if_gatt->server->connect( conn_data->app_id, &emu_remote_bdaddr_val, - 0); + 0, + BT_TRANSPORT_UNKNOWN); schedule_action_verification(step); } |