sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

esp32-esp32c3/wifi: remove naming inconsistencies

Browse Source 
* Remove the 'COEXISTENCE' suffix from Wi-Fi's STA + SoftAP mode.
Coexistence usually refers to Wi-Fi + BLE, instead of Wi-Fi's
operation mode;
* Remove commented debug code;
* Remove outdate function descriptions;
This commit is contained in:
Tiago Medicci Serrano 2023-03-09 15:42:42 -03:00 committed by Petro Karashchenko
parent af45eced2b
commit 7b807a8540
10 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/risc-v/src/esp32c3/Kconfig
View File

@ -733,8 +733,8 @@ config ESP32C3_WIFI_STATION
config ESP32C3_WIFI_SOFTAP
bool "SoftAP mode"
config ESP32C3_WIFI_STATION_SOFTAP_COEXISTENCE
bool "Station + SoftAP coexistence"
config ESP32C3_WIFI_STATION_SOFTAP
bool "Station + SoftAP"
endchoice # ESP32-C3 Wi-Fi mode

5
arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.c
View File

@ -4195,11 +4195,6 @@ static unsigned long esp_random_ulong(void)
static IRAM_ATTR void esp_wifi_tx_done_cb(uint8_t ifidx, uint8_t *data,
uint16_t *len, bool txstatus)
{
#if 0
wlinfo("INFO: ifidx=%d data=%p *len=%p txstatus=%d\n",
ifidx, data, len, txstatus);
#endif
#ifdef ESP32C3_WLAN_HAS_STA
if (ifidx == ESP_IF_WIFI_STA)
{

3
arch/risc-v/src/esp32c3/esp32c3_wifi_adapter.h
View File

@ -52,7 +52,7 @@ extern "C"
# define ESP32C3_WLAN_HAS_SOFTAP
# define ESP32C3_WLAN_SOFTAP_DEVNO 0
# define ESP32C3_WLAN_DEVS 1
#elif defined(CONFIG_ESP32C3_WIFI_STATION_SOFTAP_COEXISTENCE)
#elif defined(CONFIG_ESP32C3_WIFI_STATION_SOFTAP)
# define ESP32C3_WLAN_HAS_STA
# define ESP32C3_WLAN_HAS_SOFTAP
# define ESP32C3_WLAN_STA_DEVNO 0
@ -716,6 +716,7 @@ int esp_wifi_softap_auth(struct iwreq *iwr, bool set);
*
* Input Parameters:
* iwr - The argument of the ioctl cmd
* set - true: set data; false: get data
*
* Returned Value:
* OK on success (positive non-zero values are cmd-specific)

1
arch/risc-v/src/esp32c3/esp32c3_wlan.c
View File

@ -1368,7 +1368,6 @@ static int wlan_sta_rx_done(void *buffer, uint16_t len, void *eb)
* station sending next packet.
*
* Input Parameters:
* ifidx - The interface ID that the TX callback has been triggered from.
* data - Pointer to the data transmitted.
* len - Length of the data transmitted.
* status - True if data was transmitted successfully or false if failed.

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

@ -1989,8 +1989,8 @@ config ESP32_WIFI_STATION
config ESP32_WIFI_SOFTAP
bool "SoftAP mode"
config ESP32_WIFI_STATION_SOFTAP_COEXISTENCE
bool "Station + SoftAP coexistence"
config ESP32_WIFI_STATION_SOFTAP
bool "Station + SoftAP"
endchoice # ESP32 Wi-Fi mode

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

@ -4073,11 +4073,6 @@ static unsigned long esp_random_ulong(void)
static IRAM_ATTR void esp_wifi_tx_done_cb(uint8_t ifidx, uint8_t *data,
uint16_t *len, bool txstatus)
{
#if 0
wlinfo("ifidx=%d data=%p *len=%p txstatus=%d\n",
ifidx, data, len, txstatus);
#endif
#ifdef ESP32_WLAN_HAS_STA
if (ifidx == ESP_IF_WIFI_STA)
{

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

@ -53,7 +53,7 @@ extern "C"
# define ESP32_WLAN_HAS_SOFTAP
# define ESP32_WLAN_SOFTAP_DEVNO 0
# define ESP32_WLAN_DEVS 1
#elif defined(CONFIG_ESP32_WIFI_STATION_SOFTAP_COEXISTENCE)
#elif defined(CONFIG_ESP32_WIFI_STATION_SOFTAP)
# define ESP32_WLAN_HAS_STA
# define ESP32_WLAN_HAS_SOFTAP
# define ESP32_WLAN_STA_DEVNO 0
@ -734,6 +734,7 @@ int esp_wifi_softap_auth(struct iwreq *iwr, bool set);
*
* Input Parameters:
* iwr - The argument of the ioctl cmd
* set - true: set data; false: get data
*
* Returned Value:
* OK on success (positive non-zero values are cmd-specific)

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

@ -1697,7 +1697,6 @@ static int wlan_sta_rx_done(void *buffer, uint16_t len, void *eb)
* station sending next packet.
*
* Input Parameters:
* ifidx - The interface id that the tx callback has been triggered from.
* data - Pointer to the data transmitted.
* len - Length of the data transmitted.
* status - True if data was transmitted successfully or false if failed.

2
boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig
View File

@ -34,7 +34,7 @@ CONFIG_ESP32C3_STORAGE_MTD_OFFSET=0x110000
CONFIG_ESP32C3_STORAGE_MTD_SIZE=0xf0000
CONFIG_ESP32C3_WIFI=y
CONFIG_ESP32C3_WIFI_SAVE_PARAM=y
CONFIG_ESP32C3_WIFI_STATION_SOFTAP_COEXISTENCE=y
CONFIG_ESP32C3_WIFI_STATION_SOFTAP=y
CONFIG_EXAMPLES_DHCPD=y
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y

2
boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
View File

@ -35,7 +35,7 @@ CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIFI_STATION_SOFTAP_COEXISTENCE=y
CONFIG_ESP32_WIFI_STATION_SOFTAP=y
CONFIG_EXAMPLES_DHCPD=y
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y