Return-Path: From: Lukasz Rymanowski To: CC: Lukasz Rymanowski Subject: [PATCH v2 06/10] android/tester: Fix handling inquiry by android tester Date: Mon, 10 Mar 2014 00:05:59 +0100 Message-ID: <1394406363-6751-7-git-send-email-lukasz.rymanowski@tieto.com> In-Reply-To: <1394406363-6751-1-git-send-email-lukasz.rymanowski@tieto.com> References: <1394406363-6751-1-git-send-email-lukasz.rymanowski@tieto.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Previously btdev sent inquiry_complete in one mainloop iteration. Due to new way of handling it we need to make sure cancel_discovery is called if start_discovery has been used. There is also no need to hook before inquiry_complete_event in case of test for cancel_discovery. Conflicts: android/android-tester.c --- android/android-tester.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/android/android-tester.c b/android/android-tester.c index b762a2d..7cab79c 100644 --- a/android/android-tester.c +++ b/android/android-tester.c @@ -940,10 +940,13 @@ static void discovery_device_found_cb(int num_properties, } if (!check_test_property(received_prop, expected_prop)) { + data->if_bluetooth->cancel_discovery(); tester_test_failed(); return; } } + + data->if_bluetooth->cancel_discovery(); } static void remote_getprops_device_found_cb(int num_properties, @@ -958,6 +961,7 @@ static void remote_getprops_device_found_cb(int num_properties, if (data->cb_count == 2) data->cb_count--; + data->if_bluetooth->cancel_discovery(); data->if_bluetooth->get_remote_device_properties(&remote_addr); } @@ -977,6 +981,7 @@ static void remote_get_property_device_found_cb(int num_properties, if (data->cb_count == 2) data->cb_count--; + data->if_bluetooth->cancel_discovery(); status = data->if_bluetooth->get_remote_device_property(&remote_addr, prop.type); check_expected_status(status); @@ -998,6 +1003,7 @@ static void remote_setprop_device_found_cb(int num_properties, if (data->cb_count == 3) data->cb_count--; + data->if_bluetooth->cancel_discovery(); status = data->if_bluetooth->set_remote_device_property(&remote_addr, &prop); check_expected_status(status); @@ -1019,6 +1025,7 @@ static void remote_setprop_fail_device_found_cb(int num_properties, if (data->cb_count == 2) data->cb_count--; + data->if_bluetooth->cancel_discovery(); status = data->if_bluetooth->set_remote_device_property(&remote_addr, &prop); check_expected_status(status); @@ -2965,26 +2972,12 @@ static void test_discovery_stop_done(const void *test_data) check_expected_status(status); } -static bool pre_inq_compl_hook(const void *dummy, uint16_t len, void *user_data) -{ - struct test_data *data = tester_get_data(); - - /* Make sure Inquiry Command Complete is not called */ - - hciemu_del_hook(data->hciemu, HCIEMU_HOOK_PRE_EVT, BT_HCI_CMD_INQUIRY); - - return false; -} - static void test_discovery_stop_success(const void *test_data) { struct test_data *data = tester_get_data(); init_test_conditions(data); - hciemu_add_hook(data->hciemu, HCIEMU_HOOK_PRE_EVT, BT_HCI_CMD_INQUIRY, - pre_inq_compl_hook, data); - data->if_bluetooth->start_discovery(); } @@ -2994,9 +2987,6 @@ static void test_discovery_start_done(const void *test_data) init_test_conditions(data); - hciemu_add_hook(data->hciemu, HCIEMU_HOOK_PRE_EVT, BT_HCI_CMD_INQUIRY, - pre_inq_compl_hook, data); - data->if_bluetooth->start_discovery(); } -- 1.8.4