Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-23 06:39:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

xtensa/esp32: Add WPA2 Enterprise and WPA3 support

Browse Source
This commit is contained in:
Dong Heng
2021-03-08 16:28:38 +08:00
committed by Alan Carvalho de Assis
parent c885e718a7
commit 2f4e1c02de
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/xtensa/src/esp32/Make.defs
+3 -2
View File
@@ -194,7 +194,7 @@ endif
ifeq ($(CONFIG_ESP32_WIRELESS),y)
WIRELESS_DRV_UNPACK = esp-wireless-drivers-3rdparty
WIRELESS_DRV_ID = 4a352be
WIRELESS_DRV_ID = e766ea3
WIRELESS_DRV_ZIP = $(WIRELESS_DRV_ID).zip
WIRELESS_DRV_URL = https://github.com/espressif/esp-wireless-drivers-3rdparty/archive
@@ -215,9 +215,10 @@ clean_context::
$(call DELDIR, chip/$(WIRELESS_DRV_UNPACK))
INCLUDES += $(shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)esp-wireless-drivers-3rdparty$(DELIM)include)
INCLUDES += $(shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)esp-wireless-drivers-3rdparty$(DELIM)include$(DELIM)esp32)
CHIP_CSRCS += esp32_wlan.c esp32_wifi_adapter.c
EXTRA_LIBPATHS += -L $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)esp-wireless-drivers-3rdparty$(DELIM)libs
EXTRA_LIBPATHS += -L $(ARCH_SRCDIR)$(DELIM)chip$(DELIM)esp-wireless-drivers-3rdparty$(DELIM)libs$(DELIM)esp32
EXTRA_LIBS += -lcore -lrtc -lnet80211 -lpp -lsmartconfig -lcoexist -lespnow -lphy -lwpa_supplicant
# Due to some Wi-Fi related libraries, the option is need to avoid linking too much
arch/xtensa/src/esp32/esp32_rt_timer.c
+2 -2
View File
@@ -93,7 +93,7 @@ static struct esp32_tim_dev_s *s_esp32_tim_dev;
****************************************************************************/
static void start_rt_timer(FAR struct rt_timer_s *timer,
uint32_t timeout,
uint64_t timeout,
bool repeat)
{
irqstate_t flags;
@@ -507,7 +507,7 @@ int rt_timer_create(FAR const struct rt_timer_args_s *args,
****************************************************************************/
void rt_timer_start(FAR struct rt_timer_s *timer,
uint32_t timeout,
uint64_t timeout,
bool repeat)
{
stop_rt_timer(timer);
arch/xtensa/src/esp32/esp32_rt_timer.h
+2 -2
View File
@@ -52,7 +52,7 @@ enum rt_timer_state_e
struct rt_timer_s
{
uint32_t timeout; /* Timeout value */
uint64_t timeout; /* Timeout value */
uint64_t alarm; /* Timeout period */
void (*callback)(void *arg); /* Callback function */
void *arg; /* Private data */
@@ -115,7 +115,7 @@ int rt_timer_create(FAR const struct rt_timer_args_s *args,
****************************************************************************/
void rt_timer_start(FAR struct rt_timer_s *timer,
uint32_t timeout,
uint64_t timeout,
bool repeat);
/****************************************************************************
arch/xtensa/src/esp32/esp32_wifi_adapter.c
+3 -5
View File
@@ -480,7 +480,7 @@ wifi_osi_funcs_t g_wifi_osi_funcs =
/* WiFi feature capacity data */
uint64_t g_wifi_feature_caps;
uint64_t g_wifi_feature_caps = CONFIG_FEATURE_WPA3_SAE_BIT;
/* WiFi TAG string data */
@@ -4175,8 +4175,6 @@ int32_t esp_timer_start_once(esp_timer_handle_t timer, uint64_t timeout_us)
{
struct rt_timer_s *rt_timer = (struct rt_timer_s *)timer;
DEBUGASSERT(timeout_us <= UINT32_MAX);
rt_timer_start(rt_timer, timeout_us, false);
return 0;
@@ -4201,8 +4199,6 @@ int32_t esp_timer_start_periodic(esp_timer_handle_t timer, uint64_t period)
{
struct rt_timer_s *rt_timer = (struct rt_timer_s *)timer;
DEBUGASSERT(period <= UINT32_MAX);
rt_timer_start(rt_timer, period, true);
return 0;
@@ -4710,6 +4706,8 @@ int esp_wifi_connect_internal(void)
memcpy((char *)wifi_cfg.sta.ssid, g_ssid, g_ssid_len);
memcpy((char *)wifi_cfg.sta.password, g_password, g_password_len);
wifi_cfg.sta.pmf_cfg.capable = true;
ret = esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_cfg);
if (ret)
{