Execute generic HIDHost connection_state_cb in tester's main loop. --- android/android-tester.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/android/android-tester.c b/android/android-tester.c index 0115943..664f381 100644 --- a/android/android-tester.c +++ b/android/android-tester.c @@ -3212,19 +3212,34 @@ clean: close(sock_fd); } -static void hidhost_connection_state_cb(bt_bdaddr_t *bd_addr, - bthh_connection_state_t state) +static gboolean hidhost_connection_state(gpointer user_data) { struct test_data *data = tester_get_data(); const struct hidhost_generic_data *test = data->test_data; + struct generic_cb_data *cb_data = user_data; data->cb_count++; - if (state == BTHH_CONN_STATE_CONNECTED) + if ((int) cb_data->state == BTHH_CONN_STATE_CONNECTED) tester_setup_complete(); if (test && test->expected_hal_cb.connection_state_cb) - test->expected_hal_cb.connection_state_cb(bd_addr, state); + test->expected_hal_cb.connection_state_cb(&cb_data->bdaddr, + cb_data->state); + + g_free(cb_data); + return FALSE; +} + +static void hidhost_connection_state_cb(bt_bdaddr_t *bd_addr, + bthh_connection_state_t state) +{ + struct generic_cb_data *cb_data = g_new0(struct generic_cb_data, 1); + + cb_data->state = state; + cb_data->bdaddr = *bd_addr; + + g_idle_add(hidhost_connection_state, cb_data); } static void hidhost_virual_unplug_cb(bt_bdaddr_t *bd_addr, bthh_status_t status) -- 1.8.5.2 -- 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