espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/update_os_time_struct_v5.3' into 'release/v5.3'

Browse Source 
Modifying os_time_t datatype for platform and compiler independence

See merge request espressif/esp-idf!36718
This commit is contained in:
Jiang Jiang Jian
2025-04-25 18:01:07 +08:00
parent f3782f6701 f7ccfd2293
commit 6a98af1fa0
4 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/include/esp_wifi_types_generic.h
View File

@@ -938,7 +938,7 @@ typedef struct {
uint8_t ssid_len; /**< SSID length of connected AP */ uint8_t ssid_len; /**< SSID length of connected AP */
uint8_t bssid[6]; /**< BSSID of connected AP*/ uint8_t bssid[6]; /**< BSSID of connected AP*/
uint8_t channel; /**< Channel of connected AP*/ uint8_t channel; /**< Channel of connected AP*/
wifi_auth_mode_t authmode;/**< Authentication mode used by AP*/ wifi_auth_mode_t authmode;/**< Authentication mode used by the connection*/
uint16_t aid; /**< Authentication id assigned by the connected AP */ uint16_t aid; /**< Authentication id assigned by the connected AP */
} wifi_event_sta_connected_t; } wifi_event_sta_connected_t;

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 7a2011279d...3fdd246e7e

7
components/wpa_supplicant/port/include/os.h
View File

@@ -24,7 +24,8 @@
#include "esp_private/esp_wifi_private.h" #include "esp_private/esp_wifi_private.h"
#include "esp_wifi.h" #include "esp_wifi.h"
typedef time_t os_time_t; /* Modifying datatype for platform and compiler independence */
typedef uint64_t os_time_t;
/** /**
* os_sleep - Sleep (sec, usec) * os_sleep - Sleep (sec, usec)
@@ -231,7 +232,6 @@ static inline char *os_readfile(const char *name, size_t *len)
#define os_bzero(s, n) bzero(s, n) #define os_bzero(s, n) bzero(s, n)
#endif #endif
#ifndef os_strdup #ifndef os_strdup
#ifdef _MSC_VER #ifdef _MSC_VER
#define os_strdup(s) _strdup(s) #define os_strdup(s) _strdup(s)
@@ -314,8 +314,9 @@ static inline int os_snprintf_error(size_t size, int res)
static inline void * os_realloc_array(void *ptr, size_t nmemb, size_t size) static inline void * os_realloc_array(void *ptr, size_t nmemb, size_t size)
{ {
if (size && nmemb > (~(size_t) 0) / size) if (size && nmemb > (~(size_t) 0) / size) {
return NULL; return NULL;
}
return os_realloc(ptr, nmemb * size); return os_realloc(ptr, nmemb * size);
} }

4
components/wpa_supplicant/src/wps/wps_registrar.c
View File

@@ -1209,7 +1209,9 @@ void wps_registrar_probe_req_rx(struct wps_registrar *reg, const u8 *addr,
struct os_reltime now, dur; struct os_reltime now, dur;
os_get_reltime(&now); os_get_reltime(&now);
os_reltime_sub(&now, &reg->pbc_ignore_start, &dur); os_reltime_sub(&now, &reg->pbc_ignore_start, &dur);
if (dur.sec >= 0 && dur.sec < 5) { #ifdef ESP_SUPPLICANT
if (dur.sec < 5) {
#endif /* ESP_SUPPLICANT */
wpa_printf(MSG_DEBUG, "WPS: Ignore PBC activation " wpa_printf(MSG_DEBUG, "WPS: Ignore PBC activation "
"based on Probe Request from the Enrollee " "based on Probe Request from the Enrollee "
"that just completed PBC provisioning"); "that just completed PBC provisioning");