From 919ef7d0996db6c9335dd179ba94f57fc1f4fb76 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 21 Oct 2013 15:18:47 +0300 Subject: [PATCH] tools/mgmt-tester: Remove unnecessary "no-BR/EDR" setup helpers --- tools/mgmt-tester.c | 49 +++++---------------------------------------- 1 file changed, 5 insertions(+), 44 deletions(-) diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c index 029db772a..4789692a3 100644 --- a/tools/mgmt-tester.c +++ b/tools/mgmt-tester.c @@ -1194,6 +1194,7 @@ static const struct generic_data set_bredr_off_success_test_1 = { static const struct generic_data set_bredr_on_success_test_1 = { .setup_settings = settings_le, + .setup_nobredr = true, .send_opcode = MGMT_OP_SET_BREDR, .send_param = set_bredr_on_param, .send_len = sizeof(set_bredr_on_param), @@ -1204,7 +1205,8 @@ static const struct generic_data set_bredr_on_success_test_1 = { }; static const struct generic_data set_bredr_on_success_test_2 = { - .setup_settings = settings_le, + .setup_settings = settings_powered_le, + .setup_nobredr = true, .send_opcode = MGMT_OP_SET_BREDR, .send_param = set_bredr_on_param, .send_len = sizeof(set_bredr_on_param), @@ -2042,22 +2044,6 @@ static void setup_class(const void *test_data) setup_powered_callback, NULL, NULL); } -static void setup_nobr_powered(const void *test_data) -{ - struct test_data *data = tester_get_data(); - unsigned char on[] = { 0x01 }; - unsigned char off[] = { 0x00 }; - - tester_print("Powering on controller (with LE enabled)"); - - mgmt_send(data->mgmt, MGMT_OP_SET_BREDR, data->mgmt_index, - sizeof(off), off, NULL, NULL, NULL); - - mgmt_send(data->mgmt, MGMT_OP_SET_POWERED, data->mgmt_index, - sizeof(on), on, - setup_powered_callback, NULL, NULL); -} - static void setup_discovery_callback(uint8_t status, uint16_t length, const void *param, void *user_data) { @@ -2123,31 +2109,6 @@ static void setup_start_discovery(const void *test_data) } } -static void setup_nobr_callback(uint8_t status, uint16_t length, - const void *param, void *user_data) -{ - if (status != MGMT_STATUS_SUCCESS) { - tester_setup_failed(); - return; - } - - tester_print("BR/EDR disabled"); - - tester_setup_complete(); -} - -static void setup_nobr(const void *test_data) -{ - struct test_data *data = tester_get_data(); - unsigned char off[] = { 0x00 }; - - tester_print("Disabling BR/EDR"); - - mgmt_send(data->mgmt, MGMT_OP_SET_BREDR, data->mgmt_index, - sizeof(off), off, setup_nobr_callback, - NULL, NULL); -} - static void setup_multi_uuid32(const void *test_data) { struct test_data *data = tester_get_data(); @@ -2841,10 +2802,10 @@ int main(int argc, char *argv[]) NULL, test_command_generic); test_bredrle("Set BR/EDR on - Success 1", &set_bredr_on_success_test_1, - setup_nobr, test_command_generic); + NULL, test_command_generic); test_bredrle("Set BR/EDR on - Success 2", &set_bredr_on_success_test_2, - setup_nobr_powered, test_command_generic); + NULL, test_command_generic); test_bredr("Set BR/EDR off - Not Supported 1", &set_bredr_off_notsupp_test, NULL, test_command_generic); -- 2.47.3