* [PATCH v2 2/6] android/tester: Fix debug callback logs
2014-10-03 8:44 [PATCH v2 1/6] android/tester: Make client2 app uuid value name consistent Grzegorz Kolodziejczyk
@ 2014-10-03 8:44 ` Grzegorz Kolodziejczyk
2014-10-03 8:44 ` [PATCH v2 3/6] android/tester: Change GATT client connection test cases to LE connect Grzegorz Kolodziejczyk
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Grzegorz Kolodziejczyk @ 2014-10-03 8:44 UTC (permalink / raw)
To: linux-bluetooth
Debug logs for callback should also print logs if callback is not
expected. Additional value in callback enum is added (BT_CB_NONE).
---
android/tester-main.c | 1 +
android/tester-main.h | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/android/tester-main.c b/android/tester-main.c
index fe452f8..08324a4 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -33,6 +33,7 @@ static struct {
uint16_t cb_num;
const char *str;
} cb_table[] = {
+ DBG_CB(CB_BT_NONE),
DBG_CB(CB_BT_ADAPTER_STATE_CHANGED),
DBG_CB(CB_BT_ADAPTER_PROPERTIES),
DBG_CB(CB_BT_REMOTE_DEVICE_PROPERTIES),
diff --git a/android/tester-main.h b/android/tester-main.h
index 57b7508..c02b372 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -320,7 +320,8 @@ struct pdu_set {
* updated while adding new HAL to tester.
*/
typedef enum {
- CB_BT_ADAPTER_STATE_CHANGED = 1,
+ CB_BT_NONE,
+ CB_BT_ADAPTER_STATE_CHANGED,
CB_BT_ADAPTER_PROPERTIES,
CB_BT_REMOTE_DEVICE_PROPERTIES,
CB_BT_DEVICE_FOUND,
--
1.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 3/6] android/tester: Change GATT client connection test cases to LE connect
2014-10-03 8:44 [PATCH v2 1/6] android/tester: Make client2 app uuid value name consistent Grzegorz Kolodziejczyk
2014-10-03 8:44 ` [PATCH v2 2/6] android/tester: Fix debug callback logs Grzegorz Kolodziejczyk
@ 2014-10-03 8:44 ` Grzegorz Kolodziejczyk
2014-10-03 8:44 ` [PATCH v2 4/6] android/tester: Add GATT server connect successful test case Grzegorz Kolodziejczyk
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Grzegorz Kolodziejczyk @ 2014-10-03 8:44 UTC (permalink / raw)
To: linux-bluetooth
Current GATT client connect test cases don't check if found device is
BLE type. Now it's updated with check step (device found callback
analyze for device type).
---
android/tester-gatt.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index 4326749..b53a61a 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -109,10 +109,18 @@ struct notif_data {
static bt_bdaddr_t emu_remote_bdaddr_val = {
.address = { 0x00, 0xaa, 0x01, 0x01, 0x00, 0x00 },
};
+static bt_device_type_t emu_remote_ble_device_type = BT_DEVICE_DEVTYPE_BLE;
+
static bt_property_t prop_emu_remotes_default_set[] = {
{ BT_PROPERTY_BDADDR, sizeof(emu_remote_bdaddr_val),
&emu_remote_bdaddr_val },
};
+static bt_property_t prop_emu_remotes_default_le_set[] = {
+ { BT_PROPERTY_BDADDR, sizeof(emu_remote_bdaddr_val),
+ &emu_remote_bdaddr_val },
+ { BT_PROPERTY_TYPE_OF_DEVICE, sizeof(bt_device_type_t),
+ &emu_remote_ble_device_type },
+};
static bt_scan_mode_t setprop_scan_mode_conn_val =
BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE;
@@ -1204,13 +1212,14 @@ static struct test_case test_cases[] = {
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action,
INT_TO_PTR(APP1_ID)),
+ 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,
INT_TO_PTR(APP1_ID)),
ACTION_SUCCESS(bluetooth_disable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
),
- TEST_CASE_BREDRLE("Gatt Client - Connect",
+ 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),
@@ -1220,6 +1229,7 @@ static struct test_case test_cases[] = {
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action,
INT_TO_PTR(APP1_ID)),
+ 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,
INT_TO_PTR(APP1_ID)),
@@ -1230,7 +1240,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_disable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
),
- TEST_CASE_BREDRLE("Gatt Client - Disconnect",
+ 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),
@@ -1240,6 +1250,7 @@ static struct test_case test_cases[] = {
CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
ACTION_SUCCESS(gatt_client_start_scan_action,
INT_TO_PTR(APP1_ID)),
+ 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,
INT_TO_PTR(APP1_ID)),
@@ -1255,7 +1266,7 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_disable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
),
- TEST_CASE_BREDRLE("Gatt Client - Multiple Client Conn./Disc.",
+ 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),
--
1.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 4/6] android/tester: Add GATT server connect successful test case
2014-10-03 8:44 [PATCH v2 1/6] android/tester: Make client2 app uuid value name consistent Grzegorz Kolodziejczyk
2014-10-03 8:44 ` [PATCH v2 2/6] android/tester: Fix debug callback logs Grzegorz Kolodziejczyk
2014-10-03 8:44 ` [PATCH v2 3/6] android/tester: Change GATT client connection test cases to LE connect Grzegorz Kolodziejczyk
@ 2014-10-03 8:44 ` Grzegorz Kolodziejczyk
2014-10-03 8:44 ` [PATCH v2 5/6] android/tester: Add GATT server disconnect " Grzegorz Kolodziejczyk
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Grzegorz Kolodziejczyk @ 2014-10-03 8:44 UTC (permalink / raw)
To: linux-bluetooth
It will connect to powered on and visible device.
---
android/tester-gatt.c | 38 ++++++++++++++++++++++++++++++++++++++
android/tester-main.c | 33 ++++++++++++++++++++++++++++++++-
android/tester-main.h | 10 ++++++++++
3 files changed, 80 insertions(+), 1 deletion(-)
diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index b53a61a..eedbf56 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -28,6 +28,9 @@
#define GATT_STATUS_FAILURE 0x00000101
#define GATT_STATUS_INS_AUTH 0x08
+#define GATT_SERVER_DISCONNECTED 0
+#define GATT_SERVER_CONNECTED 1
+
#define APP1_ID 1
#define APP2_ID 2
@@ -970,6 +973,21 @@ static void gatt_server_unregister_action(void)
schedule_action_verification(step);
}
+static void gatt_server_connect_action(void)
+{
+ struct test_data *data = tester_get_data();
+ struct step *current_data_step = queue_peek_head(data->steps);
+ struct gatt_connect_data *conn_data = current_data_step->set_data;
+ struct step *step = g_new0(struct step, 1);
+
+ step->action_status = data->if_gatt->server->connect(
+ conn_data->app_id,
+ &emu_remote_bdaddr_val,
+ 0);
+
+ schedule_action_verification(step);
+}
+
static void gatt_cid_hook_cb(const void *data, uint16_t len, void *user_data)
{
struct test_data *t_data = tester_get_data();
@@ -2160,6 +2178,26 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
CALLBACK_STATUS(CB_GATTS_REGISTER_SERVER, BT_STATUS_SUCCESS),
),
+ 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),
+ CALLBACK_STATUS(CB_GATTS_REGISTER_SERVER, BT_STATUS_SUCCESS),
+ ACTION_SUCCESS(bt_start_discovery_action, NULL),
+ CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
+ BT_DISCOVERY_STARTED),
+ 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),
+ CALLBACK_GATTS_CONNECTION(GATT_SERVER_CONNECTED,
+ prop_emu_remotes_default_set,
+ CONN1_ID, APP1_ID),
+ ACTION_SUCCESS(bluetooth_disable_action, NULL),
+ CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
+ ),
};
struct queue *get_gatt_tests(void)
diff --git a/android/tester-main.c b/android/tester-main.c
index 08324a4..ddae668 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -736,6 +736,14 @@ static bool match_data(struct step *step)
}
}
+ if (exp->callback_result.connected !=
+ step->callback_result.connected) {
+ tester_debug("Gatt server conn status mismatch: %d vs %d",
+ step->callback_result.connected,
+ exp->callback_result.connected);
+ return false;
+ }
+
return true;
}
@@ -1420,6 +1428,29 @@ static void gatts_register_server_cb(int status, int server_if,
schedule_callback_call(step);
}
+static void gatts_connection_cb(int conn_id, int server_if, int connected,
+ bt_bdaddr_t *bda)
+{
+ struct step *step = g_new0(struct step, 1);
+ bt_property_t *props[1];
+
+ step->callback = CB_GATTS_CONNECTION;
+ step->callback_result.conn_id = conn_id;
+ step->callback_result.gatt_app_id = server_if;
+ step->callback_result.connected = connected;
+
+ /* Utilize property verification mechanism for bdaddr */
+ props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda));
+
+ step->callback_result.num_properties = 1;
+ step->callback_result.properties = repack_properties(1, props);
+
+ g_free(props[0]->val);
+ g_free(props[0]);
+
+ schedule_callback_call(step);
+}
+
static void pan_control_state_cb(btpan_control_state_t state,
bt_status_t error, int local_role,
const char *ifname)
@@ -1542,7 +1573,7 @@ static const btgatt_client_callbacks_t btgatt_client_callbacks = {
static const btgatt_server_callbacks_t btgatt_server_callbacks = {
.register_server_cb = gatts_register_server_cb,
- .connection_cb = NULL,
+ .connection_cb = gatts_connection_cb,
.service_added_cb = NULL,
.included_service_added_cb = NULL,
.characteristic_added_cb = NULL,
diff --git a/android/tester-main.h b/android/tester-main.h
index c02b372..a343589 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -243,6 +243,15 @@ struct pdu_set {
.callback_result.gatt_app_id = cb_client_id, \
}
+#define CALLBACK_GATTS_CONNECTION(cb_res, cb_prop, cb_conn_id, cb_server_id) { \
+ .callback = CB_GATTS_CONNECTION, \
+ .callback_result.connected = cb_res, \
+ .callback_result.properties = cb_prop, \
+ .callback_result.num_properties = 1, \
+ .callback_result.conn_id = cb_conn_id, \
+ .callback_result.gatt_app_id = cb_server_id, \
+ }
+
#define CALLBACK_PAN_CTRL_STATE(cb, cb_res, cb_state, cb_local_role) { \
.callback = cb, \
.callback_result.status = cb_res, \
@@ -484,6 +493,7 @@ struct bt_callback_data {
int gatt_app_id;
int conn_id;
+ int connected;
btgatt_srvc_id_t *service;
btgatt_gatt_id_t *characteristic;
btgatt_gatt_id_t *descriptor;
--
1.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 5/6] android/tester: Add GATT server disconnect successful test case
2014-10-03 8:44 [PATCH v2 1/6] android/tester: Make client2 app uuid value name consistent Grzegorz Kolodziejczyk
` (2 preceding siblings ...)
2014-10-03 8:44 ` [PATCH v2 4/6] android/tester: Add GATT server connect successful test case Grzegorz Kolodziejczyk
@ 2014-10-03 8:44 ` Grzegorz Kolodziejczyk
2014-10-03 8:44 ` [PATCH v2 6/6] android/tester: Add GATT server multiple connect succesful " Grzegorz Kolodziejczyk
2014-10-06 11:11 ` [PATCH v2 1/6] android/tester: Make client2 app uuid value name consistent Szymon Janc
5 siblings, 0 replies; 7+ messages in thread
From: Grzegorz Kolodziejczyk @ 2014-10-03 8:44 UTC (permalink / raw)
To: linux-bluetooth
It will connect to powered on and visible device then disconnect.
---
android/tester-gatt.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index eedbf56..f7f7417 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -988,6 +988,21 @@ static void gatt_server_connect_action(void)
schedule_action_verification(step);
}
+static void gatt_server_disconnect_action(void)
+{
+ struct test_data *data = tester_get_data();
+ struct step *current_data_step = queue_peek_head(data->steps);
+ struct gatt_connect_data *conn_data = current_data_step->set_data;
+ struct step *step = g_new0(struct step, 1);
+
+ step->action_status = data->if_gatt->server->disconnect(
+ conn_data->app_id,
+ &emu_remote_bdaddr_val,
+ conn_data->conn_id);
+
+ schedule_action_verification(step);
+}
+
static void gatt_cid_hook_cb(const void *data, uint16_t len, void *user_data)
{
struct test_data *t_data = tester_get_data();
@@ -2198,6 +2213,31 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_disable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
),
+ 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),
+ CALLBACK_STATUS(CB_GATTS_REGISTER_SERVER, BT_STATUS_SUCCESS),
+ ACTION_SUCCESS(bt_start_discovery_action, NULL),
+ CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
+ BT_DISCOVERY_STARTED),
+ 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),
+ CALLBACK_GATTS_CONNECTION(GATT_SERVER_CONNECTED,
+ prop_emu_remotes_default_set,
+ CONN1_ID, APP1_ID),
+ ACTION_SUCCESS(gatt_server_disconnect_action,
+ &app1_conn_req),
+ CALLBACK_GATTS_CONNECTION(GATT_SERVER_DISCONNECTED,
+ prop_emu_remotes_default_set,
+ CONN1_ID, APP1_ID),
+ ACTION_SUCCESS(bluetooth_disable_action, NULL),
+ CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
+ ),
};
struct queue *get_gatt_tests(void)
--
1.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 6/6] android/tester: Add GATT server multiple connect succesful test case
2014-10-03 8:44 [PATCH v2 1/6] android/tester: Make client2 app uuid value name consistent Grzegorz Kolodziejczyk
` (3 preceding siblings ...)
2014-10-03 8:44 ` [PATCH v2 5/6] android/tester: Add GATT server disconnect " Grzegorz Kolodziejczyk
@ 2014-10-03 8:44 ` Grzegorz Kolodziejczyk
2014-10-06 11:11 ` [PATCH v2 1/6] android/tester: Make client2 app uuid value name consistent Szymon Janc
5 siblings, 0 replies; 7+ messages in thread
From: Grzegorz Kolodziejczyk @ 2014-10-03 8:44 UTC (permalink / raw)
To: linux-bluetooth
It will connect to powered on and visible device multiple time then
disconnects.
---
android/tester-gatt.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index f7f7417..6827995 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -2238,6 +2238,40 @@ static struct test_case test_cases[] = {
ACTION_SUCCESS(bluetooth_disable_action, NULL),
CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
),
+ 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),
+ CALLBACK_STATUS(CB_GATTS_REGISTER_SERVER, BT_STATUS_SUCCESS),
+ ACTION_SUCCESS(gatt_server_register_action, &app2_uuid),
+ CALLBACK_STATUS(CB_GATTS_REGISTER_SERVER, BT_STATUS_SUCCESS),
+ ACTION_SUCCESS(bt_start_discovery_action, NULL),
+ CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
+ BT_DISCOVERY_STARTED),
+ 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),
+ CALLBACK_GATTS_CONNECTION(GATT_SERVER_CONNECTED,
+ prop_emu_remotes_default_set,
+ CONN1_ID, APP1_ID),
+ ACTION_SUCCESS(gatt_server_connect_action, &app2_conn_req),
+ CALLBACK_GATTS_CONNECTION(GATT_SERVER_CONNECTED,
+ prop_emu_remotes_default_set,
+ CONN2_ID, APP2_ID),
+ ACTION_SUCCESS(gatt_server_disconnect_action, &app2_conn_req),
+ CALLBACK_GATTS_CONNECTION(GATT_SERVER_DISCONNECTED,
+ prop_emu_remotes_default_set,
+ CONN2_ID, APP2_ID),
+ ACTION_SUCCESS(gatt_server_disconnect_action, &app1_conn_req),
+ CALLBACK_GATTS_CONNECTION(GATT_SERVER_DISCONNECTED,
+ prop_emu_remotes_default_set,
+ CONN1_ID, APP1_ID),
+ ACTION_SUCCESS(bluetooth_disable_action, NULL),
+ CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
+ ),
};
struct queue *get_gatt_tests(void)
--
1.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 1/6] android/tester: Make client2 app uuid value name consistent
2014-10-03 8:44 [PATCH v2 1/6] android/tester: Make client2 app uuid value name consistent Grzegorz Kolodziejczyk
` (4 preceding siblings ...)
2014-10-03 8:44 ` [PATCH v2 6/6] android/tester: Add GATT server multiple connect succesful " Grzegorz Kolodziejczyk
@ 2014-10-06 11:11 ` Szymon Janc
5 siblings, 0 replies; 7+ messages in thread
From: Szymon Janc @ 2014-10-06 11:11 UTC (permalink / raw)
To: Grzegorz Kolodziejczyk; +Cc: linux-bluetooth
Hi Grzegorz,
On Friday 03 of October 2014 10:44:47 Grzegorz Kolodziejczyk wrote:
> Application uudis for tester should be name unified and consistent.
> ---
> android/tester-gatt.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/android/tester-gatt.c b/android/tester-gatt.c
> index 4c9eba5..4326749 100644
> --- a/android/tester-gatt.c
> +++ b/android/tester-gatt.c
> @@ -41,6 +41,11 @@ static bt_uuid_t app1_uuid = {
> 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
> };
>
> +static bt_uuid_t app2_uuid = {
> + .uu = { 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
> + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02 },
> +};
> +
> struct gatt_connect_data {
> const int app_id;
> const int conn_id;
> @@ -101,11 +106,6 @@ struct notif_data {
> btgatt_gatt_id_t *charac;
> };
>
> -static bt_uuid_t client2_app_uuid = {
> - .uu = { 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
> - 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02 },
> -};
> -
> static bt_bdaddr_t emu_remote_bdaddr_val = {
> .address = { 0x00, 0xaa, 0x01, 0x01, 0x00, 0x00 },
> };
> @@ -1263,7 +1263,7 @@ static struct test_case test_cases[] = {
> 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_register_action, &client2_app_uuid),
> + ACTION_SUCCESS(gatt_client_register_action, &app2_uuid),
> CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
> ACTION_SUCCESS(gatt_client_start_scan_action,
> INT_TO_PTR(APP1_ID)),
>
All patches applied, thanks.
--
Best regards,
Szymon Janc
^ permalink raw reply [flat|nested] 7+ messages in thread