Merge branch 'bugfix/backport_some_wifi_bugs_0310_v3.3' into 'release/v3.3'
Backport some wifi bugs 0310 (backport v3.3) See merge request espressif/esp-idf!7935
This commit is contained in:
commit
766eace598
|
@ -588,6 +588,7 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
|
||||||
._get_time = get_time_wrapper,
|
._get_time = get_time_wrapper,
|
||||||
._random = os_random,
|
._random = os_random,
|
||||||
._log_write = esp_log_write,
|
._log_write = esp_log_write,
|
||||||
|
._log_writev = esp_log_writev,
|
||||||
._log_timestamp = esp_log_timestamp,
|
._log_timestamp = esp_log_timestamp,
|
||||||
._malloc_internal = malloc_internal_wrapper,
|
._malloc_internal = malloc_internal_wrapper,
|
||||||
._realloc_internal = realloc_internal_wrapper,
|
._realloc_internal = realloc_internal_wrapper,
|
||||||
|
|
|
@ -105,6 +105,7 @@ typedef struct {
|
||||||
int32_t (* _get_time)(void *t);
|
int32_t (* _get_time)(void *t);
|
||||||
unsigned long (* _random)(void);
|
unsigned long (* _random)(void);
|
||||||
void (* _log_write)(uint32_t level, const char* tag, const char* format, ...);
|
void (* _log_write)(uint32_t level, const char* tag, const char* format, ...);
|
||||||
|
void (* _log_writev)(uint32_t level, const char* tag, const char* format, va_list args);
|
||||||
uint32_t (* _log_timestamp)(void);
|
uint32_t (* _log_timestamp)(void);
|
||||||
void * (* _malloc_internal)(size_t size);
|
void * (* _malloc_internal)(size_t size);
|
||||||
void * (* _realloc_internal)(void *ptr, size_t size);
|
void * (* _realloc_internal)(void *ptr, size_t size);
|
||||||
|
|
|
@ -214,7 +214,7 @@ typedef struct {
|
||||||
uint8_t channel; /**< Channel of ESP32 soft-AP */
|
uint8_t channel; /**< Channel of ESP32 soft-AP */
|
||||||
wifi_auth_mode_t authmode; /**< Auth mode of ESP32 soft-AP. Do not support AUTH_WEP in soft-AP mode */
|
wifi_auth_mode_t authmode; /**< Auth mode of ESP32 soft-AP. Do not support AUTH_WEP in soft-AP mode */
|
||||||
uint8_t ssid_hidden; /**< Broadcast SSID or not, default 0, broadcast the SSID */
|
uint8_t ssid_hidden; /**< Broadcast SSID or not, default 0, broadcast the SSID */
|
||||||
uint8_t max_connection; /**< Max number of stations allowed to connect in, default 4, max 4 */
|
uint8_t max_connection; /**< Max number of stations allowed to connect in, default 4, max 10 */
|
||||||
uint16_t beacon_interval; /**< Beacon interval, 100 ~ 60000 ms, default 100 ms */
|
uint16_t beacon_interval; /**< Beacon interval, 100 ~ 60000 ms, default 100 ms */
|
||||||
} wifi_ap_config_t;
|
} wifi_ap_config_t;
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 3875c415108573d7067efb64c51b1ceb39f764f6
|
Subproject commit b7749ef26a3d3179a2f5f4b2fa9c53025c450b3b
|
|
@ -108,6 +108,15 @@ void esp_log_write(esp_log_level_t level, const char* tag, const char* format, .
|
||||||
|
|
||||||
/** @cond */
|
/** @cond */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Write message into the log, va_list variant
|
||||||
|
* @see esp_log_write()
|
||||||
|
*
|
||||||
|
* This function is provided to ease integration toward other logging framework,
|
||||||
|
* so that esp_log can be used as a log sink.
|
||||||
|
*/
|
||||||
|
void esp_log_writev(esp_log_level_t level, const char* tag, const char* format, va_list args);
|
||||||
|
|
||||||
#include "esp_log_internal.h"
|
#include "esp_log_internal.h"
|
||||||
|
|
||||||
#ifndef LOG_LOCAL_LEVEL
|
#ifndef LOG_LOCAL_LEVEL
|
||||||
|
|
|
@ -184,9 +184,10 @@ void clear_log_level_list()
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void IRAM_ATTR esp_log_write(esp_log_level_t level,
|
void IRAM_ATTR esp_log_writev(esp_log_level_t level,
|
||||||
const char* tag,
|
const char* tag,
|
||||||
const char* format, ...)
|
const char* format,
|
||||||
|
va_list args)
|
||||||
{
|
{
|
||||||
if (!s_log_mutex) {
|
if (!s_log_mutex) {
|
||||||
s_log_mutex = xSemaphoreCreateMutex();
|
s_log_mutex = xSemaphoreCreateMutex();
|
||||||
|
@ -210,9 +211,16 @@ void IRAM_ATTR esp_log_write(esp_log_level_t level,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
(*s_log_print_func)(format, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
void esp_log_write(esp_log_level_t level,
|
||||||
|
const char *tag,
|
||||||
|
const char *format, ...)
|
||||||
|
{
|
||||||
va_list list;
|
va_list list;
|
||||||
va_start(list, format);
|
va_start(list, format);
|
||||||
(*s_log_print_func)(format, list);
|
esp_log_writev(level, tag, format, list);
|
||||||
va_end(list);
|
va_end(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue