Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ESP-IDF: Removed explicit esp_task_wdt_reset call #3330

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions lib/plat/freertos/freertos-service.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,9 @@
int
lws_plat_service(struct lws_context *context, int timeout_ms)
{
int n = _lws_plat_service_tsi(context, timeout_ms, 0);

#if !defined(LWS_AMAZON_RTOS) && defined(LWS_ESP_PLATFORM) && defined(CONFIG_ESP_INT_WDT)
esp_task_wdt_reset();
#endif

return n;
return _lws_plat_service_tsi(context, timeout_ms, 0);
}


int
_lws_plat_service_tsi(struct lws_context *context, int timeout_ms, int tsi)
{
Expand Down
1 change: 0 additions & 1 deletion lib/plat/freertos/private-lib-plat-freertos.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
#endif
#endif
#include <esp_system.h>
#include <esp_task_wdt.h>
#endif

#if defined(LWS_WITH_ESP32)
Expand Down
6 changes: 3 additions & 3 deletions lib/secure-streams/private-lib-secure-streams.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,17 @@ typedef struct lws_ss_handle {

union {
struct { /* LWSSSP_H1 */
#if defined(WIN32)
#if defined(WIN32) || defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
uint8_t dummy;
#endif
} h1;
struct { /* LWSSSP_H2 */
#if defined(WIN32)
#if defined(WIN32) || defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
uint8_t dummy;
#endif
} h2;
struct { /* LWSSSP_WS */
#if defined(WIN32)
#if defined(WIN32) || defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
uint8_t dummy;
#endif
} ws;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ gai_strerror(int);
#include "freertos/timers.h"
#include <esp_attr.h>
#include <esp_system.h>
#include <esp_task_wdt.h>
#endif

#if defined(LWS_WITH_ESP32)
Expand Down
1 change: 0 additions & 1 deletion minimal-examples/embedded/lhp/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "sdkconfig.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include <esp_task_wdt.h>
#include <driver/gpio.h>

#include <libwebsockets.h>
Expand Down