Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/task_handle' into 'master'

Browse source 
Fix datatype for wps task handle

See merge request espressif/esp-idf!8579
This commit is contained in:
Mahavir Jain 2020-05-04 19:34:57 +08:00
commit 1ab26f85ec
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/driver/esp32/touch_sensor.c
View file

@ -432,7 +432,7 @@ esp_err_t touch_pad_filter_start(uint32_t filter_period_ms)
} }
if (s_touch_pad_filter->timer == NULL) { if (s_touch_pad_filter->timer == NULL) {
s_touch_pad_filter->timer = xTimerCreate("filter_tmr", filter_period_ms / portTICK_PERIOD_MS, pdFALSE, s_touch_pad_filter->timer = xTimerCreate("filter_tmr", filter_period_ms / portTICK_PERIOD_MS, pdFALSE,
NULL, touch_pad_filter_cb); NULL, (TimerCallbackFunction_t) touch_pad_filter_cb);
if (s_touch_pad_filter->timer == NULL) { if (s_touch_pad_filter->timer == NULL) {
free(s_touch_pad_filter); free(s_touch_pad_filter);
s_touch_pad_filter = NULL; s_touch_pad_filter = NULL;

2
components/wpa_supplicant/src/esp_supplicant/esp_wps.c
View file

@ -61,7 +61,7 @@ typedef struct {
int ret; /* return value */ int ret; /* return value */
} wps_ioctl_param_t; } wps_ioctl_param_t;
static void *s_wps_task_hdl = NULL; static TaskHandle_t s_wps_task_hdl = NULL;
static void *s_wps_queue = NULL; static void *s_wps_queue = NULL;
static void *s_wps_api_lock = NULL; /* Used in WPS public API only, never be freed */ static void *s_wps_api_lock = NULL; /* Used in WPS public API only, never be freed */
static void *s_wps_api_sem = NULL; /* Sync semaphore used between WPS publi API caller task and WPS task */ static void *s_wps_api_sem = NULL; /* Sync semaphore used between WPS publi API caller task and WPS task */