[rdkb][common][app][Refactor test tool relaod flow]
[Description]
Refactor test tool relaod flow. Saving time for applying the uci config.
1. Remove enable the radio at the start.
2. Move down some settinsg after applying the paramaters and the radio is up.
[Release-log]
N/A
Change-Id: Id257b2dade5a39e66b4986d6bfe07189ec1a6493
diff --git a/recipes-connectivity/wifi-test-tool/files/src/wifi-test-tool.c b/recipes-connectivity/wifi-test-tool/files/src/wifi-test-tool.c
index eb43b8d..9ac42a2 100644
--- a/recipes-connectivity/wifi-test-tool/files/src/wifi-test-tool.c
+++ b/recipes-connectivity/wifi-test-tool/files/src/wifi-test-tool.c
@@ -258,32 +258,6 @@
fprintf(stderr, "Start setting radio\n");
- wifi_setRadioEnable(radio_parameter.radio_index, TRUE);
- sleep(1);
-
- // Country
- fprintf(stderr, "Set Country: %s\n", radio_parameter.country);
- ret = wifi_setRadioCountryCode(radio_parameter.radio_index, radio_parameter.country);
- if (ret != RETURN_OK)
- fprintf(stderr, "[Set Country failed!!!]\n");
- ret = 0;
-
- // hwmode
- fprintf(stderr, "Set hwmode: %s\n", radio_parameter.hwmode);
- ret = wifi_setRadioHwMode(radio_parameter.radio_index, radio_parameter.hwmode);
- if (ret != RETURN_OK)
- fprintf(stderr, "[Set hwmode failed!!!]\n");
- ret = 0;
-
- // noscan
- fprintf(stderr, "Set noscan: %s \n", radio_parameter.noscan);
- if(strlen(radio_parameter.noscan)){
- ret = wifi_setNoscan(radio_parameter.radio_index, radio_parameter.noscan);
- if (ret != RETURN_OK)
- fprintf(stderr, "[Set noscan failed!!!]\n");
- }
- ret = 0;
-
// Get current radio setting
ret = wifi_getRadioOperatingParameters(radio_parameter.radio_index, &operationParam);
if (ret != RETURN_OK)
@@ -338,6 +312,29 @@
if (ret != RETURN_OK)
fprintf(stderr, "[Apply setting failed!!!]\n");
+ // Country
+ fprintf(stderr, "Set Country: %s\n", radio_parameter.country);
+ ret = wifi_setRadioCountryCode(radio_parameter.radio_index, radio_parameter.country);
+ if (ret != RETURN_OK)
+ fprintf(stderr, "[Set Country failed!!!]\n");
+ ret = 0;
+
+ // hwmode
+ fprintf(stderr, "Set hwmode: %s\n", radio_parameter.hwmode);
+ ret = wifi_setRadioHwMode(radio_parameter.radio_index, radio_parameter.hwmode);
+ if (ret != RETURN_OK)
+ fprintf(stderr, "[Set hwmode failed!!!]\n");
+ ret = 0;
+
+ // noscan
+ fprintf(stderr, "Set noscan: %s \n", radio_parameter.noscan);
+ if(strlen(radio_parameter.noscan)){
+ ret = wifi_setNoscan(radio_parameter.radio_index, radio_parameter.noscan);
+ if (ret != RETURN_OK)
+ fprintf(stderr, "[Set noscan failed!!!]\n");
+ }
+ ret = 0;
+
}
void set_ap_param(wifi_ap_param ap_param , wifi_vap_info_map_t *map)