sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/platforms/xtensa/esp32/boards/esp32-devkitc/index.rst
View File

@ -119,7 +119,7 @@ USB connection by means of CP2102 converter, at 115200 bps).
wapi
----
Enables WiFi support. You can define your credentials this way::
Enables Wi-Fi support. You can define your credentials this way::
$ make menuconfig
-> Application Configuration

8
Documentation/platforms/xtensa/esp32/index.rst
View File

@ -4,7 +4,7 @@ Espressif ESP32
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
for Bluetooth and WiFi.
for Bluetooth and Wi-Fi.
All embedded memory, external memory and peripherals are located on the
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.
WiFi
Wi-Fi
====
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
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

4
arch/risc-v/src/esp32c3/esp32c3_pm.c
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_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, 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);
modifyreg32(SYSTEM_BT_LPCK_DIV_FRAC_REG, SYSTEM_LPCLK_SEL_8M,

2
arch/risc-v/src/esp32c3/esp32c3_rng.c
View File

@ -93,7 +93,7 @@ uint32_t IRAM_ATTR esp_random(void)
{
/* The PRNG which implements WDEV_RANDOM register gets 2 bits
* 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
* clock cycles after reading previous word. This implementation may
* actually wait a bit longer due to extra time spent in arithmetic and

8
arch/risc-v/src/esp32c3/esp32c3_rtc.c
View File

@ -281,9 +281,9 @@ struct esp32c3_rtc_sleep_pu_config_s
* CPU 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 nrx_fpu : 1; /* Set to 1 to power UP WiFi in sleep */
uint32_t fe_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 Wi-Fi 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 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_slowmem_pd_en : 1; /* power down RTC slow memory */
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 cpu_pd_en : 1; /* power down CPU, but not
* restart when lightsleep.

28
arch/xtensa/src/esp32/Kconfig
View File

@ -1048,11 +1048,11 @@ config ESP32_ETH_PHY_ADDR
endmenu # ESP32_EMAC
menu "WiFi configuration"
menu "Wi-Fi configuration"
depends on ESP32_WIRELESS
choice
prompt "ESP32 WiFi mode"
prompt "ESP32 Wi-Fi mode"
default ESP32_WIFI_STATION
config ESP32_WIFI_STATION
@ -1064,30 +1064,30 @@ config ESP32_WIFI_SOFTAP
config ESP32_WIFI_STATION_SOFTAP_COEXISTENCE
bool "Station + SoftAP coexistence"
endchoice # ESP32 WiFi mode
endchoice # ESP32 Wi-Fi mode
config ESP32_WIFI_STATIC_RXBUF_NUM
int "WiFi static RX buffer number"
int "Wi-Fi static RX buffer number"
default 10
config ESP32_WIFI_DYNAMIC_RXBUF_NUM
int "WiFi dynamic RX buffer number"
int "Wi-Fi dynamic RX buffer number"
default 32
config ESP32_WIFI_DYNAMIC_TXBUF_NUM
int "WiFi dynamic TX buffer number"
int "Wi-Fi dynamic TX buffer number"
default 32
config ESP32_WIFI_TX_AMPDU
bool "WiFi TX AMPDU"
bool "Wi-Fi TX AMPDU"
default y
config ESP32_WIFI_RX_AMPDU
bool "WiFi RX AMPDU"
bool "Wi-Fi RX AMPDU"
default y
config ESP32_WIFI_RXBA_AMPDU_WZ
int "WiFi RX BA AMPDU windown size"
int "Wi-Fi RX BA AMPDU windown size"
default 6
config ESP32_WLAN_PKTBUF_NUM
@ -1107,11 +1107,11 @@ config ESP32_WIFI_SCAN_RESULT_SIZE
Maximum scan result buffer size.
config ESP32_WIFI_SAVE_PARAM
bool "Save WiFi Parameters"
bool "Save Wi-Fi Parameters"
default n
depends on ESP32_SPIFLASH
---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.
These parameters mainly contains:
@ -1121,14 +1121,14 @@ config ESP32_WIFI_SAVE_PARAM
- PMK(compute when connecting)
- Author mode
- MAC address
- WiFi hardware configuration parameters
- Wi-Fi hardware configuration parameters
config ESP32_WIFI_FS_MOUNTPT
string "Save WiFi Parameters"
string "Save Wi-Fi Parameters"
default "/mnt/esp/wifi"
depends on ESP32_WIFI_SAVE_PARAM
---help---
Mount point of WiFi storage file system.
Mount point of Wi-Fi storage file system.
config ESP32_WIFI_MTD_OFFSET
hex "Wi-Fi MTD partition offset"

8
arch/xtensa/src/esp32/esp32_ble_adapter.c
View File

@ -854,13 +854,13 @@ static void esp32_ints_on(uint32_t mask)
* Name: is_wifi_clk_peripheral
*
* Description:
* Checks if the peripheral module needs WiFi Clock.
* Checks if the peripheral module needs Wi-Fi Clock.
*
* Input Parameters:
* periph - The peripheral module
*
* 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
*
* Description:
* Request a WiFi/BLE Coex wakeup request
* Request a Wi-Fi/BLE Coex wakeup request
*
* Input Parameters:
* none
@ -2832,7 +2832,7 @@ static bool coex_bt_wakeup_request(void)
* Name: coex_bt_wakeup_request_end
*
* Description:
* Finish WiFi/BLE Coex wakeup request
* Finish Wi-Fi/BLE Coex wakeup request
*
* Input Parameters:
* none

2
arch/xtensa/src/esp32/esp32_rng.c
View File

@ -94,7 +94,7 @@ uint32_t IRAM_ATTR esp_random(void)
{
/* The PRNG which implements WDEV_RANDOM register gets 2 bits
* 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
* clock cycles after reading previous word. This implementation may
* actually wait a bit longer due to extra time spent in arithmetic and

8
arch/xtensa/src/esp32/esp32_rtc.c
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_slowmem_pd_en : 1; /* power down RTC slow memory */
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 deep_slp : 1; /* power down digital domain */
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 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 bb_pd : 1; /* Set to 1 to power down WiFi in sleep */
uint32_t nrx_pd : 1; /* Set to 1 to power down WiFi in sleep */
uint32_t fe_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 Wi-Fi in sleep */
uint32_t fe_pd : 1; /* Set to 1 to power down Wi-Fi in sleep */
};
#ifdef CONFIG_RTC_DRIVER

246
arch/xtensa/src/esp32/esp32_wifi_adapter.c
View File

@ -117,7 +117,7 @@
* Private Types
****************************************************************************/
/* WiFi Station state */
/* Wi-Fi Station state */
enum wifi_sta_state
{
@ -128,7 +128,7 @@ enum wifi_sta_state
WIFI_STA_STATE_STOP
};
/* WiFi SoftAP state */
/* Wi-Fi SoftAP state */
enum wifi_softap_state
{
@ -137,7 +137,7 @@ enum wifi_softap_state
WIFI_SOFTAP_STATE_STOP
};
/* WiFi interrupt adapter private data */
/* Wi-Fi interrupt adapter private data */
struct irq_adpt
{
@ -145,7 +145,7 @@ struct irq_adpt
void *arg; /* Interrupt private data */
};
/* WiFi message queue private data */
/* Wi-Fi message queue private data */
struct mq_adpt
{
@ -154,7 +154,7 @@ struct mq_adpt
char name[16]; /* Message queue name */
};
/* WiFi time private data */
/* Wi-Fi time private data */
struct time_adpt
{
@ -162,7 +162,7 @@ struct time_adpt
suseconds_t usec; /* Micro second value */
};
/* WiFi timer private data */
/* Wi-Fi timer private data */
struct timer_adpt
{
@ -177,7 +177,7 @@ struct timer_adpt
void *priv; /* Timer private data */
};
/* WiFi event private data */
/* Wi-Fi event private data */
struct evt_adpt
{
@ -186,7 +186,7 @@ struct evt_adpt
uint8_t buf[0]; /* Event private data */
};
/* WiFi event notification private data */
/* Wi-Fi event notification private data */
struct wifi_notify
{
@ -196,7 +196,7 @@ struct wifi_notify
struct sigwork_s work; /* Signal work private data */
};
/* WiFi NVS private data */
/* Wi-Fi NVS private data */
struct nvs_adpt
{
@ -366,12 +366,12 @@ void intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num);
* Private Data
****************************************************************************/
/* WiFi thread private data */
/* Wi-Fi thread private data */
static pthread_key_t g_wifi_thread_key;
static bool g_wifi_tkey_init;
/* WiFi sleep private data */
/* Wi-Fi sleep private data */
static uint32_t g_phy_clk_en_cnt;
@ -385,18 +385,18 @@ static int64_t g_phy_rf_en_ts;
static uint32_t g_common_clock_disable_time;
/* WiFi event private data */
/* Wi-Fi event private data */
static struct work_s g_wifi_evt_work;
static sq_queue_t g_wifi_evt_queue;
static struct wifi_notify g_wifi_notify[WIFI_ADPT_EVT_MAX];
static sem_t g_wifiexcl_sem = SEM_INITIALIZER(1);
/* Callback function to update WiFi MAC time */
/* Callback function to update Wi-Fi MAC time */
wifi_mac_time_update_cb_t g_wifi_mac_time_update_cb;
/* WiFi adapter reference */
/* Wi-Fi adapter reference */
static int g_wifi_ref;
@ -406,26 +406,26 @@ static int g_wifi_ref;
static bool g_sta_reconnect;
/* If WiFi sta starts */
/* If Wi-Fi sta starts */
static bool g_sta_started;
/* If WiFi sta connected */
/* If Wi-Fi sta connected */
static bool g_sta_connected;
/* WiFi station TX done callback function */
/* Wi-Fi station TX done callback function */
static wifi_txdone_cb_t g_sta_txdone_cb;
#endif
#ifdef ESP32_WLAN_HAS_SOFTAP
/* If WiFi SoftAP starts */
/* If Wi-Fi SoftAP starts */
static bool g_softap_started;
/* WiFi SoftAP TX done callback function */
/* Wi-Fi SoftAP TX done callback function */
static wifi_txdone_cb_t g_softap_txdone_cb;
#endif
@ -438,7 +438,7 @@ static spinlock_t g_lock;
* Public Data
****************************************************************************/
/* WiFi OS adapter data */
/* Wi-Fi OS adapter data */
wifi_osi_funcs_t g_wifi_osi_funcs =
{
@ -563,11 +563,11 @@ wifi_osi_funcs_t g_wifi_osi_funcs =
._magic = ESP_WIFI_OS_ADAPTER_MAGIC,
};
/* WiFi feature capacity data */
/* Wi-Fi feature capacity data */
uint64_t g_wifi_feature_caps = CONFIG_FEATURE_WPA3_SAE_BIT;
/* WiFi TAG string data */
/* Wi-Fi TAG string data */
ESP_EVENT_DEFINE_BASE(WIFI_EVENT);
@ -579,13 +579,13 @@ ESP_EVENT_DEFINE_BASE(WIFI_EVENT);
* Name: osi_errno_trans
*
* Description:
* Transform from nuttx Os error code to WiFi adapter error code
* Transform from nuttx Os error code to Wi-Fi adapter error code
*
* Input Parameters:
* ret - NuttX error code
*
* Returned Value:
* WiFi adapter error code
* Wi-Fi adapter error code
*
****************************************************************************/
@ -605,10 +605,10 @@ static inline int32_t osi_errno_trans(int ret)
* Name: osi_errno_trans
*
* Description:
* Transform from ESP WiFi error code to NuttX error code
* Transform from ESP Wi-Fi error code to NuttX error code
*
* Input Parameters:
* ret - ESP WiFi error code
* ret - ESP Wi-Fi error code
*
* Returned Value:
* NuttX error code
@ -669,7 +669,7 @@ static int32_t wifi_errno_trans(int ret)
* Name: esp_int_adpt_cb
*
* Description:
* WiFi interrupt adapter callback function
* Wi-Fi interrupt adapter callback function
*
* Input Parameters:
* arg - interrupt adapter private data
@ -761,7 +761,7 @@ static int esp_wifi_lock(bool lock)
ret = nxsem_wait_uninterruptible(&g_wifiexcl_sem);
if (ret < 0)
{
wlinfo("Failed to lock WiFi ret=%d\n", ret);
wlinfo("Failed to lock Wi-Fi ret=%d\n", ret);
}
}
else
@ -769,7 +769,7 @@ static int esp_wifi_lock(bool lock)
ret = nxsem_post(&g_wifiexcl_sem);
if (ret < 0)
{
wlinfo("Failed to unlock WiFi ret=%d\n", ret);
wlinfo("Failed to unlock Wi-Fi ret=%d\n", ret);
}
}
@ -834,7 +834,7 @@ static void esp_set_isr(int32_t n, void *f, void *arg)
* Name: esp32_ints_on
*
* Description:
* Enable WiFi interrupt
* Enable Wi-Fi interrupt
*
* Input Parameters:
* mask - No mean
@ -857,7 +857,7 @@ static void esp32_ints_on(uint32_t mask)
* Name: esp32_ints_off
*
* Description:
* Disable WiFi interrupt
* Disable Wi-Fi interrupt
*
* Input Parameters:
* mask - No mean
@ -1488,7 +1488,7 @@ static int32_t esp_queue_send_generic(void *queue, void *item,
if (ticks == OSI_FUNCS_TIME_BLOCKING || ticks == 0)
{
/* WiFi interrupt function will call this adapter function to send
/* Wi-Fi interrupt function will call this adapter function to send
* message to message queue, so here we should call kernel API
* instead of application API
*/
@ -2030,13 +2030,13 @@ static void esp_free(void *ptr)
* Name: esp_event_id_map
*
* Description:
* Transform from esp-idf event ID to WiFi adapter event ID
* Transform from esp-idf event ID to Wi-Fi adapter event ID
*
* Input Parameters:
* event_id - esp-idf event ID
*
* Returned Value:
* WiFi adapter event ID
* Wi-Fi adapter event ID
*
****************************************************************************/
@ -2119,7 +2119,7 @@ static void esp_evt_work_cb(void *arg)
#ifdef ESP32_WLAN_HAS_STA
case WIFI_ADPT_EVT_STA_START:
wlinfo("WiFi sta start\n");
wlinfo("Wi-Fi sta start\n");
g_sta_connected = false;
ret = esp_wifi_set_ps(DEFAULT_PS_MODE);
if (ret)
@ -2129,12 +2129,12 @@ static void esp_evt_work_cb(void *arg)
break;
case WIFI_ADPT_EVT_STA_CONNECT:
wlinfo("WiFi sta connect\n");
wlinfo("Wi-Fi sta connect\n");
g_sta_connected = true;
break;
case WIFI_ADPT_EVT_STA_DISCONNECT:
wlinfo("WiFi sta disconnect\n");
wlinfo("Wi-Fi sta disconnect\n");
g_sta_connected = false;
if (g_sta_reconnect)
{
@ -2147,7 +2147,7 @@ static void esp_evt_work_cb(void *arg)
break;
case WIFI_ADPT_EVT_STA_STOP:
wlinfo("WiFi sta stop\n");
wlinfo("Wi-Fi sta stop\n");
g_sta_connected = false;
break;
#endif
@ -2215,7 +2215,7 @@ static void wifi_set_intr(int32_t cpu_no, uint32_t intr_source,
", intr_num=%" PRIu32 ", intr_prio=%" PRId32 "\n",
cpu_no, intr_source, intr_num, intr_prio);
/* Force to bind WiFi interrupt to CPU0 */
/* Force to bind Wi-Fi interrupt to CPU0 */
intr_matrix_set(0, intr_source, intr_num);
}
@ -2378,7 +2378,7 @@ static void wifi_apb80m_release(void)
* Name: phy_update_wifi_mac_time
*
* Description:
* Update WiFi mac timer.
* Update Wi-Fi mac timer.
*
* Input Parameters:
* en_clock_stopped - Check if clock is stopped
@ -2437,13 +2437,13 @@ static void wifi_phy_disable(void)
phy_close_rf();
/* Update WiFi MAC time before disabling it.
* WiFi/BT common peripheral clock.
/* Update Wi-Fi MAC time before disabling it.
* Wi-Fi/BT common peripheral clock.
*/
phy_update_wifi_mac_time(true, esp_timer_get_time());
/* Disable WiFi/BT common peripheral clock.
/* Disable Wi-Fi/BT common peripheral clock.
* Do not disable clock for hardware RNG.
*/
@ -2487,7 +2487,7 @@ static void wifi_phy_enable(void)
g_phy_rf_en_ts = esp_timer_get_time();
/* Update WiFi MAC time before WiFi/BT common clock is enabled */
/* Update Wi-Fi MAC time before Wi-Fi/BT common clock is enabled */
phy_update_wifi_mac_time(false, g_phy_rf_en_ts);
esp_phy_enable_clock();
@ -2853,7 +2853,7 @@ static void esp_timer_arm_us(void *ptimer, uint32_t us, bool repeat)
* Name: wifi_reset_mac
*
* Description:
* Reset WiFi hardware MAC
* Reset Wi-Fi hardware MAC
*
* Input Parameters:
* None
@ -3836,14 +3836,14 @@ static void *esp_wifi_zalloc(size_t size)
* Name: esp_wifi_create_queue
*
* Description:
* Create WiFi static message queue
* Create Wi-Fi static message queue
*
* Input Parameters:
* queue_len - queue message number
* item_size - message size
*
* Returned Value:
* WiFi static message queue data pointer
* Wi-Fi static message queue data pointer
*
****************************************************************************/
@ -3873,10 +3873,10 @@ static void *esp_wifi_create_queue(int32_t queue_len, int32_t item_size)
* Name: esp_wifi_delete_queue
*
* Description:
* Delete WiFi static message queue
* Delete Wi-Fi static message queue
*
* Input Parameters:
* queue - WiFi static message queue data pointer
* queue - Wi-Fi static message queue data pointer
*
* Returned Value:
* None
@ -4152,7 +4152,7 @@ static unsigned long esp_random_ulong(void)
* Name: esp_wifi_tx_done_cb
*
* Description:
* WiFi TX done callback function.
* Wi-Fi TX done callback function.
*
****************************************************************************/
@ -4288,13 +4288,13 @@ static int esp_wifi_cipher_trans(uint32_t wifi_cipher)
* Name: esp_freq_to_channel
*
* Description:
* Converts WiFi frequency to channel.
* Converts Wi-Fi frequency to channel.
*
* Input Parameters:
* freq - WiFi frequency
* freq - Wi-Fi frequency
*
* Returned Value:
* WiFi channel
* Wi-Fi channel
*
****************************************************************************/
@ -4701,7 +4701,7 @@ int32_t esp_event_send_internal(esp_event_base_t event_base,
* Name: esp_wifi_init
*
* Description:
* Initialize WiFi
* Initialize Wi-Fi
*
* Input Parameters:
* config - Initialization config parameters
@ -4718,7 +4718,7 @@ int32_t esp_wifi_init(const wifi_init_config_t *config)
ret = esp_wifi_init_internal(config);
if (ret)
{
wlerr("Failed to initialize WiFi error=%d\n", ret);
wlerr("Failed to initialize Wi-Fi error=%d\n", ret);
return ret;
}
@ -4737,7 +4737,7 @@ int32_t esp_wifi_init(const wifi_init_config_t *config)
* Name: esp_wifi_deinit
*
* Description:
* Deinitialize WiFi and free resource
* Deinitialize Wi-Fi and free resource
*
* Input Parameters:
* None
@ -4761,7 +4761,7 @@ int32_t esp_wifi_deinit(void)
ret = esp_wifi_deinit_internal();
if (ret != 0)
{
wlerr("Failed to deinitialize WiFi\n");
wlerr("Failed to deinitialize Wi-Fi\n");
return ret;
}
@ -4772,10 +4772,10 @@ int32_t esp_wifi_deinit(void)
* Name: esp_wifi_free_eb
*
* Description:
* Free WiFi receive callback input eb pointer
* Free Wi-Fi receive callback input eb pointer
*
* Input Parameters:
* eb - WiFi receive callback input eb pointer
* eb - Wi-Fi receive callback input eb pointer
*
* Returned Value:
* None
@ -4882,7 +4882,7 @@ int esp_wifi_notify_subscribe(pid_t pid, struct sigevent *event)
* Name: esp_wifi_adapter_init
*
* Description:
* Initialize ESP32 WiFi adapter
* Initialize ESP32 Wi-Fi adapter
*
* Input Parameters:
* None
@ -4901,7 +4901,7 @@ int esp_wifi_adapter_init(void)
if (g_wifi_ref)
{
wlinfo("WiFi adapter is already initialized\n");
wlinfo("Wi-Fi adapter is already initialized\n");
g_wifi_ref++;
esp_wifi_lock(false);
return OK;
@ -4941,7 +4941,7 @@ int esp_wifi_adapter_init(void)
ret = esp_wifi_init(&wifi_cfg);
if (ret)
{
wlerr("Failed to initialize WiFi error=%d\n", ret);
wlerr("Failed to initialize Wi-Fi error=%d\n", ret);
ret = wifi_errno_trans(ret);
goto errout_init_wifi;
}
@ -4956,7 +4956,7 @@ int esp_wifi_adapter_init(void)
g_wifi_ref++;
wlinfo("OK to initialize WiFi adapter\n");
wlinfo("OK to initialize Wi-Fi adapter\n");
esp_wifi_lock(false);
@ -4980,7 +4980,7 @@ errout_init_wifi:
* Name: esp_wifi_sta_start
*
* Description:
* Start WiFi station.
* Start Wi-Fi station.
*
* Input Parameters:
* None
@ -5001,7 +5001,7 @@ int esp_wifi_sta_start(void)
ret = esp_wifi_stop();
if (ret)
{
wlinfo("Failed to stop WiFi ret=%d\n", ret);
wlinfo("Failed to stop Wi-Fi ret=%d\n", ret);
}
#ifdef ESP32_WLAN_HAS_SOFTAP
@ -5016,7 +5016,7 @@ int esp_wifi_sta_start(void)
ret = esp_wifi_set_mode(mode);
if (ret)
{
wlerr("Failed to set WiFi mode=%d ret=%d\n", mode, ret);
wlerr("Failed to set Wi-Fi mode=%d ret=%d\n", mode, ret);
ret = wifi_errno_trans(ret);
goto errout_set_mode;
}
@ -5024,14 +5024,14 @@ int esp_wifi_sta_start(void)
ret = esp_wifi_start();
if (ret)
{
wlerr("Failed to start WiFi with mode=%d ret=%d\n", mode, ret);
wlerr("Failed to start Wi-Fi with mode=%d ret=%d\n", mode, ret);
ret = wifi_errno_trans(ret);
goto errout_set_mode;
}
g_sta_started = true;
wlinfo("OK to start WiFi station\n");
wlinfo("OK to start Wi-Fi station\n");
esp_wifi_lock(false);
return OK;
@ -5045,7 +5045,7 @@ errout_set_mode:
* Name: esp_wifi_sta_stop
*
* Description:
* Stop WiFi station.
* Stop Wi-Fi station.
*
* Input Parameters:
* None
@ -5065,7 +5065,7 @@ int esp_wifi_sta_stop(void)
ret = esp_wifi_stop();
if (ret)
{
wlinfo("Failed to stop WiFi ret=%d\n", ret);
wlinfo("Failed to stop Wi-Fi ret=%d\n", ret);
}
g_sta_started = false;
@ -5076,7 +5076,7 @@ int esp_wifi_sta_stop(void)
ret = esp_wifi_set_mode(WIFI_MODE_AP);
if (ret)
{
wlerr("Failed to set WiFi AP mode ret=%d\n", ret);
wlerr("Failed to set Wi-Fi AP mode ret=%d\n", ret);
ret = wifi_errno_trans(ret);
goto errout_set_mode;
}
@ -5084,14 +5084,14 @@ int esp_wifi_sta_stop(void)
ret = esp_wifi_start();
if (ret)
{
wlerr("Failed to start WiFi AP ret=%d\n", ret);
wlerr("Failed to start Wi-Fi AP ret=%d\n", ret);
ret = wifi_errno_trans(ret);
goto errout_set_mode;
}
}
#endif
wlinfo("OK to stop WiFi station\n");
wlinfo("OK to stop Wi-Fi station\n");
esp_wifi_lock(false);
return OK;
@ -5107,7 +5107,7 @@ errout_set_mode:
* Name: esp_wifi_sta_send_data
*
* Description:
* Use WiFi station interface to send 802.3 frame
* Use Wi-Fi station interface to send 802.3 frame
*
* Input Parameters:
* pbuf - Packet buffer pointer
@ -5132,7 +5132,7 @@ int esp_wifi_sta_send_data(void *pbuf, uint32_t len)
* Name: esp_wifi_sta_register_recv_cb
*
* Description:
* Register WiFi station receive packet callback function
* Register Wi-Fi station receive packet callback function
*
* Input Parameters:
* recv_cb - Receive callback function
@ -5196,7 +5196,7 @@ int esp_wifi_sta_read_mac(uint8_t *mac)
* Name: esp_wifi_set_password
*
* Description:
* Set/Get WiFi station password
* Set/Get Wi-Fi station password
*
* Input Parameters:
* iwr - The argument of the ioctl cmd
@ -5233,7 +5233,7 @@ int esp_wifi_sta_password(struct iwreq *iwr, bool set)
ret = esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg);
if (ret)
{
wlerr("Failed to get WiFi config data ret=%d\n", ret);
wlerr("Failed to get Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
@ -5248,7 +5248,7 @@ int esp_wifi_sta_password(struct iwreq *iwr, bool set)
ret = esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg);
if (ret)
{
wlerr("Failed to set WiFi config data ret=%d\n", ret);
wlerr("Failed to set Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
}
@ -5311,7 +5311,7 @@ int esp_wifi_sta_password(struct iwreq *iwr, bool set)
#ifdef CONFIG_DEBUG_WIRELESS_INFO
memcpy(buf, pdata, len);
buf[len] = 0;
wlinfo("WiFi station password=%s len=%d\n", buf, len);
wlinfo("Wi-Fi station password=%s len=%d\n", buf, len);
#endif
return OK;
@ -5321,7 +5321,7 @@ int esp_wifi_sta_password(struct iwreq *iwr, bool set)
* Name: esp_wifi_sta_essid
*
* Description:
* Set/Get WiFi station ESSID
* Set/Get Wi-Fi station ESSID
*
* Input Parameters:
* iwr - The argument of the ioctl cmd
@ -5358,7 +5358,7 @@ int esp_wifi_sta_essid(struct iwreq *iwr, bool set)
ret = esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg);
if (ret)
{
wlerr("Failed to get WiFi config data ret=%d\n", ret);
wlerr("Failed to get Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
@ -5370,7 +5370,7 @@ int esp_wifi_sta_essid(struct iwreq *iwr, bool set)
ret = esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg);
if (ret)
{
wlerr("Failed to set WiFi config data ret=%d\n", ret);
wlerr("Failed to set Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
}
@ -5400,7 +5400,7 @@ int esp_wifi_sta_essid(struct iwreq *iwr, bool set)
#ifdef CONFIG_DEBUG_WIRELESS_INFO
memcpy(buf, pdata, len);
buf[len] = 0;
wlinfo("WiFi station ssid=%s len=%d\n", buf, len);
wlinfo("Wi-Fi station ssid=%s len=%d\n", buf, len);
#endif
return OK;
@ -5410,7 +5410,7 @@ int esp_wifi_sta_essid(struct iwreq *iwr, bool set)
* Name: esp_wifi_sta_bssid
*
* Description:
* Set/Get WiFi station BSSID
* Set/Get Wi-Fi station BSSID
*
* Input Parameters:
* iwr - The argument of the ioctl cmd
@ -5432,7 +5432,7 @@ int esp_wifi_sta_bssid(struct iwreq *iwr, bool set)
ret = esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg);
if (ret)
{
wlerr("Failed to get WiFi config data ret=%d\n", ret);
wlerr("Failed to get Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
@ -5447,7 +5447,7 @@ int esp_wifi_sta_bssid(struct iwreq *iwr, bool set)
ret = esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg);
if (ret)
{
wlerr("Failed to set WiFi config data ret=%d\n", ret);
wlerr("Failed to set Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
}
@ -5463,7 +5463,7 @@ int esp_wifi_sta_bssid(struct iwreq *iwr, bool set)
* Name: esp_wifi_sta_connect
*
* Description:
* Trigger WiFi station connection action
* Trigger Wi-Fi station connection action
*
* Input Parameters:
* None
@ -5483,7 +5483,7 @@ int esp_wifi_sta_connect(void)
if (g_sta_connected)
{
wlinfo("WiFi has connected AP\n");
wlinfo("Wi-Fi has connected AP\n");
esp_wifi_lock(false);
return OK;
}
@ -5531,7 +5531,7 @@ errout_wifi_connect:
* Name: esp_wifi_sta_disconnect
*
* Description:
* Trigger WiFi station disconnection action
* Trigger Wi-Fi station disconnection action
*
* Input Parameters:
* None
@ -5558,7 +5558,7 @@ int esp_wifi_sta_disconnect(void)
}
else
{
wlinfo("OK to disconnect WiFi station\n");
wlinfo("OK to disconnect Wi-Fi station\n");
}
esp_wifi_lock(false);
@ -5569,7 +5569,7 @@ int esp_wifi_sta_disconnect(void)
* Name: esp_wifi_sta_mode
*
* Description:
* Set/Get WiFi Station mode code.
* Set/Get Wi-Fi Station mode code.
*
* Input Parameters:
* iwr - The argument of the ioctl cmd
@ -5690,7 +5690,7 @@ int esp_wifi_sta_freq(struct iwreq *iwr, bool set)
ret = esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg);
if (ret)
{
wlerr("Failed to get WiFi config data ret=%d\n", ret);
wlerr("Failed to get Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
@ -5698,7 +5698,7 @@ int esp_wifi_sta_freq(struct iwreq *iwr, bool set)
ret = esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg);
if (ret)
{
wlerr("Failed to set WiFi config data ret=%d\n", ret);
wlerr("Failed to set Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
}
@ -5996,7 +5996,7 @@ int esp_wifi_sta_country(struct iwreq *iwr, bool set)
* Name: esp_wifi_sta_rssi
*
* Description:
* Get WiFi sensitivity (dBm).
* Get Wi-Fi sensitivity (dBm).
*
* Input Parameters:
* iwr - The argument of the ioctl cmd
@ -6049,7 +6049,7 @@ int esp_wifi_sta_rssi(struct iwreq *iwr, bool set)
* Name: esp_wifi_softap_start
*
* Description:
* Start WiFi SoftAP.
* Start Wi-Fi SoftAP.
*
* Input Parameters:
* None
@ -6070,7 +6070,7 @@ int esp_wifi_softap_start(void)
ret = esp_wifi_stop();
if (ret)
{
wlinfo("Failed to stop WiFi ret=%d\n", ret);
wlinfo("Failed to stop Wi-Fi ret=%d\n", ret);
}
#ifdef ESP32_WLAN_HAS_STA
@ -6085,7 +6085,7 @@ int esp_wifi_softap_start(void)
ret = esp_wifi_set_mode(mode);
if (ret)
{
wlerr("Failed to set WiFi mode=%d ret=%d\n", mode, ret);
wlerr("Failed to set Wi-Fi mode=%d ret=%d\n", mode, ret);
ret = wifi_errno_trans(ret);
goto errout_set_mode;
}
@ -6093,14 +6093,14 @@ int esp_wifi_softap_start(void)
ret = esp_wifi_start();
if (ret)
{
wlerr("Failed to start WiFi with mode=%d ret=%d\n", mode, ret);
wlerr("Failed to start Wi-Fi with mode=%d ret=%d\n", mode, ret);
ret = wifi_errno_trans(ret);
goto errout_set_mode;
}
g_softap_started = true;
wlinfo("OK to start WiFi SoftAP\n");
wlinfo("OK to start Wi-Fi SoftAP\n");
esp_wifi_lock(false);
return OK;
@ -6114,7 +6114,7 @@ errout_set_mode:
* Name: esp_wifi_softap_stop
*
* Description:
* Stop WiFi SoftAP.
* Stop Wi-Fi SoftAP.
*
* Input Parameters:
* None
@ -6134,7 +6134,7 @@ int esp_wifi_softap_stop(void)
ret = esp_wifi_stop();
if (ret)
{
wlinfo("Failed to stop WiFi ret=%d\n", ret);
wlinfo("Failed to stop Wi-Fi ret=%d\n", ret);
}
g_softap_started = false;
@ -6145,7 +6145,7 @@ int esp_wifi_softap_stop(void)
ret = esp_wifi_set_mode(WIFI_MODE_STA);
if (ret)
{
wlerr("Failed to set WiFi AP mode ret=%d\n", ret);
wlerr("Failed to set Wi-Fi AP mode ret=%d\n", ret);
ret = wifi_errno_trans(ret);
goto errout_set_mode;
}
@ -6153,14 +6153,14 @@ int esp_wifi_softap_stop(void)
ret = esp_wifi_start();
if (ret)
{
wlerr("Failed to start WiFi AP ret=%d\n", ret);
wlerr("Failed to start Wi-Fi AP ret=%d\n", ret);
ret = wifi_errno_trans(ret);
goto errout_set_mode;
}
}
#endif
wlinfo("OK to stop WiFi SoftAP\n");
wlinfo("OK to stop Wi-Fi SoftAP\n");
esp_wifi_lock(false);
return OK;
@ -6176,7 +6176,7 @@ errout_set_mode:
* Name: esp_wifi_softap_send_data
*
* Description:
* Use WiFi SoftAP interface to send 802.3 frame
* Use Wi-Fi SoftAP interface to send 802.3 frame
*
* Input Parameters:
* pbuf - Packet buffer pointer
@ -6201,7 +6201,7 @@ int esp_wifi_softap_send_data(void *pbuf, uint32_t len)
* Name: esp_wifi_softap_register_recv_cb
*
* Description:
* Register WiFi SoftAP receive packet callback function
* Register Wi-Fi SoftAP receive packet callback function
*
* Input Parameters:
* recv_cb - Receive callback function
@ -6265,7 +6265,7 @@ int esp_wifi_softap_read_mac(uint8_t *mac)
* Name: esp_wifi_softap_password
*
* Description:
* Set/Get WiFi SoftAP password
* Set/Get Wi-Fi SoftAP password
*
* Input Parameters:
* iwr - The argument of the ioctl cmd
@ -6302,7 +6302,7 @@ int esp_wifi_softap_password(struct iwreq *iwr, bool set)
ret = esp_wifi_get_config(WIFI_IF_AP, &wifi_cfg);
if (ret)
{
wlerr("Failed to get WiFi config data ret=%d\n", ret);
wlerr("Failed to get Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
@ -6326,7 +6326,7 @@ int esp_wifi_softap_password(struct iwreq *iwr, bool set)
ret = esp_wifi_set_config(WIFI_IF_AP, &wifi_cfg);
if (ret)
{
wlerr("Failed to set WiFi config data ret=%d\n", ret);
wlerr("Failed to set Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
}
@ -6347,7 +6347,7 @@ int esp_wifi_softap_password(struct iwreq *iwr, bool set)
#ifdef CONFIG_DEBUG_WIRELESS_INFO
memcpy(buf, pdata, len);
buf[len] = 0;
wlinfo("WiFi SoftAP password=%s len=%d\n", buf, len);
wlinfo("Wi-Fi SoftAP password=%s len=%d\n", buf, len);
#endif
return OK;
@ -6357,7 +6357,7 @@ int esp_wifi_softap_password(struct iwreq *iwr, bool set)
* Name: esp_wifi_softap_essid
*
* Description:
* Set/Get WiFi SoftAP ESSID
* Set/Get Wi-Fi SoftAP ESSID
*
* Input Parameters:
* iwr - The argument of the ioctl cmd
@ -6394,7 +6394,7 @@ int esp_wifi_softap_essid(struct iwreq *iwr, bool set)
ret = esp_wifi_get_config(WIFI_IF_AP, &wifi_cfg);
if (ret)
{
wlerr("Failed to get WiFi config data ret=%d\n", ret);
wlerr("Failed to get Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
@ -6406,7 +6406,7 @@ int esp_wifi_softap_essid(struct iwreq *iwr, bool set)
ret = esp_wifi_set_config(WIFI_IF_AP, &wifi_cfg);
if (ret)
{
wlerr("Failed to set WiFi config data ret=%d\n", ret);
wlerr("Failed to set Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
}
@ -6427,7 +6427,7 @@ int esp_wifi_softap_essid(struct iwreq *iwr, bool set)
#ifdef CONFIG_DEBUG_WIRELESS_INFO
memcpy(buf, pdata, len);
buf[len] = 0;
wlinfo("WiFi SoftAP ssid=%s len=%d\n", buf, len);
wlinfo("Wi-Fi SoftAP ssid=%s len=%d\n", buf, len);
#endif
return OK;
@ -6437,7 +6437,7 @@ int esp_wifi_softap_essid(struct iwreq *iwr, bool set)
* Name: esp_wifi_softap_bssid
*
* Description:
* Set/Get WiFi softAP BSSID
* Set/Get Wi-Fi softAP BSSID
*
* Input Parameters:
* iwr - The argument of the ioctl cmd
@ -6458,7 +6458,7 @@ int esp_wifi_softap_bssid(struct iwreq *iwr, bool set)
* Name: esp_wifi_softap_connect
*
* Description:
* Trigger WiFi SoftAP accept connection action
* Trigger Wi-Fi SoftAP accept connection action
*
* Input Parameters:
* None
@ -6478,7 +6478,7 @@ int esp_wifi_softap_connect(void)
* Name: esp_wifi_softap_disconnect
*
* Description:
* Trigger WiFi SoftAP drop connection action
* Trigger Wi-Fi SoftAP drop connection action
*
* Input Parameters:
* None
@ -6498,7 +6498,7 @@ int esp_wifi_softap_disconnect(void)
* Name: esp_wifi_softap_mode
*
* Description:
* Set/Get WiFi SoftAP mode code.
* Set/Get Wi-Fi SoftAP mode code.
*
* Input Parameters:
* iwr - The argument of the ioctl cmd
@ -6546,7 +6546,7 @@ int esp_wifi_softap_auth(struct iwreq *iwr, bool set)
ret = esp_wifi_get_config(WIFI_IF_AP, &wifi_cfg);
if (ret)
{
wlerr("Failed to get WiFi config data ret=%d\n", ret);
wlerr("Failed to get Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
@ -6624,7 +6624,7 @@ int esp_wifi_softap_auth(struct iwreq *iwr, bool set)
ret = esp_wifi_set_config(WIFI_IF_AP, &wifi_cfg);
if (ret)
{
wlerr("Failed to set WiFi config data ret=%d\n", ret);
wlerr("Failed to set Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
}
@ -6660,7 +6660,7 @@ int esp_wifi_softap_freq(struct iwreq *iwr, bool set)
ret = esp_wifi_get_config(WIFI_IF_AP, &wifi_cfg);
if (ret)
{
wlerr("Failed to get WiFi config data ret=%d\n", ret);
wlerr("Failed to get Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
@ -6673,7 +6673,7 @@ int esp_wifi_softap_freq(struct iwreq *iwr, bool set)
ret = esp_wifi_set_config(WIFI_IF_AP, &wifi_cfg);
if (ret)
{
wlerr("Failed to set WiFi config data ret=%d\n", ret);
wlerr("Failed to set Wi-Fi config data ret=%d\n", ret);
return wifi_errno_trans(ret);
}
}
@ -6775,7 +6775,7 @@ int esp_wifi_softap_country(struct iwreq *iwr, bool set)
* Name: esp_wifi_softap_rssi
*
* Description:
* Get WiFi sensitivity (dBm).
* Get Wi-Fi sensitivity (dBm).
*
* Input Parameters:
* iwr - The argument of the ioctl cmd

56
arch/xtensa/src/esp32/esp32_wifi_adapter.h
View File

@ -63,7 +63,7 @@ extern "C"
#define MAC_LEN (6)
/* WiFi event ID */
/* Wi-Fi event ID */
enum wifi_adpt_evt_e
{
@ -76,11 +76,11 @@ enum wifi_adpt_evt_e
WIFI_ADPT_EVT_MAX,
};
/* WiFi event callback function */
/* Wi-Fi event callback function */
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);
@ -92,7 +92,7 @@ typedef void (*wifi_txdone_cb_t)(uint8_t *data, uint16_t *len, bool status);
* Name: esp_wifi_adapter_init
*
* Description:
* Initialize ESP32 WiFi adapter
* Initialize ESP32 Wi-Fi adapter
*
* Input Parameters:
* None
@ -108,10 +108,10 @@ int esp_wifi_adapter_init(void);
* Name: esp_wifi_free_eb
*
* Description:
* Free WiFi receive callback input eb pointer
* Free Wi-Fi receive callback input eb pointer
*
* Input Parameters:
* eb - WiFi receive callback input eb pointer
* eb - Wi-Fi receive callback input eb pointer
*
* Returned Value:
* None
@ -143,7 +143,7 @@ int esp_wifi_notify_subscribe(pid_t pid, struct sigevent *event);
* Name: esp_wifi_sta_start
*
* Description:
* Start WiFi station.
* Start Wi-Fi station.
*
* Input Parameters:
* None
@ -160,7 +160,7 @@ int esp_wifi_sta_start(void);
* Name: esp_wifi_sta_stop
*
* Description:
* Stop WiFi station.
* Stop Wi-Fi station.
*
* Input Parameters:
* None
@ -177,7 +177,7 @@ int esp_wifi_sta_stop(void);
* Name: esp_wifi_sta_send_data
*
* Description:
* Use WiFi station interface to send 802.3 frame
* Use Wi-Fi station interface to send 802.3 frame
*
* Input Parameters:
* 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
*
* Description:
* Regitser WiFi station receive packet callback function
* Regitser Wi-Fi station receive packet callback function
*
* Input Parameters:
* recv_cb - Receive callback function
@ -246,7 +246,7 @@ int esp_wifi_sta_read_mac(uint8_t *mac);
* Name: esp_wifi_set_password
*
* Description:
* Set/Get WiFi station password
* Set/Get Wi-Fi station password
*
* Input Parameters:
* 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
*
* Description:
* Set/Get WiFi station ESSID
* Set/Get Wi-Fi station ESSID
*
* Input Parameters:
* 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
*
* Description:
* Set/Get WiFi station BSSID
* Set/Get Wi-Fi station BSSID
*
* Input Parameters:
* 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
*
* Description:
* Trigger WiFi station connection action
* Trigger Wi-Fi station connection action
*
* Input Parameters:
* None
@ -317,7 +317,7 @@ int esp_wifi_sta_connect(void);
* Name: esp_wifi_sta_disconnect
*
* Description:
* Trigger WiFi station disconnection action
* Trigger Wi-Fi station disconnection action
*
* Input Parameters:
* None
@ -334,7 +334,7 @@ int esp_wifi_sta_disconnect(void);
* Name: esp_wifi_sta_mode
*
* Description:
* Set/Get WiFi Station mode code.
* Set/Get Wi-Fi Station mode code.
*
* Input Parameters:
* 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
*
* Description:
* Get WiFi sensitivity (dBm).
* Get Wi-Fi sensitivity (dBm).
*
* Input Parameters:
* 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
*
* Description:
* Start WiFi softAP.
* Start Wi-Fi softAP.
*
* Input Parameters:
* None
@ -498,7 +498,7 @@ int esp_wifi_softap_start(void);
* Name: esp_wifi_softap_stop
*
* Description:
* Stop WiFi softAP.
* Stop Wi-Fi softAP.
*
* Input Parameters:
* None
@ -515,7 +515,7 @@ int esp_wifi_softap_stop(void);
* Name: esp_wifi_softap_send_data
*
* Description:
* Use WiFi softAP interface to send 802.3 frame
* Use Wi-Fi softAP interface to send 802.3 frame
*
* Input Parameters:
* 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
*
* Description:
* Regitser WiFi softAP receive packet callback function
* Regitser Wi-Fi softAP receive packet callback function
*
* Input Parameters:
* recv_cb - Receive callback function
@ -584,7 +584,7 @@ int esp_wifi_softap_read_mac(uint8_t *mac);
* Name: esp_wifi_softap_password
*
* Description:
* Set/Get WiFi SoftAP password
* Set/Get Wi-Fi SoftAP password
*
* Input Parameters:
* 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
*
* Description:
* Set/Get WiFi SoftAP ESSID
* Set/Get Wi-Fi SoftAP ESSID
*
* Input Parameters:
* 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
*
* Description:
* Set/Get WiFi softAP BSSID
* Set/Get Wi-Fi softAP BSSID
*
* Input Parameters:
* 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
*
* Description:
* Trigger WiFi softAP accept connection action
* Trigger Wi-Fi softAP accept connection action
*
* Input Parameters:
* None
@ -655,7 +655,7 @@ int esp_wifi_softap_connect(void);
* Name: esp_wifi_softap_disconnect
*
* Description:
* Trigger WiFi softAP drop connection action
* Trigger Wi-Fi softAP drop connection action
*
* Input Parameters:
* None
@ -672,7 +672,7 @@ int esp_wifi_softap_disconnect(void);
* Name: esp_wifi_softap_mode
*
* Description:
* Set/Get WiFi SoftAP mode code.
* Set/Get Wi-Fi SoftAP mode code.
*
* Input Parameters:
* 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
*
* Description:
* Get WiFi sensitivity (dBm).
* Get Wi-Fi sensitivity (dBm).
*
* Input Parameters:
* iwr - The argument of the ioctl cmd

4
arch/xtensa/src/esp32/esp32_wifi_utils.c
View File

@ -72,7 +72,7 @@ enum scan_status_e
ESP_SCAN_DONE
};
/* WiFi scan result information */
/* Wi-Fi scan result information */
struct wifi_scan_result
{
@ -548,7 +548,7 @@ scan_result_full:
* Name: esp_wifi_scan_init
*
* Description:
* Initialize ESP32 WiFi scan parameter.
* Initialize ESP32 Wi-Fi scan parameter.
*
* Input Parameters:
* None

2
arch/xtensa/src/esp32/esp32_wifi_utils.h
View File

@ -99,7 +99,7 @@ void esp_wifi_scan_event_parse(void);
* Name: esp_wifi_scan_para
*
* Description:
* Initialize ESP32 WiFi scan parameter.
* Initialize ESP32 Wi-Fi scan parameter.
*
* Input Parameters:
* None

50
arch/xtensa/src/esp32/esp32_wlan.c
View File

@ -280,7 +280,7 @@ static int wlan_ioctl(struct net_driver_s *dev, int cmd,
* * wlan_rx_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.
*/
@ -507,7 +507,7 @@ static struct wlan_pktbuf *wlan_txframe(struct wlan_priv_s *priv)
* Name: wlan_transmit
*
* 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.
*
* Input Parameters:
@ -544,7 +544,7 @@ static void wlan_transmit(struct wlan_priv_s *priv)
* Name: wlan_tx_done
*
* 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.
*
* Input Parameters:
@ -566,14 +566,14 @@ static void wlan_tx_done(struct wlan_priv_s *priv)
* Function: wlan_rx_done
*
* 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.
*
* Input Parameters:
* priv - Reference to the driver state structure
* buffer - WiFi received packet buffer
* buffer - Wi-Fi received packet buffer
* len - Length of received packet
* eb - WiFi receive callback input eb pointer
* eb - Wi-Fi receive callback input eb pointer
*
* Returned Value:
* 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)
{
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;
}
@ -1294,7 +1294,7 @@ static int wlan_ifdown(struct net_driver_s *dev)
ret = priv->ops->stop();
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();
@ -1708,7 +1708,7 @@ static int esp32_net_initialize(int devno, uint8_t *mac_addr,
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;
}
@ -1717,13 +1717,13 @@ static int esp32_net_initialize(int devno, uint8_t *mac_addr,
* Function: wlan_sta_rx_done
*
* 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.
*
* Input Parameters:
* buffer - WiFi received packet buffer
* buffer - Wi-Fi received packet buffer
* len - Length of received packet
* eb - WiFi receive callback input eb pointer
* eb - Wi-Fi receive callback input eb pointer
*
* Returned Value:
* 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
*
* 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.
*
* 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
*
* 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.
*
* Input Parameters:
* buffer - WiFi received packet buffer
* buffer - Wi-Fi received packet buffer
* len - Length of received packet
* eb - WiFi receive callback input eb pointer
* eb - Wi-Fi receive callback input eb pointer
*
* Returned Value:
* 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
*
* 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.
*
* Input Parameters:
@ -1842,7 +1842,7 @@ int esp32_wlan_sta_initialize(void)
ret = esp_wifi_adapter_init();
if (ret < 0)
{
nerr("ERROR: Initialize WiFi adapter error: %d\n", ret);
nerr("ERROR: Initialize Wi-Fi adapter error: %d\n", ret);
return ret;
}
@ -1853,14 +1853,14 @@ int esp32_wlan_sta_initialize(void)
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[3], eth_mac[4], eth_mac[5]);
ret = esp_wifi_scan_init();
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;
}
@ -1880,7 +1880,7 @@ int esp32_wlan_sta_initialize(void)
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;
}
@ -1909,7 +1909,7 @@ int esp32_wlan_softap_initialize(void)
ret = esp_wifi_adapter_init();
if (ret < 0)
{
nerr("ERROR: Initialize WiFi adapter error: %d\n", ret);
nerr("ERROR: Initialize Wi-Fi adapter error: %d\n", ret);
return ret;
}
@ -1920,14 +1920,14 @@ int esp32_wlan_softap_initialize(void)
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[3], eth_mac[4], eth_mac[5]);
ret = esp_wifi_scan_init();
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;
}
@ -1948,7 +1948,7 @@ int esp32_wlan_softap_initialize(void)
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;
}

8
arch/xtensa/src/esp32/hardware/esp32_soc.h
View File

@ -295,9 +295,9 @@
* 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_NMI_SOURCE 1 /* Interrupt of WiFi 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_MAC_INTR_SOURCE 0 /* Interrupt of Wi-Fi MAC, level */
#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 Wi-Fi BB, level, we can do some calibartion */
#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_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_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.
*/

28
arch/xtensa/src/esp32s2/Kconfig
View File

@ -779,11 +779,11 @@ config SPIRAM_BANKSWITCH_RESERVE
endmenu #SPI RAM Config
menu "WiFi configuration"
menu "Wi-Fi configuration"
depends on ESP32S2_WIRELESS
choice
prompt "ESP32-S2 WiFi mode"
prompt "ESP32-S2 Wi-Fi mode"
default ESP32S2_WIFI_STATION
config ESP32S2_WIFI_STATION
@ -795,30 +795,30 @@ config ESP32S2_WIFI_SOFTAP
config ESP32S2_WIFI_STATION_SOFTAP_COEXISTENCE
bool "Station + SoftAP coexistence"
endchoice # ESP32S2 WiFi mode
endchoice # ESP32S2 Wi-Fi mode
config ESP32S2_WIFI_STATIC_RXBUF_NUM
int "WiFi static RX buffer number"
int "Wi-Fi static RX buffer number"
default 10
config ESP32S2_WIFI_DYNAMIC_RXBUF_NUM
int "WiFi dynamic RX buffer number"
int "Wi-Fi dynamic RX buffer number"
default 32
config ESP32S2_WIFI_DYNAMIC_TXBUF_NUM
int "WiFi dynamic TX buffer number"
int "Wi-Fi dynamic TX buffer number"
default 32
config ESP32S2_WIFI_TX_AMPDU
bool "WiFi TX AMPDU"
bool "Wi-Fi TX AMPDU"
default y
config ESP32S2_WIFI_RX_AMPDU
bool "WiFi RX AMPDU"
bool "Wi-Fi RX AMPDU"
default y
config ESP32S2_WIFI_RXBA_AMPDU_WZ
int "WiFi RX BA AMPDU windown size"
int "Wi-Fi RX BA AMPDU windown size"
default 6
config ESP32S2_WLAN_PKTBUF_NUM
@ -838,10 +838,10 @@ config ESP32S2_WIFI_SCAN_RESULT_SIZE
Maximum scan result buffer size.
config ESP32S2_WIFI_SAVE_PARAM
bool "Save WiFi Parameters"
bool "Save Wi-Fi Parameters"
default n
---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.
These parameters mainly contains:
@ -851,14 +851,14 @@ config ESP32S2_WIFI_SAVE_PARAM
- PMK(compute when connecting)
- Author mode
- MAC address
- WiFi hardware configuration parameters
- Wi-Fi hardware configuration parameters
config ESP32S2_WIFI_FS_MOUNTPT
string "Save WiFi Parameters"
string "Save Wi-Fi Parameters"
default "/mnt/esp/wifi"
depends on ESP32S2_WIFI_SAVE_PARAM
---help---
Mount point of WiFi storage file system.
Mount point of Wi-Fi storage file system.
endmenu # ESP32S2_WIRELESS

2
arch/xtensa/src/esp32s2/esp32s2_rng.c
View File

@ -96,7 +96,7 @@ uint32_t IRAM_ATTR esp_random(void)
{
/* The PRNG which implements WDEV_RANDOM register gets 2 bits
* 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
* clock cycles after reading previous word. This implementation may
* actually wait a bit longer due to extra time spent in arithmetic and

2
arch/xtensa/src/esp32s2/hardware/esp32s2_soc.h
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_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.
*/

4
boards/xtensa/esp32/common/src/esp32_board_wlan.c
View File

@ -68,7 +68,7 @@ int board_wlan_init(void)
ret = esp32_wlan_sta_initialize();
if (ret)
{
wlerr("ERROR: Failed to initialize WiFi station\n");
wlerr("ERROR: Failed to initialize Wi-Fi station\n");
return ret;
}
#endif
@ -77,7 +77,7 @@ int board_wlan_init(void)
ret = esp32_wlan_softap_initialize();
if (ret)
{
wlerr("ERROR: Failed to initialize WiFi softAP\n");
wlerr("ERROR: Failed to initialize Wi-Fi softAP\n");
return ret;
}
#endif