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

espressif: Fix references to Wi-Fi according to Wi-Fi Alliance

Browse Source 
Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
This commit is contained in:
Gustavo Henrique Nihei
2021-10-24 07:02:09 -03:00
committed by Xiang Xiao
parent e3d20d2c54
commit a1af605973
19 changed files with 236 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/platforms/xtensa/esp32/boards/esp32-devkitc/index.rst
+1 -1
View File
@@ -119,7 +119,7 @@ USB connection by means of CP2102 converter, at 115200 bps).
wapi wapi
---- ----
Enables WiFi support. You can define your credentials this way:: Enables Wi-Fi support. You can define your credentials this way::
$ make menuconfig $ make menuconfig
-> Application Configuration -> Application Configuration
Documentation/platforms/xtensa/esp32/index.rst
+4 -4
View File
@@ -4,7 +4,7 @@ Espressif ESP32
The ESP32 is a series of single and dual-core SoCs from Espressif The ESP32 is a series of single and dual-core SoCs from Espressif
based on Harvard architecture Xtensa LX6 CPUs and with on-chip support based on Harvard architecture Xtensa LX6 CPUs and with on-chip support
for Bluetooth and WiFi. for Bluetooth and Wi-Fi.
All embedded memory, external memory and peripherals are located on the All embedded memory, external memory and peripherals are located on the
data bus and/or the instruction bus of these CPUs. With some minor data bus and/or the instruction bus of these CPUs. With some minor
@@ -286,7 +286,7 @@ Open Issues
2. Assertions. On a fatal assertions, other CPUs need to be stopped. 2. Assertions. On a fatal assertions, other CPUs need to be stopped.
WiFi Wi-Fi
==== ====
A standard network interface will be configured and can be initialized such as:: A standard network interface will be configured and can be initialized such as::
@@ -300,9 +300,9 @@ In this case a connection to AP with SSID ``myssid`` is done, using ``mypasswd``
password. IP address is obtained via DHCP using ``renew`` command. You can check password. IP address is obtained via DHCP using ``renew`` command. You can check
the result by running ``ifconfig`` afterwards. the result by running ``ifconfig`` afterwards.
.. tip:: Boards usually expose a ``wapi`` defconfig which enables WiFi .. tip:: Boards usually expose a ``wapi`` defconfig which enables Wi-Fi
WiFi SoftAP Wi-Fi SoftAP
=========== ===========
It is possible to use ESP32 as an Access Point (SoftAP). Actually there are some It is possible to use ESP32 as an Access Point (SoftAP). Actually there are some
arch/risc-v/src/esp32c3/esp32c3_pm.c
+2 -2
View File
@@ -1146,12 +1146,12 @@ static void IRAM_ATTR esp32c3_perip_clk_init(void)
modifyreg32(SYSTEM_PERIP_CLK_EN1_REG, hwcrypto_perip_clk, 0); modifyreg32(SYSTEM_PERIP_CLK_EN1_REG, hwcrypto_perip_clk, 0);
modifyreg32(SYSTEM_PERIP_RST_EN1_REG, 0, hwcrypto_perip_clk); modifyreg32(SYSTEM_PERIP_RST_EN1_REG, 0, hwcrypto_perip_clk);
/* Disable WiFi/BT/SDIO clocks. */ /* Disable Wi-Fi/BT/SDIO clocks. */
modifyreg32(SYSTEM_WIFI_CLK_EN_REG, wifi_bt_sdio_clk, 0); modifyreg32(SYSTEM_WIFI_CLK_EN_REG, wifi_bt_sdio_clk, 0);
modifyreg32(SYSTEM_WIFI_CLK_EN_REG, 0, SYSTEM_WIFI_CLK_EN); modifyreg32(SYSTEM_WIFI_CLK_EN_REG, 0, SYSTEM_WIFI_CLK_EN);
/* Set WiFi light sleep clock source to RTC slow clock */ /* Set Wi-Fi light sleep clock source to RTC slow clock */
REG_SET_FIELD(SYSTEM_BT_LPCK_DIV_INT_REG, SYSTEM_BT_LPCK_DIV_NUM, 0); REG_SET_FIELD(SYSTEM_BT_LPCK_DIV_INT_REG, SYSTEM_BT_LPCK_DIV_NUM, 0);
modifyreg32(SYSTEM_BT_LPCK_DIV_FRAC_REG, SYSTEM_LPCLK_SEL_8M, modifyreg32(SYSTEM_BT_LPCK_DIV_FRAC_REG, SYSTEM_LPCLK_SEL_8M,
arch/risc-v/src/esp32c3/esp32c3_rng.c
+1 -1
View File
@@ -93,7 +93,7 @@ uint32_t IRAM_ATTR esp_random(void)
{ {
/* The PRNG which implements WDEV_RANDOM register gets 2 bits /* The PRNG which implements WDEV_RANDOM register gets 2 bits
* of extra entropy from a hardware randomness source every APB clock cycle * of extra entropy from a hardware randomness source every APB clock cycle
* (provided WiFi or BT are enabled). To make sure entropy is not drained * (provided Wi-Fi or BT are enabled). To make sure entropy is not drained
* faster than it is added, this function needs to wait for at least 16 APB * faster than it is added, this function needs to wait for at least 16 APB
* clock cycles after reading previous word. This implementation may * clock cycles after reading previous word. This implementation may
* actually wait a bit longer due to extra time spent in arithmetic and * actually wait a bit longer due to extra time spent in arithmetic and
arch/risc-v/src/esp32c3/esp32c3_rtc.c
+4 -4
View File
@@ -281,9 +281,9 @@ struct esp32c3_rtc_sleep_pu_config_s
* CPU in sleep * CPU in sleep
*/ */
uint32_t i2s_fpu : 1; /* Set to 1 to power UP I2S in sleep */ uint32_t i2s_fpu : 1; /* Set to 1 to power UP I2S in sleep */
uint32_t bb_fpu : 1; /* Set to 1 to power UP WiFi in sleep */ uint32_t bb_fpu : 1; /* Set to 1 to power UP Wi-Fi in sleep */
uint32_t nrx_fpu : 1; /* Set to 1 to power UP WiFi in sleep */ uint32_t nrx_fpu : 1; /* Set to 1 to power UP Wi-Fi in sleep */
uint32_t fe_fpu : 1; /* Set to 1 to power UP WiFi in sleep */ uint32_t fe_fpu : 1; /* Set to 1 to power UP Wi-Fi in sleep */
uint32_t sram_fpu : 1; /* Set to 1 to power UP SRAM in sleep */ uint32_t sram_fpu : 1; /* Set to 1 to power UP SRAM in sleep */
uint32_t rom_ram_fpu : 1; /* Set to 1 to power UP ROM/IRAM0_DRAM0 in sleep */ uint32_t rom_ram_fpu : 1; /* Set to 1 to power UP ROM/IRAM0_DRAM0 in sleep */
}; };
@@ -333,7 +333,7 @@ struct esp32c3_rtc_sleep_config_s
uint32_t rtc_fastmem_pd_en : 1; /* power down RTC fast memory */ uint32_t rtc_fastmem_pd_en : 1; /* power down RTC fast memory */
uint32_t rtc_slowmem_pd_en : 1; /* power down RTC slow memory */ uint32_t rtc_slowmem_pd_en : 1; /* power down RTC slow memory */
uint32_t rtc_peri_pd_en : 1; /* power down RTC peripherals */ uint32_t rtc_peri_pd_en : 1; /* power down RTC peripherals */
uint32_t wifi_pd_en : 1; /* power down WiFi */ uint32_t wifi_pd_en : 1; /* power down Wi-Fi */
uint32_t bt_pd_en : 1; /* power down BT */ uint32_t bt_pd_en : 1; /* power down BT */
uint32_t cpu_pd_en : 1; /* power down CPU, but not uint32_t cpu_pd_en : 1; /* power down CPU, but not
* restart when lightsleep. * restart when lightsleep.
arch/xtensa/src/esp32/Kconfig
+14 -14
View File
@@ -1048,11 +1048,11 @@ config ESP32_ETH_PHY_ADDR
endmenu # ESP32_EMAC endmenu # ESP32_EMAC
menu "WiFi configuration" menu "Wi-Fi configuration"
depends on ESP32_WIRELESS depends on ESP32_WIRELESS
choice choice
prompt "ESP32 WiFi mode" prompt "ESP32 Wi-Fi mode"
default ESP32_WIFI_STATION default ESP32_WIFI_STATION
config ESP32_WIFI_STATION config ESP32_WIFI_STATION
@@ -1064,30 +1064,30 @@ config ESP32_WIFI_SOFTAP
config ESP32_WIFI_STATION_SOFTAP_COEXISTENCE config ESP32_WIFI_STATION_SOFTAP_COEXISTENCE
bool "Station + SoftAP coexistence" bool "Station + SoftAP coexistence"
endchoice # ESP32 WiFi mode endchoice # ESP32 Wi-Fi mode
config ESP32_WIFI_STATIC_RXBUF_NUM config ESP32_WIFI_STATIC_RXBUF_NUM
int "WiFi static RX buffer number" int "Wi-Fi static RX buffer number"
default 10 default 10
config ESP32_WIFI_DYNAMIC_RXBUF_NUM config ESP32_WIFI_DYNAMIC_RXBUF_NUM
int "WiFi dynamic RX buffer number" int "Wi-Fi dynamic RX buffer number"
default 32 default 32
config ESP32_WIFI_DYNAMIC_TXBUF_NUM config ESP32_WIFI_DYNAMIC_TXBUF_NUM
int "WiFi dynamic TX buffer number" int "Wi-Fi dynamic TX buffer number"
default 32 default 32
config ESP32_WIFI_TX_AMPDU config ESP32_WIFI_TX_AMPDU
bool "WiFi TX AMPDU" bool "Wi-Fi TX AMPDU"
default y default y
config ESP32_WIFI_RX_AMPDU config ESP32_WIFI_RX_AMPDU
bool "WiFi RX AMPDU" bool "Wi-Fi RX AMPDU"
default y default y
config ESP32_WIFI_RXBA_AMPDU_WZ config ESP32_WIFI_RXBA_AMPDU_WZ
int "WiFi RX BA AMPDU windown size" int "Wi-Fi RX BA AMPDU windown size"
default 6 default 6
config ESP32_WLAN_PKTBUF_NUM config ESP32_WLAN_PKTBUF_NUM
@@ -1107,11 +1107,11 @@ config ESP32_WIFI_SCAN_RESULT_SIZE
Maximum scan result buffer size. Maximum scan result buffer size.
config ESP32_WIFI_SAVE_PARAM config ESP32_WIFI_SAVE_PARAM
bool "Save WiFi Parameters" bool "Save Wi-Fi Parameters"
default n default n
depends on ESP32_SPIFLASH depends on ESP32_SPIFLASH
---help--- ---help---
If you enable this option, WiFi adapter parameters will be saved If you enable this option, Wi-Fi adapter parameters will be saved
into the file system instead of computing them each time. into the file system instead of computing them each time.
These parameters mainly contains: These parameters mainly contains:
@@ -1121,14 +1121,14 @@ config ESP32_WIFI_SAVE_PARAM
- PMK(compute when connecting) - PMK(compute when connecting)
- Author mode - Author mode
- MAC address - MAC address
- WiFi hardware configuration parameters - Wi-Fi hardware configuration parameters
config ESP32_WIFI_FS_MOUNTPT config ESP32_WIFI_FS_MOUNTPT
string "Save WiFi Parameters" string "Save Wi-Fi Parameters"
default "/mnt/esp/wifi" default "/mnt/esp/wifi"
depends on ESP32_WIFI_SAVE_PARAM depends on ESP32_WIFI_SAVE_PARAM
---help--- ---help---
Mount point of WiFi storage file system. Mount point of Wi-Fi storage file system.
config ESP32_WIFI_MTD_OFFSET config ESP32_WIFI_MTD_OFFSET
hex "Wi-Fi MTD partition offset" hex "Wi-Fi MTD partition offset"
arch/xtensa/src/esp32/esp32_ble_adapter.c
+4 -4
View File
@@ -854,13 +854,13 @@ static void esp32_ints_on(uint32_t mask)
* Name: is_wifi_clk_peripheral * Name: is_wifi_clk_peripheral
* *
* Description: * Description:
* Checks if the peripheral module needs WiFi Clock. * Checks if the peripheral module needs Wi-Fi Clock.
* *
* Input Parameters: * Input Parameters:
* periph - The peripheral module * periph - The peripheral module
* *
* Returned Value: * Returned Value:
* true if it depends on WiFi clock or false otherwise. * true if it depends on Wi-Fi clock or false otherwise.
* *
****************************************************************************/ ****************************************************************************/
@@ -2813,7 +2813,7 @@ static void async_wakeup_request_end(int event)
* Name: coex_bt_wakeup_request * Name: coex_bt_wakeup_request
* *
* Description: * Description:
* Request a WiFi/BLE Coex wakeup request * Request a Wi-Fi/BLE Coex wakeup request
* *
* Input Parameters: * Input Parameters:
* none * none
@@ -2832,7 +2832,7 @@ static bool coex_bt_wakeup_request(void)
* Name: coex_bt_wakeup_request_end * Name: coex_bt_wakeup_request_end
* *
* Description: * Description:
* Finish WiFi/BLE Coex wakeup request * Finish Wi-Fi/BLE Coex wakeup request
* *
* Input Parameters: * Input Parameters:
* none * none
arch/xtensa/src/esp32/esp32_rng.c
+1 -1
View File
@@ -94,7 +94,7 @@ uint32_t IRAM_ATTR esp_random(void)
{ {
/* The PRNG which implements WDEV_RANDOM register gets 2 bits /* The PRNG which implements WDEV_RANDOM register gets 2 bits
* of extra entropy from a hardware randomness source every APB clock cycle * of extra entropy from a hardware randomness source every APB clock cycle
* (provided WiFi or BT are enabled). To make sure entropy is not drained * (provided Wi-Fi or BT are enabled). To make sure entropy is not drained
* faster than it is added, this function needs to wait for at least 16 APB * faster than it is added, this function needs to wait for at least 16 APB
* clock cycles after reading previous word. This implementation may * clock cycles after reading previous word. This implementation may
* actually wait a bit longer due to extra time spent in arithmetic and * actually wait a bit longer due to extra time spent in arithmetic and
arch/xtensa/src/esp32/esp32_rtc.c
+4 -4
View File
@@ -199,7 +199,7 @@ struct esp32_rtc_sleep_config_s
uint32_t rtc_fastmem_pd_en : 1; /* power down RTC fast memory */ uint32_t rtc_fastmem_pd_en : 1; /* power down RTC fast memory */
uint32_t rtc_slowmem_pd_en : 1; /* power down RTC slow memory */ uint32_t rtc_slowmem_pd_en : 1; /* power down RTC slow memory */
uint32_t rtc_peri_pd_en : 1; /* power down RTC peripherals */ uint32_t rtc_peri_pd_en : 1; /* power down RTC peripherals */
uint32_t wifi_pd_en : 1; /* power down WiFi */ uint32_t wifi_pd_en : 1; /* power down Wi-Fi */
uint32_t rom_mem_pd_en : 1; /* power down main RAM and ROM */ uint32_t rom_mem_pd_en : 1; /* power down main RAM and ROM */
uint32_t deep_slp : 1; /* power down digital domain */ uint32_t deep_slp : 1; /* power down digital domain */
uint32_t wdt_flashboot_mod_en : 1; /* enable WDT flashboot mode */ uint32_t wdt_flashboot_mod_en : 1; /* enable WDT flashboot mode */
@@ -220,9 +220,9 @@ struct esp32_rtc_sleep_pd_config_s
uint32_t rtc_pd : 1; /* Set to 1 to power down RTC memories in sleep */ uint32_t rtc_pd : 1; /* Set to 1 to power down RTC memories in sleep */
uint32_t cpu_pd : 1; /* Set to 1 to power down digital memories and CPU in sleep */ uint32_t cpu_pd : 1; /* Set to 1 to power down digital memories and CPU in sleep */
uint32_t i2s_pd : 1; /* Set to 1 to power down I2S in sleep */ uint32_t i2s_pd : 1; /* Set to 1 to power down I2S in sleep */
uint32_t bb_pd : 1; /* Set to 1 to power down WiFi in sleep */ uint32_t bb_pd : 1; /* Set to 1 to power down Wi-Fi in sleep */
uint32_t nrx_pd : 1; /* Set to 1 to power down WiFi in sleep */ uint32_t nrx_pd : 1; /* Set to 1 to power down Wi-Fi in sleep */
uint32_t fe_pd : 1; /* Set to 1 to power down WiFi in sleep */ uint32_t fe_pd : 1; /* Set to 1 to power down Wi-Fi in sleep */
}; };
#ifdef CONFIG_RTC_DRIVER #ifdef CONFIG_RTC_DRIVER
arch/xtensa/src/esp32/esp32_wifi_adapter.c
+123 -123
View File
File diff suppressed because it is too large Load Diff
arch/xtensa/src/esp32/esp32_wifi_adapter.h
+28 -28
View File
@@ -63,7 +63,7 @@ extern "C"
#define MAC_LEN (6) #define MAC_LEN (6)
/* WiFi event ID */ /* Wi-Fi event ID */
enum wifi_adpt_evt_e enum wifi_adpt_evt_e
{ {
@@ -76,11 +76,11 @@ enum wifi_adpt_evt_e
WIFI_ADPT_EVT_MAX, WIFI_ADPT_EVT_MAX,
}; };
/* WiFi event callback function */ /* Wi-Fi event callback function */
typedef void (*wifi_evt_cb_t)(void *p); typedef void (*wifi_evt_cb_t)(void *p);
/* WiFi TX done callback function */ /* Wi-Fi TX done callback function */
typedef void (*wifi_txdone_cb_t)(uint8_t *data, uint16_t *len, bool status); typedef void (*wifi_txdone_cb_t)(uint8_t *data, uint16_t *len, bool status);
@@ -92,7 +92,7 @@ typedef void (*wifi_txdone_cb_t)(uint8_t *data, uint16_t *len, bool status);
* Name: esp_wifi_adapter_init * Name: esp_wifi_adapter_init
* *
* Description: * Description:
* Initialize ESP32 WiFi adapter * Initialize ESP32 Wi-Fi adapter
* *
* Input Parameters: * Input Parameters:
* None * None
@@ -108,10 +108,10 @@ int esp_wifi_adapter_init(void);
* Name: esp_wifi_free_eb * Name: esp_wifi_free_eb
* *
* Description: * Description:
* Free WiFi receive callback input eb pointer * Free Wi-Fi receive callback input eb pointer
* *
* Input Parameters: * Input Parameters:
* eb - WiFi receive callback input eb pointer * eb - Wi-Fi receive callback input eb pointer
* *
* Returned Value: * Returned Value:
* None * None
@@ -143,7 +143,7 @@ int esp_wifi_notify_subscribe(pid_t pid, struct sigevent *event);
* Name: esp_wifi_sta_start * Name: esp_wifi_sta_start
* *
* Description: * Description:
* Start WiFi station. * Start Wi-Fi station.
* *
* Input Parameters: * Input Parameters:
* None * None
@@ -160,7 +160,7 @@ int esp_wifi_sta_start(void);
* Name: esp_wifi_sta_stop * Name: esp_wifi_sta_stop
* *
* Description: * Description:
* Stop WiFi station. * Stop Wi-Fi station.
* *
* Input Parameters: * Input Parameters:
* None * None
@@ -177,7 +177,7 @@ int esp_wifi_sta_stop(void);
* Name: esp_wifi_sta_send_data * Name: esp_wifi_sta_send_data
* *
* Description: * Description:
* Use WiFi station interface to send 802.3 frame * Use Wi-Fi station interface to send 802.3 frame
* *
* Input Parameters: * Input Parameters:
* pbuf - Packet buffer pointer * pbuf - Packet buffer pointer
@@ -195,7 +195,7 @@ int esp_wifi_sta_send_data(void *pbuf, uint32_t len);
* Name: esp_wifi_sta_register_recv_cb * Name: esp_wifi_sta_register_recv_cb
* *
* Description: * Description:
* Regitser WiFi station receive packet callback function * Regitser Wi-Fi station receive packet callback function
* *
* Input Parameters: * Input Parameters:
* recv_cb - Receive callback function * recv_cb - Receive callback function
@@ -246,7 +246,7 @@ int esp_wifi_sta_read_mac(uint8_t *mac);
* Name: esp_wifi_set_password * Name: esp_wifi_set_password
* *
* Description: * Description:
* Set/Get WiFi station password * Set/Get Wi-Fi station password
* *
* Input Parameters: * Input Parameters:
* iwr - The argument of the ioctl cmd * iwr - The argument of the ioctl cmd
@@ -264,7 +264,7 @@ int esp_wifi_sta_password(struct iwreq *iwr, bool set);
* Name: esp_wifi_sta_essid * Name: esp_wifi_sta_essid
* *
* Description: * Description:
* Set/Get WiFi station ESSID * Set/Get Wi-Fi station ESSID
* *
* Input Parameters: * Input Parameters:
* iwr - The argument of the ioctl cmd * iwr - The argument of the ioctl cmd
@@ -282,7 +282,7 @@ int esp_wifi_sta_essid(struct iwreq *iwr, bool set);
* Name: esp_wifi_sta_bssid * Name: esp_wifi_sta_bssid
* *
* Description: * Description:
* Set/Get WiFi station BSSID * Set/Get Wi-Fi station BSSID
* *
* Input Parameters: * Input Parameters:
* iwr - The argument of the ioctl cmd * iwr - The argument of the ioctl cmd
@@ -300,7 +300,7 @@ int esp_wifi_sta_bssid(struct iwreq *iwr, bool set);
* Name: esp_wifi_sta_connect * Name: esp_wifi_sta_connect
* *
* Description: * Description:
* Trigger WiFi station connection action * Trigger Wi-Fi station connection action
* *
* Input Parameters: * Input Parameters:
* None * None
@@ -317,7 +317,7 @@ int esp_wifi_sta_connect(void);
* Name: esp_wifi_sta_disconnect * Name: esp_wifi_sta_disconnect
* *
* Description: * Description:
* Trigger WiFi station disconnection action * Trigger Wi-Fi station disconnection action
* *
* Input Parameters: * Input Parameters:
* None * None
@@ -334,7 +334,7 @@ int esp_wifi_sta_disconnect(void);
* Name: esp_wifi_sta_mode * Name: esp_wifi_sta_mode
* *
* Description: * Description:
* Set/Get WiFi Station mode code. * Set/Get Wi-Fi Station mode code.
* *
* Input Parameters: * Input Parameters:
* iwr - The argument of the ioctl cmd * iwr - The argument of the ioctl cmd
@@ -460,7 +460,7 @@ int esp_wifi_sta_country(struct iwreq *iwr, bool set);
* Name: esp_wifi_sta_rssi * Name: esp_wifi_sta_rssi
* *
* Description: * Description:
* Get WiFi sensitivity (dBm). * Get Wi-Fi sensitivity (dBm).
* *
* Input Parameters: * Input Parameters:
* iwr - The argument of the ioctl cmd * iwr - The argument of the ioctl cmd
@@ -481,7 +481,7 @@ int esp_wifi_sta_rssi(struct iwreq *iwr, bool set);
* Name: esp_wifi_softap_start * Name: esp_wifi_softap_start
* *
* Description: * Description:
* Start WiFi softAP. * Start Wi-Fi softAP.
* *
* Input Parameters: * Input Parameters:
* None * None
@@ -498,7 +498,7 @@ int esp_wifi_softap_start(void);
* Name: esp_wifi_softap_stop * Name: esp_wifi_softap_stop
* *
* Description: * Description:
* Stop WiFi softAP. * Stop Wi-Fi softAP.
* *
* Input Parameters: * Input Parameters:
* None * None
@@ -515,7 +515,7 @@ int esp_wifi_softap_stop(void);
* Name: esp_wifi_softap_send_data * Name: esp_wifi_softap_send_data
* *
* Description: * Description:
* Use WiFi softAP interface to send 802.3 frame * Use Wi-Fi softAP interface to send 802.3 frame
* *
* Input Parameters: * Input Parameters:
* pbuf - Packet buffer pointer * pbuf - Packet buffer pointer
@@ -533,7 +533,7 @@ int esp_wifi_softap_send_data(void *pbuf, uint32_t len);
* Name: esp_wifi_softap_register_recv_cb * Name: esp_wifi_softap_register_recv_cb
* *
* Description: * Description:
* Regitser WiFi softAP receive packet callback function * Regitser Wi-Fi softAP receive packet callback function
* *
* Input Parameters: * Input Parameters:
* recv_cb - Receive callback function * recv_cb - Receive callback function
@@ -584,7 +584,7 @@ int esp_wifi_softap_read_mac(uint8_t *mac);
* Name: esp_wifi_softap_password * Name: esp_wifi_softap_password
* *
* Description: * Description:
* Set/Get WiFi SoftAP password * Set/Get Wi-Fi SoftAP password
* *
* Input Parameters: * Input Parameters:
* iwr - The argument of the ioctl cmd * iwr - The argument of the ioctl cmd
@@ -602,7 +602,7 @@ int esp_wifi_softap_password(struct iwreq *iwr, bool set);
* Name: esp_wifi_softap_essid * Name: esp_wifi_softap_essid
* *
* Description: * Description:
* Set/Get WiFi SoftAP ESSID * Set/Get Wi-Fi SoftAP ESSID
* *
* Input Parameters: * Input Parameters:
* iwr - The argument of the ioctl cmd * iwr - The argument of the ioctl cmd
@@ -620,7 +620,7 @@ int esp_wifi_softap_essid(struct iwreq *iwr, bool set);
* Name: esp_wifi_softap_bssid * Name: esp_wifi_softap_bssid
* *
* Description: * Description:
* Set/Get WiFi softAP BSSID * Set/Get Wi-Fi softAP BSSID
* *
* Input Parameters: * Input Parameters:
* iwr - The argument of the ioctl cmd * iwr - The argument of the ioctl cmd
@@ -638,7 +638,7 @@ int esp_wifi_softap_bssid(struct iwreq *iwr, bool set);
* Name: esp_wifi_softap_connect * Name: esp_wifi_softap_connect
* *
* Description: * Description:
* Trigger WiFi softAP accept connection action * Trigger Wi-Fi softAP accept connection action
* *
* Input Parameters: * Input Parameters:
* None * None
@@ -655,7 +655,7 @@ int esp_wifi_softap_connect(void);
* Name: esp_wifi_softap_disconnect * Name: esp_wifi_softap_disconnect
* *
* Description: * Description:
* Trigger WiFi softAP drop connection action * Trigger Wi-Fi softAP drop connection action
* *
* Input Parameters: * Input Parameters:
* None * None
@@ -672,7 +672,7 @@ int esp_wifi_softap_disconnect(void);
* Name: esp_wifi_softap_mode * Name: esp_wifi_softap_mode
* *
* Description: * Description:
* Set/Get WiFi SoftAP mode code. * Set/Get Wi-Fi SoftAP mode code.
* *
* Input Parameters: * Input Parameters:
* iwr - The argument of the ioctl cmd * iwr - The argument of the ioctl cmd
@@ -797,7 +797,7 @@ int esp_wifi_softap_country(struct iwreq *iwr, bool set);
* Name: esp_wifi_softap_rssi * Name: esp_wifi_softap_rssi
* *
* Description: * Description:
* Get WiFi sensitivity (dBm). * Get Wi-Fi sensitivity (dBm).
* *
* Input Parameters: * Input Parameters:
* iwr - The argument of the ioctl cmd * iwr - The argument of the ioctl cmd
arch/xtensa/src/esp32/esp32_wifi_utils.c
+2 -2
View File
@@ -72,7 +72,7 @@ enum scan_status_e
ESP_SCAN_DONE ESP_SCAN_DONE
}; };
/* WiFi scan result information */ /* Wi-Fi scan result information */
struct wifi_scan_result struct wifi_scan_result
{ {
@@ -548,7 +548,7 @@ scan_result_full:
* Name: esp_wifi_scan_init * Name: esp_wifi_scan_init
* *
* Description: * Description:
* Initialize ESP32 WiFi scan parameter. * Initialize ESP32 Wi-Fi scan parameter.
* *
* Input Parameters: * Input Parameters:
* None * None
arch/xtensa/src/esp32/esp32_wifi_utils.h
+1 -1
View File
@@ -99,7 +99,7 @@ void esp_wifi_scan_event_parse(void);
* Name: esp_wifi_scan_para * Name: esp_wifi_scan_para
* *
* Description: * Description:
* Initialize ESP32 WiFi scan parameter. * Initialize ESP32 Wi-Fi scan parameter.
* *
* Input Parameters: * Input Parameters:
* None * None
arch/xtensa/src/esp32/esp32_wlan.c
+25 -25
View File
@@ -280,7 +280,7 @@ static int wlan_ioctl(struct net_driver_s *dev, int cmd,
* * wlan_rx_done * * wlan_rx_done
* * wlan_tx_done * * wlan_tx_done
* *
* These functions are called in a WiFi private thread. So we just use * These functions are called in a Wi-Fi private thread. So we just use
* mutex/semaphore instead of disable interrupt, if necessary. * mutex/semaphore instead of disable interrupt, if necessary.
*/ */
@@ -507,7 +507,7 @@ static struct wlan_pktbuf *wlan_txframe(struct wlan_priv_s *priv)
* Name: wlan_transmit * Name: wlan_transmit
* *
* Description: * Description:
* Try to send all TX packets in TX ready queue to WiFi driver. If this * Try to send all TX packets in TX ready queue to Wi-Fi driver. If this
* sending fails, then breaks loop and returns. * sending fails, then breaks loop and returns.
* *
* Input Parameters: * Input Parameters:
@@ -544,7 +544,7 @@ static void wlan_transmit(struct wlan_priv_s *priv)
* Name: wlan_tx_done * Name: wlan_tx_done
* *
* Description: * Description:
* WiFi TX done callback function. If this is called, it means sending * Wi-Fi TX done callback function. If this is called, it means sending
* next packet. * next packet.
* *
* Input Parameters: * Input Parameters:
@@ -566,14 +566,14 @@ static void wlan_tx_done(struct wlan_priv_s *priv)
* Function: wlan_rx_done * Function: wlan_rx_done
* *
* Description: * Description:
* WiFi RX done callback function. If this is called, it means receiving * Wi-Fi RX done callback function. If this is called, it means receiving
* packet. * packet.
* *
* Input Parameters: * Input Parameters:
* priv - Reference to the driver state structure * priv - Reference to the driver state structure
* buffer - WiFi received packet buffer * buffer - Wi-Fi received packet buffer
* len - Length of received packet * len - Length of received packet
* eb - WiFi receive callback input eb pointer * eb - Wi-Fi receive callback input eb pointer
* *
* Returned Value: * Returned Value:
* 0 on success or a negated errno on failure * 0 on success or a negated errno on failure
@@ -1231,7 +1231,7 @@ static int wlan_ifup(struct net_driver_s *dev)
if (ret < 0) if (ret < 0)
{ {
net_unlock(); net_unlock();
nerr("ERROR: Failed to start WiFi ret=%d\n", ret); nerr("ERROR: Failed to start Wi-Fi ret=%d\n", ret);
return ret; return ret;
} }
@@ -1294,7 +1294,7 @@ static int wlan_ifdown(struct net_driver_s *dev)
ret = priv->ops->stop(); ret = priv->ops->stop();
if (ret < 0) if (ret < 0)
{ {
nerr("ERROR: Failed to stop WiFi ret=%d\n", ret); nerr("ERROR: Failed to stop Wi-Fi ret=%d\n", ret);
} }
net_unlock(); net_unlock();
@@ -1708,7 +1708,7 @@ static int esp32_net_initialize(int devno, uint8_t *mac_addr,
priv->ref++; priv->ref++;
ninfo("INFO: Initialize WiFi adapter No.%d success\n", devno); ninfo("INFO: Initialize Wi-Fi adapter No.%d success\n", devno);
return OK; return OK;
} }
@@ -1717,13 +1717,13 @@ static int esp32_net_initialize(int devno, uint8_t *mac_addr,
* Function: wlan_sta_rx_done * Function: wlan_sta_rx_done
* *
* Description: * Description:
* WiFi station RX done callback function. If this is called, it means * Wi-Fi station RX done callback function. If this is called, it means
* station receiveing packet. * station receiveing packet.
* *
* Input Parameters: * Input Parameters:
* buffer - WiFi received packet buffer * buffer - Wi-Fi received packet buffer
* len - Length of received packet * len - Length of received packet
* eb - WiFi receive callback input eb pointer * eb - Wi-Fi receive callback input eb pointer
* *
* Returned Value: * Returned Value:
* 0 on success or a negated errno on failure * 0 on success or a negated errno on failure
@@ -1742,7 +1742,7 @@ static int wlan_sta_rx_done(void *buffer, uint16_t len, void *eb)
* Name: wlan_sta_tx_done * Name: wlan_sta_tx_done
* *
* Description: * Description:
* WiFi station TX done callback function. If this is called, it means * Wi-Fi station TX done callback function. If this is called, it means
* station sending next packet. * station sending next packet.
* *
* Input Parameters: * Input Parameters:
@@ -1768,13 +1768,13 @@ static void wlan_sta_tx_done(uint8_t *data, uint16_t *len, bool status)
* Function: wlan_softap_rx_done * Function: wlan_softap_rx_done
* *
* Description: * Description:
* WiFi softAP RX done callback function. If this is called, it means * Wi-Fi softAP RX done callback function. If this is called, it means
* softAP receiveing packet. * softAP receiveing packet.
* *
* Input Parameters: * Input Parameters:
* buffer - WiFi received packet buffer * buffer - Wi-Fi received packet buffer
* len - Length of received packet * len - Length of received packet
* eb - WiFi receive callback input eb pointer * eb - Wi-Fi receive callback input eb pointer
* *
* Returned Value: * Returned Value:
* 0 on success or a negated errno on failure * 0 on success or a negated errno on failure
@@ -1793,7 +1793,7 @@ static int wlan_softap_rx_done(void *buffer, uint16_t len, void *eb)
* Name: wlan_softap_tx_done * Name: wlan_softap_tx_done
* *
* Description: * Description:
* WiFi softAP TX done callback function. If this is called, it means * Wi-Fi softAP TX done callback function. If this is called, it means
* softAP sending next packet. * softAP sending next packet.
* *
* Input Parameters: * Input Parameters:
@@ -1842,7 +1842,7 @@ int esp32_wlan_sta_initialize(void)
ret = esp_wifi_adapter_init(); ret = esp_wifi_adapter_init();
if (ret < 0) if (ret < 0)
{ {
nerr("ERROR: Initialize WiFi adapter error: %d\n", ret); nerr("ERROR: Initialize Wi-Fi adapter error: %d\n", ret);
return ret; return ret;
} }
@@ -1853,14 +1853,14 @@ int esp32_wlan_sta_initialize(void)
return ret; return ret;
} }
ninfo("WiFi station MAC: %02X:%02X:%02X:%02X:%02X:%02X\n", ninfo("Wi-Fi station MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",
eth_mac[0], eth_mac[1], eth_mac[2], eth_mac[0], eth_mac[1], eth_mac[2],
eth_mac[3], eth_mac[4], eth_mac[5]); eth_mac[3], eth_mac[4], eth_mac[5]);
ret = esp_wifi_scan_init(); ret = esp_wifi_scan_init();
if (ret < 0) if (ret < 0)
{ {
nerr("ERROR: Initialize WiFi scan parameter error: %d\n", ret); nerr("ERROR: Initialize Wi-Fi scan parameter error: %d\n", ret);
return ret; return ret;
} }
@@ -1880,7 +1880,7 @@ int esp32_wlan_sta_initialize(void)
esp_wifi_sta_register_txdone_cb(wlan_sta_tx_done); esp_wifi_sta_register_txdone_cb(wlan_sta_tx_done);
ninfo("INFO: Initialize WiFi station success net\n"); ninfo("INFO: Initialize Wi-Fi station success net\n");
return OK; return OK;
} }
@@ -1909,7 +1909,7 @@ int esp32_wlan_softap_initialize(void)
ret = esp_wifi_adapter_init(); ret = esp_wifi_adapter_init();
if (ret < 0) if (ret < 0)
{ {
nerr("ERROR: Initialize WiFi adapter error: %d\n", ret); nerr("ERROR: Initialize Wi-Fi adapter error: %d\n", ret);
return ret; return ret;
} }
@@ -1920,14 +1920,14 @@ int esp32_wlan_softap_initialize(void)
return ret; return ret;
} }
ninfo("WiFi softAP MAC: %02X:%02X:%02X:%02X:%02X:%02X\n", ninfo("Wi-Fi softAP MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",
eth_mac[0], eth_mac[1], eth_mac[2], eth_mac[0], eth_mac[1], eth_mac[2],
eth_mac[3], eth_mac[4], eth_mac[5]); eth_mac[3], eth_mac[4], eth_mac[5]);
ret = esp_wifi_scan_init(); ret = esp_wifi_scan_init();
if (ret < 0) if (ret < 0)
{ {
nerr("ERROR: Initialize WiFi scan parameter error: %d\n", ret); nerr("ERROR: Initialize Wi-Fi scan parameter error: %d\n", ret);
return ret; return ret;
} }
@@ -1948,7 +1948,7 @@ int esp32_wlan_softap_initialize(void)
esp_wifi_softap_register_txdone_cb(wlan_softap_tx_done); esp_wifi_softap_register_txdone_cb(wlan_softap_tx_done);
ninfo("INFO: Initialize WiFi softAP net success\n"); ninfo("INFO: Initialize Wi-Fi softAP net success\n");
return OK; return OK;
} }
arch/xtensa/src/esp32/hardware/esp32_soc.h
+4 -4
View File
@@ -295,9 +295,9 @@
* This table is decided by hardware, don't touch this. * This table is decided by hardware, don't touch this.
*/ */
#define ETS_WIFI_MAC_INTR_SOURCE 0 /* Interrupt of WiFi MAC, level */ #define ETS_WIFI_MAC_INTR_SOURCE 0 /* Interrupt of Wi-Fi MAC, level */
#define ETS_WIFI_MAC_NMI_SOURCE 1 /* Interrupt of WiFi MAC, NMI, use if MAC have bug to fix in NMI */ #define ETS_WIFI_MAC_NMI_SOURCE 1 /* Interrupt of Wi-Fi MAC, NMI, use if MAC have bug to fix in NMI */
#define ETS_WIFI_BB_INTR_SOURCE 2 /* Interrupt of WiFi BB, level, we can do some calibartion */ #define ETS_WIFI_BB_INTR_SOURCE 2 /* Interrupt of Wi-Fi BB, level, we can do some calibartion */
#define ETS_BT_MAC_INTR_SOURCE 3 /* will be cancelled */ #define ETS_BT_MAC_INTR_SOURCE 3 /* will be cancelled */
#define ETS_BT_BB_INTR_SOURCE 4 /* Interrupt of BT BB, level */ #define ETS_BT_BB_INTR_SOURCE 4 /* Interrupt of BT BB, level */
#define ETS_BT_BB_NMI_SOURCE 5 /* Interrupt of BT BB, NMI, use if BB have bug to fix in NMI */ #define ETS_BT_BB_NMI_SOURCE 5 /* Interrupt of BT BB, NMI, use if BB have bug to fix in NMI */
@@ -738,7 +738,7 @@ extern int rom_i2c_writereg(int block, int block_id, int reg_add,
#define BB_DC_EST_FORCE_PD_V 1 #define BB_DC_EST_FORCE_PD_V 1
#define BB_DC_EST_FORCE_PD_S 0 #define BB_DC_EST_FORCE_PD_S 0
/* Some of the WiFi RX control registers. /* Some of the Wi-Fi RX control registers.
* PU/PD fields defined here are used in sleep related functions. * PU/PD fields defined here are used in sleep related functions.
*/ */
arch/xtensa/src/esp32s2/Kconfig
+14 -14
View File
@@ -779,11 +779,11 @@ config SPIRAM_BANKSWITCH_RESERVE
endmenu #SPI RAM Config endmenu #SPI RAM Config
menu "WiFi configuration" menu "Wi-Fi configuration"
depends on ESP32S2_WIRELESS depends on ESP32S2_WIRELESS
choice choice
prompt "ESP32-S2 WiFi mode" prompt "ESP32-S2 Wi-Fi mode"
default ESP32S2_WIFI_STATION default ESP32S2_WIFI_STATION
config ESP32S2_WIFI_STATION config ESP32S2_WIFI_STATION
@@ -795,30 +795,30 @@ config ESP32S2_WIFI_SOFTAP
config ESP32S2_WIFI_STATION_SOFTAP_COEXISTENCE config ESP32S2_WIFI_STATION_SOFTAP_COEXISTENCE
bool "Station + SoftAP coexistence" bool "Station + SoftAP coexistence"
endchoice # ESP32S2 WiFi mode endchoice # ESP32S2 Wi-Fi mode
config ESP32S2_WIFI_STATIC_RXBUF_NUM config ESP32S2_WIFI_STATIC_RXBUF_NUM
int "WiFi static RX buffer number" int "Wi-Fi static RX buffer number"
default 10 default 10
config ESP32S2_WIFI_DYNAMIC_RXBUF_NUM config ESP32S2_WIFI_DYNAMIC_RXBUF_NUM
int "WiFi dynamic RX buffer number" int "Wi-Fi dynamic RX buffer number"
default 32 default 32
config ESP32S2_WIFI_DYNAMIC_TXBUF_NUM config ESP32S2_WIFI_DYNAMIC_TXBUF_NUM
int "WiFi dynamic TX buffer number" int "Wi-Fi dynamic TX buffer number"
default 32 default 32
config ESP32S2_WIFI_TX_AMPDU config ESP32S2_WIFI_TX_AMPDU
bool "WiFi TX AMPDU" bool "Wi-Fi TX AMPDU"
default y default y
config ESP32S2_WIFI_RX_AMPDU config ESP32S2_WIFI_RX_AMPDU
bool "WiFi RX AMPDU" bool "Wi-Fi RX AMPDU"
default y default y
config ESP32S2_WIFI_RXBA_AMPDU_WZ config ESP32S2_WIFI_RXBA_AMPDU_WZ
int "WiFi RX BA AMPDU windown size" int "Wi-Fi RX BA AMPDU windown size"
default 6 default 6
config ESP32S2_WLAN_PKTBUF_NUM config ESP32S2_WLAN_PKTBUF_NUM
@@ -838,10 +838,10 @@ config ESP32S2_WIFI_SCAN_RESULT_SIZE
Maximum scan result buffer size. Maximum scan result buffer size.
config ESP32S2_WIFI_SAVE_PARAM config ESP32S2_WIFI_SAVE_PARAM
bool "Save WiFi Parameters" bool "Save Wi-Fi Parameters"
default n default n
---help--- ---help---
If you enable this option, WiFi adapter parameters will be saved If you enable this option, Wi-Fi adapter parameters will be saved
into the file system instead of computing them each time. into the file system instead of computing them each time.
These parameters mainly contains: These parameters mainly contains:
@@ -851,14 +851,14 @@ config ESP32S2_WIFI_SAVE_PARAM
- PMK(compute when connecting) - PMK(compute when connecting)
- Author mode - Author mode
- MAC address - MAC address
- WiFi hardware configuration parameters - Wi-Fi hardware configuration parameters
config ESP32S2_WIFI_FS_MOUNTPT config ESP32S2_WIFI_FS_MOUNTPT
string "Save WiFi Parameters" string "Save Wi-Fi Parameters"
default "/mnt/esp/wifi" default "/mnt/esp/wifi"
depends on ESP32S2_WIFI_SAVE_PARAM depends on ESP32S2_WIFI_SAVE_PARAM
---help--- ---help---
Mount point of WiFi storage file system. Mount point of Wi-Fi storage file system.
endmenu # ESP32S2_WIRELESS endmenu # ESP32S2_WIRELESS
arch/xtensa/src/esp32s2/esp32s2_rng.c
+1 -1
View File
@@ -96,7 +96,7 @@ uint32_t IRAM_ATTR esp_random(void)
{ {
/* The PRNG which implements WDEV_RANDOM register gets 2 bits /* The PRNG which implements WDEV_RANDOM register gets 2 bits
* of extra entropy from a hardware randomness source every APB clock cycle * of extra entropy from a hardware randomness source every APB clock cycle
* (provided WiFi or BT are enabled). To make sure entropy is not drained * (provided Wi-Fi or BT are enabled). To make sure entropy is not drained
* faster than it is added, this function needs to wait for at least 16 APB * faster than it is added, this function needs to wait for at least 16 APB
* clock cycles after reading previous word. This implementation may * clock cycles after reading previous word. This implementation may
* actually wait a bit longer due to extra time spent in arithmetic and * actually wait a bit longer due to extra time spent in arithmetic and
arch/xtensa/src/esp32s2/hardware/esp32s2_soc.h
+1 -1
View File
@@ -647,7 +647,7 @@ extern void rom_i2c_writereg_mask(uint8_t block, uint8_t host_id,
#define BB_DC_EST_FORCE_PD_V 1 #define BB_DC_EST_FORCE_PD_V 1
#define BB_DC_EST_FORCE_PD_S 0 #define BB_DC_EST_FORCE_PD_S 0
/* Some of the WiFi RX control registers. /* Some of the Wi-Fi RX control registers.
* PU/PD fields defined here are used in sleep related functions. * PU/PD fields defined here are used in sleep related functions.
*/ */
boards/xtensa/esp32/common/src/esp32_board_wlan.c
+2 -2
View File
@@ -68,7 +68,7 @@ int board_wlan_init(void)
ret = esp32_wlan_sta_initialize(); ret = esp32_wlan_sta_initialize();
if (ret) if (ret)
{ {
wlerr("ERROR: Failed to initialize WiFi station\n"); wlerr("ERROR: Failed to initialize Wi-Fi station\n");
return ret; return ret;
} }
#endif #endif
@@ -77,7 +77,7 @@ int board_wlan_init(void)
ret = esp32_wlan_softap_initialize(); ret = esp32_wlan_softap_initialize();
if (ret) if (ret)
{ {
wlerr("ERROR: Failed to initialize WiFi softAP\n"); wlerr("ERROR: Failed to initialize Wi-Fi softAP\n");
return ret; return ret;
} }
#endif #endif