IDF release/v3.3 cd59d107b (espressif#4708)

Co-authored-by: me-no-dev <[email protected]>

Author: me-no-dev

tools/sdk/include/config/sdkconfig.h

@@ -373,6 +373,7 @@
 #defineCONFIG_SPIFFS_PAGE_SIZE 256
 #defineCONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED 1
 #defineCONFIG_ESP32_DPORT_WORKAROUND 1
+#defineCONFIG_GATTS_BLUFI_ENABLE 1
 #defineCONFIG_PPP_MSCHAP_SUPPORT 1
 #defineCONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0 1
 #defineCONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT 2048
@@ -395,5 +396,5 @@
 #defineCONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
 #defineCONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
 #defineCONFIG_FATFS_API_ENCODING_ANSI_OEM 1
-#defineCONFIG_ARDUINO_IDF_COMMIT "71df1f742"
+#defineCONFIG_ARDUINO_IDF_COMMIT "cd59d107b"
 #defineCONFIG_ARDUINO_IDF_BRANCH "release/v3.3"

tools/sdk/include/esp32/esp_event_legacy.h

@@ -106,9 +106,6 @@ typedef struct{
 tcpip_adapter_ip6_info_tip6_info;
 } system_event_got_ip6_t;
 
-/** Argument structure of SYSTEM_EVENT_STA_WPS_ER_SUCCESS event */
-typedefwifi_event_sta_wps_er_success_tsystem_event_sta_wps_er_success_t;
-
 typedefstruct{
 uint8_tmac[6]; /**< MAC address of the station connected to ESP32 soft-AP */
 uint8_taid; /**< the aid that ESP32 soft-AP gives to the station connected to */
@@ -136,7 +133,6 @@ typedef union{
 system_event_sta_got_ip_tgot_ip; /**< ESP32 station got IP, first time got IP or when IP is changed */
 system_event_sta_wps_er_pin_tsta_er_pin; /**< ESP32 station WPS enrollee mode PIN code received */
 system_event_sta_wps_fail_reason_tsta_er_fail_reason;/**< ESP32 station WPS enrollee mode failed reason code received */
-system_event_sta_wps_er_success_tsta_er_success; /*!< ESP32 station WPS enrollee success */
 system_event_ap_staconnected_tsta_connected; /**< a station connected to ESP32 soft-AP */
 system_event_ap_stadisconnected_tsta_disconnected; /**< a station disconnected to ESP32 soft-AP */
 system_event_ap_probe_req_rx_tap_probereqrecved; /**< ESP32 soft-AP receive probe request packet */

tools/sdk/include/esp32/esp_wifi_types.h

@@ -502,19 +502,6 @@ typedef enum{
 WIFI_IOCTL_MAX,
 } wifi_ioctl_cmd_t;
 
-#defineMAX_SSID_LEN 32
-#defineMAX_PASSPHRASE_LEN 64
-#defineMAX_WPS_AP_CRED 3
-
-/** Argument structure for WIFI_EVENT_STA_WPS_ER_SUCCESS event */
-typedefstruct{
-uint8_tap_cred_cnt; /**< Number of AP credentials received */
-struct{
-uint8_tssid[MAX_SSID_LEN]; /**< SSID of AP */
-uint8_tpassphrase[MAX_PASSPHRASE_LEN]; /**< Passphrase for the AP */
- } ap_cred[MAX_WPS_AP_CRED]; /**< All AP credentials received from WPS handshake */
-} wifi_event_sta_wps_er_success_t;
-
 /** 
  * @brief Configuration for STA's HT2040 coexist management
  *

tools/sdk/include/wpa_supplicant/wps/wps.h

@@ -1024,14 +1024,13 @@ struct wps_sm{
 u8identity_len;
 u8ownaddr[ETH_ALEN];
 u8bssid[ETH_ALEN];
-u8ssid[MAX_WPS_AP_CRED][MAX_SSID_LEN];
-u8ssid_len[MAX_WPS_AP_CRED];
-charkey[MAX_WPS_AP_CRED][MAX_PASSPHRASE_LEN];
-u8key_len[MAX_WPS_AP_CRED];
-u8ap_cred_cnt;
+u8ssid[32];
+u8ssid_len;
 structwps_device_data*dev;
 u8uuid[16];
 u8eapol_version;
+charkey[64];
+u8key_len;
 ETSTimerwps_timeout_timer;
 ETSTimerwps_msg_timeout_timer;
 ETSTimerwps_scan_timer;
@@ -1055,8 +1054,8 @@ struct wps_sm{
 #defineIEEE80211_CAPINFO_PRIVACY 0x0010
 
 structwps_sm*wps_sm_get(void);
-intwps_ssid_save(u8*ssid, u8ssid_len, u8idx);
-intwps_key_save(char*key, u8key_len, u8idx);
+intwps_ssid_save(u8*ssid, u8ssid_len);
+intwps_key_save(char*key, u8key_len);
 intwps_station_wps_register_cb(wps_st_cb_tcb);
 intwps_station_wps_unregister_cb(void); 
 intwps_start_pending(void);