--- android/tester-hidhost.c | 43 +++++++++++++++++++++++++++++++++++++++++++ android/tester-main.c | 12 +++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/android/tester-hidhost.c b/android/tester-hidhost.c index 8fb5df7..ac58636 100644 --- a/android/tester-hidhost.c +++ b/android/tester-hidhost.c @@ -318,6 +318,20 @@ static void hidhost_disconnect_action(void) schedule_action_verification(step); } +static void hidhost_virtual_unplug_action(void) +{ + struct test_data *data = tester_get_data(); + const uint8_t *hid_addr = hciemu_get_client_bdaddr(data->hciemu); + struct step *step = g_new0(struct step, 1); + bt_bdaddr_t bdaddr; + + bdaddr2android((const bdaddr_t *) hid_addr, &bdaddr); + + step->action_status = data->if_hid->virtual_unplug(&bdaddr); + + schedule_action_verification(step); +} + static struct test_case test_cases[] = { TEST_CASE_BREDRLE("HidHost Init", ACTION_SUCCESS(dummy_action, NULL), @@ -377,6 +391,35 @@ static struct test_case test_cases[] = { CALLBACK_STATE(CB_HH_CONNECTION_STATE, BTHH_CONN_STATE_DISCONNECTED), ), + TEST_CASE_BREDRLE("HidHost VirtualUnplug 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_add_l2cap_server_action, + &l2cap_setup_sdp_data), + ACTION_SUCCESS(emu_add_l2cap_server_action, + &l2cap_setup_cc_data), + ACTION_SUCCESS(emu_add_l2cap_server_action, + &l2cap_setup_ic_data), + ACTION_SUCCESS(hidhost_connect_action, NULL), + CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_set, 1), + CALLBACK_BOND_STATE(BT_BOND_STATE_BONDING, + &prop_emu_remote_bdadr, 1), + CALLBACK_SSP_REQ(BT_SSP_VARIANT_PASSKEY_CONFIRMATION, + prop_emu_remotes_pin_req_set, 1), + ACTION_SUCCESS(bt_ssp_reply_accept_action, + &ssp_confirm_accept_reply), + CALLBACK_BOND_STATE(BT_BOND_STATE_BONDED, + &prop_emu_remote_bdadr, 1), + CALLBACK_STATE(CB_HH_CONNECTION_STATE, + BTHH_CONN_STATE_CONNECTED), + ACTION_SUCCESS(hidhost_virtual_unplug_action, NULL), + CALLBACK_STATE(CB_HH_CONNECTION_STATE, + BTHH_CONN_STATE_DISCONNECTING), + CALLBACK_STATE(CB_HH_CONNECTION_STATE, + BTHH_CONN_STATE_DISCONNECTED), + ), }; struct queue *get_hidhost_tests(void) diff --git a/android/tester-main.c b/android/tester-main.c index 9eb10c7..4a7f2cd 100644 --- a/android/tester-main.c +++ b/android/tester-main.c @@ -781,6 +781,16 @@ static void hidhost_connection_state_cb(bt_bdaddr_t *bd_addr, schedule_callback_call(step); } +static void hidhost_virual_unplug_cb(bt_bdaddr_t *bd_addr, bthh_status_t status) +{ + struct step *step = g_new0(struct step, 1); + + step->callback = CB_HH_VIRTUAL_UNPLUG; + step->callback_result.status = status; + + schedule_callback_call(step); +} + static bthh_callbacks_t bthh_callbacks = { .size = sizeof(bthh_callbacks), .connection_state_cb = hidhost_connection_state_cb, @@ -788,7 +798,7 @@ static bthh_callbacks_t bthh_callbacks = { .protocol_mode_cb = NULL, .idle_time_cb = NULL, .get_report_cb = NULL, - .virtual_unplug_cb = NULL + .virtual_unplug_cb = hidhost_virual_unplug_cb }; static const btgatt_client_callbacks_t btgatt_client_callbacks = { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html