From b3c777ad432f1407a8db06cca50c4f2944c31bd2 Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Tue, 8 Feb 2022 17:39:38 +0800 Subject: [PATCH] freertos: Remove legacy data types This commit removes the usage of all legacy FreeRTOS data types that are exposed via configENABLE_BACKWARD_COMPATIBILITY. Legacy types can still be used by enabling CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY. * Original commit: espressif/esp-idf@57fd78f5baf93a368a82cf4b2e00ca17ffc09115 --- components/esp_websocket_client/esp_websocket_client.c | 6 +++--- examples/protocols/websocket/main/websocket_example.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/esp_websocket_client/esp_websocket_client.c b/components/esp_websocket_client/esp_websocket_client.c index 798a320da..c7f09ea71 100644 --- a/components/esp_websocket_client/esp_websocket_client.c +++ b/components/esp_websocket_client/esp_websocket_client.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -105,7 +105,7 @@ struct esp_websocket_client { bool run; bool wait_for_pong_resp; EventGroupHandle_t status_bits; - xSemaphoreHandle lock; + SemaphoreHandle_t lock; char *rx_buffer; char *tx_buffer; int buffer_size; @@ -696,7 +696,7 @@ static void esp_websocket_client_task(void *pv) } } else if (WEBSOCKET_STATE_WAIT_TIMEOUT == client->state) { // waiting for reconnecting... - vTaskDelay(client->wait_timeout_ms / 2 / portTICK_RATE_MS); + vTaskDelay(client->wait_timeout_ms / 2 / portTICK_PERIOD_MS); } else if (WEBSOCKET_STATE_CLOSING == client->state && (CLOSE_FRAME_SENT_BIT & xEventGroupGetBits(client->status_bits))) { ESP_LOGD(TAG, " Waiting for TCP connection to be closed by the server"); diff --git a/examples/protocols/websocket/main/websocket_example.c b/examples/protocols/websocket/main/websocket_example.c index 50515e265..1cabb3962 100644 --- a/examples/protocols/websocket/main/websocket_example.c +++ b/examples/protocols/websocket/main/websocket_example.c @@ -121,7 +121,7 @@ static void websocket_app_start(void) ESP_LOGI(TAG, "Sending %s", data); esp_websocket_client_send_text(client, data, len, portMAX_DELAY); } - vTaskDelay(1000 / portTICK_RATE_MS); + vTaskDelay(1000 / portTICK_PERIOD_MS); } xSemaphoreTake(shutdown_sema, portMAX_DELAY);