From 483cd7ad54c1e79417481bfa926f9ac69dbdbbdc Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 21 Oct 2013 10:58:02 +0300 Subject: [PATCH] tools/mgmt-tester: Remove (now) unnecessary powered delay option --- tools/mgmt-tester.c | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c index 8327e49e1..619fe4d95 100644 --- a/tools/mgmt-tester.c +++ b/tools/mgmt-tester.c @@ -38,8 +38,6 @@ #include "src/shared/mgmt.h" #include "src/shared/hciemu.h" -static gboolean option_wait_powered = FALSE; - struct test_data { const void *test_data; uint8_t expected_version; @@ -1919,11 +1917,6 @@ static const struct generic_data set_scan_params_success_test = { .expect_status = MGMT_STATUS_SUCCESS, }; -static void powered_delay(void *user_data) -{ - tester_setup_complete(); -} - static void setup_powered_callback(uint8_t status, uint16_t length, const void *param, void *user_data) { @@ -1934,10 +1927,7 @@ static void setup_powered_callback(uint8_t status, uint16_t length, tester_print("Controller powered on"); - if (option_wait_powered) - tester_wait(1, powered_delay, NULL); - else - tester_setup_complete(); + tester_setup_complete(); } static void setup_powered_discoverable(const void *test_data) @@ -2113,9 +2103,6 @@ static void setup_start_discovery_callback(uint8_t status, uint16_t length, sizeof(disc_param), disc_param, setup_discovery_callback, NULL, NULL); } - - if (option_wait_powered) - tester_wait(1, NULL, NULL); } static void setup_start_discovery(const void *test_data) @@ -2652,32 +2639,8 @@ static void test_command_generic(const void *test_data) test_add_condition(data); } -static GOptionEntry options[] = { - { "wait-powered", 'P', 0, G_OPTION_ARG_NONE, &option_wait_powered, - "Add a delay after powering on" }, - { NULL }, -}; - int main(int argc, char *argv[]) { - GOptionContext *context; - GError *error = NULL; - - context = g_option_context_new(NULL); - g_option_context_add_main_entries(context, options, NULL); - g_option_context_set_ignore_unknown_options(context, TRUE); - - if (g_option_context_parse(context, &argc, &argv, &error) == FALSE) { - if (error != NULL) { - g_printerr("%s\n", error->message); - g_error_free(error); - } else - g_printerr("An unknown error occurred\n"); - exit(1); - } - - g_option_context_free(context); - tester_init(&argc, &argv); test_bredrle("Controller setup", -- 2.47.3