[nuttx] branch master updated: Fix build issues for ESP32 SoftAP mode

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new bcd776b2a7 Fix build issues for ESP32 SoftAP mode
bcd776b2a7 is described below

commit bcd776b2a79992053a974fef1f5dfe315e774d1a
Author: Roy Feng <ro...@sony.com>
AuthorDate: Sat May 27 18:00:32 2023 +0800

    Fix build issues for ESP32 SoftAP mode
---
 arch/xtensa/src/esp32/esp32_wifi_adapter.c         |  4 ++
 arch/xtensa/src/esp32/esp32_wlan.c                 |  6 +-
 .../esp32/esp32-devkitc/configs/softap/defconfig   | 80 ++++++++++++++++++++++
 3 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/arch/xtensa/src/esp32/esp32_wifi_adapter.c b/arch/xtensa/src/esp32/esp32_wifi_adapter.c
index 711a963b80..ec61837b3f 100644
--- a/arch/xtensa/src/esp32/esp32_wifi_adapter.c
+++ b/arch/xtensa/src/esp32/esp32_wifi_adapter.c
@@ -3952,6 +3952,7 @@ static IRAM_ATTR void esp_wifi_tx_done_cb(uint8_t ifidx, uint8_t *data,
     }
 }
 
+#ifdef ESP32_WLAN_HAS_STA
 /****************************************************************************
  * Name: esp_wifi_auth_trans
  *
@@ -4051,6 +4052,7 @@ static int esp_wifi_cipher_trans(uint32_t wifi_cipher)
 
   return cipher_mode;
 }
+#endif /* ESP32_WLAN_HAS_STA */
 
 /****************************************************************************
  * Name: esp_freq_to_channel
@@ -5639,6 +5641,7 @@ int esp_wifi_sta_bitrate(struct iwreq *iwr, bool set)
 
   return OK;
 }
+#endif //ESP32_WLAN_HAS_STA
 
 /****************************************************************************
  * Name: esp_wifi_sta_get_txpower
@@ -5833,6 +5836,7 @@ int esp_wifi_sta_country(struct iwreq *iwr, bool set)
   return OK;
 }
 
+#ifdef ESP32_WLAN_HAS_STA
 /****************************************************************************
  * Name: esp_wifi_sta_rssi
  *
diff --git a/arch/xtensa/src/esp32/esp32_wlan.c b/arch/xtensa/src/esp32/esp32_wlan.c
index 4e20f498fc..cff4984c5d 100644
--- a/arch/xtensa/src/esp32/esp32_wlan.c
+++ b/arch/xtensa/src/esp32/esp32_wlan.c
@@ -1664,6 +1664,7 @@ static int esp32_net_initialize(int devno, uint8_t *mac_addr,
   return OK;
 }
 
+#ifdef ESP32_WLAN_HAS_STA
 /****************************************************************************
  * Function: wlan_sta_rx_done
  *
@@ -1681,7 +1682,6 @@ static int esp32_net_initialize(int devno, uint8_t *mac_addr,
  *
  ****************************************************************************/
 
-#ifdef ESP32_WLAN_HAS_STA
 static int wlan_sta_rx_done(void *buffer, uint16_t len, void *eb)
 {
   struct wlan_priv_s *priv = &g_wlan_priv[ESP32_WLAN_STA_DEVNO];
@@ -1714,6 +1714,7 @@ static void wlan_sta_tx_done(uint8_t *data, uint16_t *len, bool status)
 }
 #endif /* ESP32_WLAN_HAS_STA */
 
+#ifdef ESP32_WLAN_HAS_SOFTAP
 /****************************************************************************
  * Function: wlan_softap_rx_done
  *
@@ -1731,7 +1732,6 @@ static void wlan_sta_tx_done(uint8_t *data, uint16_t *len, bool status)
  *
  ****************************************************************************/
 
-#ifdef ESP32_WLAN_HAS_SOFTAP
 static int wlan_softap_rx_done(void *buffer, uint16_t len, void *eb)
 {
   struct wlan_priv_s *priv = &g_wlan_priv[ESP32_WLAN_SOFTAP_DEVNO];
@@ -1862,6 +1862,7 @@ int esp32_wlan_sta_initialize(void)
 }
 #endif /* ESP32_WLAN_HAS_STA */
 
+#ifdef ESP32_WLAN_HAS_SOFTAP
 /****************************************************************************
  * Name: esp32_wlan_softap_initialize
  *
@@ -1876,7 +1877,6 @@ int esp32_wlan_sta_initialize(void)
  *
  ****************************************************************************/
 
-#ifdef ESP32_WLAN_HAS_SOFTAP
 int esp32_wlan_softap_initialize(void)
 {
   int ret;
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/softap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/softap/defconfig
new file mode 100644
index 0000000000..5970a9df69
--- /dev/null
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/softap/defconfig
@@ -0,0 +1,80 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_ARCH_LEDS is not set
+# CONFIG_NDEBUG is not set
+# CONFIG_NSH_ARGCAT is not set
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
+CONFIG_ALLOW_BSD_COMPONENTS=y
+CONFIG_ARCH="xtensa"
+CONFIG_ARCH_BOARD="esp32-devkitc"
+CONFIG_ARCH_BOARD_COMMON=y
+CONFIG_ARCH_BOARD_ESP32_DEVKITC=y
+CONFIG_ARCH_CHIP="esp32"
+CONFIG_ARCH_CHIP_ESP32=y
+CONFIG_ARCH_CHIP_ESP32WROVER=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_XTENSA=y
+CONFIG_BOARDCTL_RESET=y
+CONFIG_BOARD_LOOPSPERMSEC=16717
+CONFIG_BUILTIN=y
+CONFIG_DRIVERS_IEEE80211=y
+CONFIG_DRIVERS_WIRELESS=y
+CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
+CONFIG_ESP32_UART0=y
+CONFIG_ESP32_WIFI=y
+CONFIG_ESP32_WIFI_SOFTAP=y
+CONFIG_EXAMPLES_DHCPD=y
+CONFIG_EXPERIMENTAL=y
+CONFIG_FS_PROCFS=y
+CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_IDLETHREAD_STACKSIZE=3072
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INIT_STACKSIZE=3072
+CONFIG_INTELHEX_BINARY=y
+CONFIG_MM_REGIONS=3
+CONFIG_NETDB_DNSCLIENT=y
+CONFIG_NETDEV_LATEINIT=y
+CONFIG_NETDEV_PHY_IOCTL=y
+CONFIG_NETDEV_WIRELESS_IOCTL=y
+CONFIG_NETUTILS_CJSON=y
+CONFIG_NETUTILS_DHCPD=y
+CONFIG_NET_BROADCAST=y
+CONFIG_NET_ETH_PKTSIZE=1514
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_SOCKET=y
+CONFIG_NET_UDP=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_PTHREAD_MUTEX_TYPES=y
+CONFIG_RAM_SIZE=114688
+CONFIG_RAM_START=0x20000000
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_LPWORK=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_SIG_DEFAULT=y
+CONFIG_SPIFFS_NAME_MAX=48
+CONFIG_START_DAY=6
+CONFIG_START_MONTH=12
+CONFIG_START_YEAR=2011
+CONFIG_SYSTEM_DHCPC_RENEW=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_PING=y
+CONFIG_TLS_TASK_NELEM=4
+CONFIG_UART0_SERIAL_CONSOLE=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_WAPI=y
+CONFIG_WIRELESS_WAPI_CMDTOOL=y
+CONFIG_WIRELESS_WAPI_INITCONF=y
+CONFIG_WIRELESS_WAPI_STACKSIZE=4096