From cf3647fe40eaa5fb31e3500f67c39b8e6ae2eff2 Mon Sep 17 00:00:00 2001
From: xiehang <xiehang@espressif.com>
Date: Fri, 31 May 2019 19:09:29 +0800
Subject: [PATCH] wps: add overlap event (backport v3.3)      modify some
 header files to be consistent with vnc

---
 components/esp32/event_default_handlers.c             |  4 ++++
 components/esp32/include/esp_event_legacy.h           |  1 +
 components/esp32/lib                                  |  2 +-
 .../wpa_supplicant/include/wpa2/eap_peer/eap_i.h      | 11 +++++++++--
 components/wpa_supplicant/include/wps/wps.h           |  6 +++---
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/components/esp32/event_default_handlers.c b/components/esp32/event_default_handlers.c
index bb5676bca..d1c2e13be 100644
--- a/components/esp32/event_default_handlers.c
+++ b/components/esp32/event_default_handlers.c
@@ -365,6 +365,10 @@ static esp_err_t esp_system_event_debug(system_event_t *event)
         ESP_LOGD(TAG, "SYSTEM_EVENT_STA_WPS_ER_PIN");
         break;
     }
+    case SYSTEM_EVENT_STA_WPS_ER_PBC_OVERLAP: {
+        ESP_LOGD(TAG, "SYSTEM_EVENT_STA_WPS_ER_PBC_OVERLAP");
+        break;
+    }
     case SYSTEM_EVENT_AP_START: {
         ESP_LOGD(TAG, "SYSTEM_EVENT_AP_START");
         break;
diff --git a/components/esp32/include/esp_event_legacy.h b/components/esp32/include/esp_event_legacy.h
index 9da523031..0ee6046c7 100644
--- a/components/esp32/include/esp_event_legacy.h
+++ b/components/esp32/include/esp_event_legacy.h
@@ -40,6 +40,7 @@ typedef enum {
     SYSTEM_EVENT_STA_WPS_ER_FAILED,        /**< ESP32 station wps fails in enrollee mode */
     SYSTEM_EVENT_STA_WPS_ER_TIMEOUT,       /**< ESP32 station wps timeout in enrollee mode */
     SYSTEM_EVENT_STA_WPS_ER_PIN,           /**< ESP32 station wps pin code in enrollee mode */
+    SYSTEM_EVENT_STA_WPS_ER_PBC_OVERLAP,   /*!< ESP32 station wps overlap in enrollee mode */
     SYSTEM_EVENT_AP_START,                 /**< ESP32 soft-AP start */
     SYSTEM_EVENT_AP_STOP,                  /**< ESP32 soft-AP stop */
     SYSTEM_EVENT_AP_STACONNECTED,          /**< a station connected to ESP32 soft-AP */
diff --git a/components/esp32/lib b/components/esp32/lib
index b8b96f985..fc518f822 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit b8b96f985aee155682a2907c6c0f3b693bb43785
+Subproject commit fc518f822e23b6f4fd8870d61cb1dba107727df2
diff --git a/components/wpa_supplicant/include/wpa2/eap_peer/eap_i.h b/components/wpa_supplicant/include/wpa2/eap_peer/eap_i.h
index 6204f4653..99a47a7a1 100644
--- a/components/wpa_supplicant/include/wpa2/eap_peer/eap_i.h
+++ b/components/wpa_supplicant/include/wpa2/eap_peer/eap_i.h
@@ -98,6 +98,14 @@ struct eap_method {
 #define BLOB_NAME_LEN		3
 #define BLOB_NUM		3
 
+
+enum SIG_WPA2 {
+	    SIG_WPA2_START = 0,
+	    SIG_WPA2_RX,
+	    SIG_WPA2_TASK_DEL,
+	    SIG_WPA2_MAX,
+	};
+
 /**
  * struct eap_sm - EAP state machine data
  */
@@ -114,8 +122,7 @@ struct eap_sm {
 	u8 current_identifier;
 	u8 ownaddr[ETH_ALEN];
 #ifdef USE_WPA2_TASK
-#define SIG_WPA2_NUM 2
-    	u8 wpa2_sig_cnt[SIG_WPA2_NUM];
+    	u8 wpa2_sig_cnt[SIG_WPA2_MAX];
 #endif
 	u8 finish_state;
 
diff --git a/components/wpa_supplicant/include/wps/wps.h b/components/wpa_supplicant/include/wps/wps.h
index b731b9b95..31092cbb8 100644
--- a/components/wpa_supplicant/include/wps/wps.h
+++ b/components/wpa_supplicant/include/wps/wps.h
@@ -1009,9 +1009,9 @@ enum wps_cb_status {
 typedef void (*wps_st_cb_t)(int status);
 
 #ifdef USE_WPS_TASK
-#define SIG_WPS_START	0
-#define	SIG_WPS_RX	1
-#define	SIG_WPS_NUM	2
+#define SIG_WPS_START	2
+#define	SIG_WPS_RX	3
+#define	SIG_WPS_NUM	9
 #endif
 
 #define WPS_EAP_EXT_VENDOR_TYPE "WFA-SimpleConfig-Enrollee-1-0"