espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 03:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Modifying os_time_t datatype for platform and compiler independence

See merge request espressif/esp-idf!38736
This commit is contained in:
Jiang Jiang Jian
2025-04-25 18:28:16 +08:00
parent a15c978f08 96e06bd2ca
commit 5295bc39e5
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 7a103b60ff...cfceb15dc5

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

@@ -24,7 +24,8 @@
#include "esp_private/esp_wifi_private.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)

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;
os_get_reltime(&now);
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 "
"based on Probe Request from the Enrollee "
"that just completed PBC provisioning");