Merge branch 'fix/consider_compatibility_of_wifi_cmd' into 'main'

fix(ext_cmd): release the lock before connecting to wifi

See merge request espressif/esp-thread-br!170

Author: chshu

components/esp_ot_cli_extension/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.3.2"
+version: "1.3.3"
 description: Espressif OpenThread CLI Extension
 url: https://github.com/espressif/esp-thread-br/tree/main/components/esp_ot_cli_extension
 dependencies:

components/esp_ot_cli_extension/src/esp_ot_wifi_cmd.c

@@ -144,9 +144,7 @@ static esp_err_t wifi_join(const char *ssid, const char *password)
         return ESP_ERR_INVALID_ARG;
     }
 
-    esp_openthread_task_switching_lock_release();
     esp_err_t err = example_wifi_sta_do_connect(wifi_config, true);
-    esp_openthread_task_switching_lock_acquire(portMAX_DELAY);
     return err;
 }
 
@@ -179,9 +177,7 @@ void esp_ot_wifi_border_router_init_flag_set(bool initialized)
 esp_err_t esp_ot_wifi_connect(const char *ssid, const char *password)
 {
     if (!s_wifi_initialized) {
-        esp_openthread_task_switching_lock_release();
         example_wifi_start();
-        esp_openthread_task_switching_lock_acquire(portMAX_DELAY);
 #if CONFIG_ESP_COEX_SW_COEXIST_ENABLE && CONFIG_OPENTHREAD_RADIO_NATIVE
         ESP_ERROR_CHECK(esp_coex_wifi_i154_enable());
 #endif
@@ -224,9 +220,7 @@ esp_err_t esp_ot_wifi_disconnect(void)
     ESP_ERROR_CHECK(esp_event_handler_unregister(WIFI_EVENT, WIFI_EVENT_STA_CONNECTED, &handler_on_wifi_connect));
     s_wifi_handler_registered = false;
     s_wifi_state = OT_WIFI_DISCONNECTED;
-    esp_openthread_task_switching_lock_release();
     esp_err_t err = example_wifi_sta_do_disconnect();
-    esp_openthread_task_switching_lock_acquire(portMAX_DELAY);
     return err;
 }
 
@@ -298,7 +292,10 @@ otError esp_ot_process_wifi_cmd(void *aContext, uint8_t aArgsLength, char *aArgs
             otCliOutputFormat("None ssid\n");
             return OT_ERROR_INVALID_ARGS;
         }
-        if (esp_ot_wifi_connect(ssid, psk) == ESP_OK) {
+        esp_openthread_task_switching_lock_release();
+        esp_err_t error = esp_ot_wifi_connect(ssid, psk);
+        esp_openthread_task_switching_lock_acquire(portMAX_DELAY);
+        if (error == ESP_OK) {
             if (!s_border_router_initialized) {
                 esp_openthread_set_backbone_netif(get_example_netif());
                 if (esp_openthread_border_router_init() != ESP_OK) {
@@ -315,7 +312,10 @@ otError esp_ot_process_wifi_cmd(void *aContext, uint8_t aArgsLength, char *aArgs
         otCliOutputFormat("%s\n", wifi_state_string[s_wifi_state]);
     } else if (strcmp(aArgs[0], "disconnect") == 0) {
         if (s_wifi_state) {
-            if (esp_ot_wifi_disconnect() == ESP_OK) {
+            esp_openthread_task_switching_lock_release();
+            esp_err_t error = esp_ot_wifi_disconnect();
+            esp_openthread_task_switching_lock_acquire(portMAX_DELAY);
+            if (error == ESP_OK) {
                 otCliOutputFormat("disconnect wifi\n");
             } else {
                 ESP_LOGE(OT_EXT_CLI_TAG, "Fail to disconnect wifi");