* [PATCH 1/2] android/tester: Clarify default properties match names
@ 2017-12-21 20:44 Szymon Janc
2017-12-21 20:44 ` [PATCH 2/2] android/tester: Fix race in discovering devices Szymon Janc
2017-12-22 9:27 ` [PATCH 1/2] android/tester: Clarify default properties match names Szymon Janc
0 siblings, 2 replies; 3+ messages in thread
From: Szymon Janc @ 2017-12-21 20:44 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
---
android/tester-bluetooth.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/android/tester-bluetooth.c b/android/tester-bluetooth.c
index 22077a064..bab6dc952 100644
--- a/android/tester-bluetooth.c
+++ b/android/tester-bluetooth.c
@@ -231,7 +231,7 @@ static bt_property_t prop_emu_default_set[] = {
{ BT_PROPERTY_UUIDS, sizeof(emu_uuids_val), &emu_uuids_val },
};
-static bt_property_t prop_emu_remote_bles_default_set[] = {
+static bt_property_t prop_emu_remote_ble_default_set[] = {
{ BT_PROPERTY_BDADDR, sizeof(emu_remote_bdaddr_val),
&emu_remote_bdaddr_val },
{ BT_PROPERTY_TYPE_OF_DEVICE, sizeof(emu_remote_tod_ble_val),
@@ -240,7 +240,7 @@ static bt_property_t prop_emu_remote_bles_default_set[] = {
&emu_remote_ble_rssi_val },
};
-static bt_property_t prop_emu_remotes_default_set[] = {
+static bt_property_t prop_emu_remote_bredr_default_set[] = {
{ BT_PROPERTY_BDADDR, sizeof(emu_remote_bdaddr_val),
&emu_remote_bdaddr_val },
{ BT_PROPERTY_TYPE_OF_DEVICE, sizeof(emu_remote_type_val),
@@ -648,7 +648,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
- CALLBACK_DEVICE_FOUND(prop_emu_remote_bles_default_set, 3),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_ble_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -996,7 +996,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
- CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -1019,7 +1019,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
- CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -1044,7 +1044,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
- CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -1068,7 +1068,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
- CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -1126,7 +1126,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
- CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -1152,7 +1152,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
- CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
--
2.14.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] android/tester: Fix race in discovering devices
2017-12-21 20:44 [PATCH 1/2] android/tester: Clarify default properties match names Szymon Janc
@ 2017-12-21 20:44 ` Szymon Janc
2017-12-22 9:27 ` [PATCH 1/2] android/tester: Clarify default properties match names Szymon Janc
1 sibling, 0 replies; 3+ messages in thread
From: Szymon Janc @ 2017-12-21 20:44 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
This makes sure that emulated device starts advertising only after
discovery is ongoing and that tests go further only after device
was found. Otherwise tests were randomly failing.
---
android/tester-bluetooth.c | 94 ++++++++++++++++++++++++-------------
android/tester-gatt.c | 112 +++++++++++++++++++++++++--------------------
2 files changed, 125 insertions(+), 81 deletions(-)
diff --git a/android/tester-bluetooth.c b/android/tester-bluetooth.c
index bab6dc952..b42a81db0 100644
--- a/android/tester-bluetooth.c
+++ b/android/tester-bluetooth.c
@@ -249,6 +249,11 @@ static bt_property_t prop_emu_remote_bredr_default_set[] = {
&emu_remote_rssi_val },
};
+static bt_property_t prop_emu_remote_any_default_set[] = {
+ { BT_PROPERTY_BDADDR, sizeof(emu_remote_bdaddr_val),
+ &emu_remote_bdaddr_val },
+};
+
static bt_property_t prop_emu_remote_bles_query_set[] = {
{ BT_PROPERTY_TYPE_OF_DEVICE, sizeof(emu_remote_tod_ble_val),
&emu_remote_tod_ble_val },
@@ -644,10 +649,10 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Discovery Device Found",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remote_ble_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
@@ -656,10 +661,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get Props - Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -670,10 +676,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get BDNAME - Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -684,10 +691,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get UUIDS - Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -698,10 +706,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get COD - Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -712,10 +721,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get TOD - Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -726,10 +736,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get RSSI - Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -740,10 +751,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get TIMESTAMP - Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -754,10 +766,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get BDADDR - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -767,10 +780,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get SCAN_MODE - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -780,10 +794,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get BONDED_DEVICES - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -793,10 +808,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get DISCOVERY_TIMEOUT - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -806,10 +822,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get VERSION_INFO - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -819,10 +836,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Get FRIENDLY_NAME - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -832,10 +850,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set FRIENDLY_NAME - Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -848,10 +867,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set BDNAME - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -861,10 +881,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set UUIDS - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -874,10 +895,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set COD - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -887,10 +909,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set TOD - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -900,10 +923,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set RSSI - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -913,10 +937,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set TIMESTAMP - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -926,10 +951,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set BDADDR - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -939,10 +965,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set SERVICE_RECORD - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -952,10 +979,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set SCAN_MODE - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -965,10 +993,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set BONDED_DEVICES - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -978,10 +1007,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Bluetooth Device Set DISCOVERY_TIMEOUT - Fail",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ CALLBACK_DEVICE_FOUND(prop_emu_remote_any_default_set, 1),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STOPPED),
@@ -991,11 +1021,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDR("Bluetooth Create Bond PIN - Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_pin_code_action, &emu_pin_set_req),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
@@ -1014,11 +1044,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDR("Bluetooth Create Bond PIN - Bad PIN",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_pin_code_action, &emu_pin_set_req),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
@@ -1038,12 +1068,12 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDR("Bluetooth Create Bond SSP -Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_io_cap, &display_yes_no_io_cap),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
@@ -1062,12 +1092,12 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDR("Bluetooth Create Bond SSP - Negative reply",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_io_cap, &display_yes_no_io_cap),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
@@ -1120,12 +1150,12 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDR("Bluetooth Cancel Bonding - Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_io_cap, &display_yes_no_io_cap),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
@@ -1146,12 +1176,12 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDR("Bluetooth Remove Bond - Success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_io_cap, &display_yes_no_io_cap),
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index 88be3d88b..6400a3f3e 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -1917,6 +1917,20 @@ static void init_notify_params_action(void)
schedule_action_verification(step);
}
+static void trigger_device_found(void *user_data)
+{
+ emu_setup_powered_remote_action();
+}
+
+static void delayemu_setup_powered_remote_action(void)
+{
+ /* Make sure discovery is enabled before enabling advertising.
+ * Unfortunately GATT HAL doesn't have discovering callback like
+ * Bluetooth HAL so we need to delay
+ */
+ tester_wait(1, trigger_device_found, NULL);
+}
+
static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Init",
ACTION_SUCCESS(dummy_action, NULL),
@@ -1936,11 +1950,11 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Client - Scan",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
@@ -1950,12 +1964,12 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Client - LE Connect",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
@@ -1969,12 +1983,12 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Client - LE Disconnect",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
@@ -1993,7 +2007,6 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Client - LE Multiple Client Conn./Disc.",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
@@ -2001,6 +2014,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(gatt_client_register_action, &app2_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2027,7 +2041,7 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Client - Listen and Disconnect",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(bt_set_property_action,
@@ -2055,7 +2069,7 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Client - Double Listen",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(bt_set_property_action,
@@ -2103,12 +2117,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, search_service),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2125,12 +2139,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, search_service_2),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2148,12 +2162,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, search_service_3),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2169,12 +2183,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, search_service_4),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2190,12 +2204,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, get_characteristic_1),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2215,12 +2229,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, get_characteristic_2),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2240,12 +2254,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, get_characteristic_1),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2266,12 +2280,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, get_descriptor_0),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2295,12 +2309,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, get_descriptor_1),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2324,12 +2338,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, get_descriptor_2),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2360,12 +2374,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, get_descriptor_3),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2389,12 +2403,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, get_included_0),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2414,12 +2428,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, get_included_1),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2439,12 +2453,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, get_included_2),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2464,12 +2478,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, get_included_3),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2490,12 +2504,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
ACTION_SUCCESS(init_read_params_action, &set_read_param_1),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2521,12 +2535,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
ACTION_SUCCESS(init_read_params_action, &set_read_param_2),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2551,12 +2565,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
ACTION_SUCCESS(init_read_params_action, &set_read_param_3),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2581,12 +2595,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_read_params_action, &set_read_param_4),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2615,12 +2629,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_read_params_action, &set_read_param_5),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2649,12 +2663,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_read_params_action, &set_read_param_6),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2683,12 +2697,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
ACTION_SUCCESS(init_write_params_action, &set_write_param_1),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2713,12 +2727,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
ACTION_SUCCESS(init_write_params_action, &set_write_param_1),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2743,12 +2757,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
ACTION_SUCCESS(init_write_params_action, &set_write_param_2),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2773,12 +2787,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
ACTION_SUCCESS(init_write_params_action, &set_write_param_3),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_FAIL(gatt_client_write_characteristic_action,
@@ -2792,12 +2806,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, notification_1),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2822,12 +2836,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, notification_1),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2858,12 +2872,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_notify_params_action, &set_notify_param_1),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2891,12 +2905,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_notify_params_action, &set_notify_param_2),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2924,12 +2938,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
ACTION_SUCCESS(init_write_params_action, &set_write_param_4),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2958,12 +2972,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
ACTION_SUCCESS(init_write_params_action, &set_write_param_6),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -2992,12 +3006,12 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
ACTION_SUCCESS(init_write_params_action, &set_write_param_5),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
+ ACTION_SUCCESS(delayemu_setup_powered_remote_action, NULL),
CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
@@ -3036,7 +3050,6 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Server - LE Connect",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
@@ -3044,6 +3057,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
@@ -3056,7 +3070,6 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Server - LE Disconnect",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
@@ -3064,6 +3077,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
@@ -3081,7 +3095,6 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Server - LE Multiple Server Conn./Disc",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
@@ -3091,6 +3104,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
@@ -3380,7 +3394,6 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, send_indication_1),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
@@ -3388,6 +3401,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
@@ -3405,7 +3419,6 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(init_pdus, send_notification_1),
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
@@ -3413,6 +3426,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
@@ -3429,7 +3443,6 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Server - Send Notification, wrong conn id",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
@@ -3437,6 +3450,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
@@ -3451,7 +3465,6 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Server - Send response to read char request",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
@@ -3473,6 +3486,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
@@ -3494,7 +3508,6 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Server - Send response to write char request",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
@@ -3516,6 +3529,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
@@ -3541,7 +3555,6 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Server - Find By Type - Attribute not found",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
@@ -3563,6 +3576,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
@@ -3582,7 +3596,6 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Server - Srvc change write req. success",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
@@ -3590,6 +3603,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
@@ -3614,7 +3628,6 @@ static struct test_case test_cases[] = {
TEST_CASE_BREDRLE("Gatt Server - Send error resp to write char request",
ACTION_SUCCESS(bluetooth_enable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
- ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
@@ -3636,6 +3649,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bt_start_discovery_action, NULL),
CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
BT_DISCOVERY_STARTED),
+ ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
--
2.14.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] android/tester: Clarify default properties match names
2017-12-21 20:44 [PATCH 1/2] android/tester: Clarify default properties match names Szymon Janc
2017-12-21 20:44 ` [PATCH 2/2] android/tester: Fix race in discovering devices Szymon Janc
@ 2017-12-22 9:27 ` Szymon Janc
1 sibling, 0 replies; 3+ messages in thread
From: Szymon Janc @ 2017-12-22 9:27 UTC (permalink / raw)
To: linux-bluetooth
On Thursday, 21 December 2017 21:44:12 CET Szymon Janc wrote:
> ---
> android/tester-bluetooth.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/android/tester-bluetooth.c b/android/tester-bluetooth.c
> index 22077a064..bab6dc952 100644
> --- a/android/tester-bluetooth.c
> +++ b/android/tester-bluetooth.c
> @@ -231,7 +231,7 @@ static bt_property_t prop_emu_default_set[] = {
> { BT_PROPERTY_UUIDS, sizeof(emu_uuids_val), &emu_uuids_val },
> };
>
> -static bt_property_t prop_emu_remote_bles_default_set[] = {
> +static bt_property_t prop_emu_remote_ble_default_set[] = {
> { BT_PROPERTY_BDADDR, sizeof(emu_remote_bdaddr_val),
> &emu_remote_bdaddr_val },
> { BT_PROPERTY_TYPE_OF_DEVICE, sizeof(emu_remote_tod_ble_val),
> @@ -240,7 +240,7 @@ static bt_property_t prop_emu_remote_bles_default_set[]
> = { &emu_remote_ble_rssi_val },
> };
>
> -static bt_property_t prop_emu_remotes_default_set[] = {
> +static bt_property_t prop_emu_remote_bredr_default_set[] = {
> { BT_PROPERTY_BDADDR, sizeof(emu_remote_bdaddr_val),
> &emu_remote_bdaddr_val },
> { BT_PROPERTY_TYPE_OF_DEVICE, sizeof(emu_remote_type_val),
> @@ -648,7 +648,7 @@ static struct test_case test_cases[] = {
> ACTION_SUCCESS(bt_start_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STARTED),
> - CALLBACK_DEVICE_FOUND(prop_emu_remote_bles_default_set, 3),
> + CALLBACK_DEVICE_FOUND(prop_emu_remote_ble_default_set, 3),
> ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STOPPED),
> @@ -996,7 +996,7 @@ static struct test_case test_cases[] = {
> ACTION_SUCCESS(bt_start_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STARTED),
> - CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
> + CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
> ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STOPPED),
> @@ -1019,7 +1019,7 @@ static struct test_case test_cases[] = {
> ACTION_SUCCESS(bt_start_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STARTED),
> - CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
> + CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
> ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STOPPED),
> @@ -1044,7 +1044,7 @@ static struct test_case test_cases[] = {
> ACTION_SUCCESS(bt_start_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STARTED),
> - CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
> + CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
> ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STOPPED),
> @@ -1068,7 +1068,7 @@ static struct test_case test_cases[] = {
> ACTION_SUCCESS(bt_start_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STARTED),
> - CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
> + CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
> ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STOPPED),
> @@ -1126,7 +1126,7 @@ static struct test_case test_cases[] = {
> ACTION_SUCCESS(bt_start_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STARTED),
> - CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
> + CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
> ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STOPPED),
> @@ -1152,7 +1152,7 @@ static struct test_case test_cases[] = {
> ACTION_SUCCESS(bt_start_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STARTED),
> - CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 3),
> + CALLBACK_DEVICE_FOUND(prop_emu_remote_bredr_default_set, 3),
> ACTION_SUCCESS(bt_cancel_discovery_action, NULL),
> CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
> BT_DISCOVERY_STOPPED),
Applied.
--
pozdrawiam
Szymon Janc
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-22 9:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-21 20:44 [PATCH 1/2] android/tester: Clarify default properties match names Szymon Janc
2017-12-21 20:44 ` [PATCH 2/2] android/tester: Fix race in discovering devices Szymon Janc
2017-12-22 9:27 ` [PATCH 1/2] android/tester: Clarify default properties match names Szymon Janc
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.