Procházet zdrojové kódy

Revert "Refactor wifi_interface_t"

This reverts commit ae246927851f30d1f437b0dd7f41110abc854657.

Closes: https://github.com/espressif/arduino-esp32/issues/4905
xiehang před 4 roky
rodič
revize
cd90dfa38b

+ 4 - 4
components/esp32/include/esp_wifi_types.h

@@ -33,10 +33,10 @@ typedef enum {
     WIFI_MODE_MAX
 } wifi_mode_t;
 
-typedef enum {
-    WIFI_IF_STA = ESP_IF_WIFI_STA,
-    WIFI_IF_AP  = ESP_IF_WIFI_AP,
-} wifi_interface_t;
+typedef esp_interface_t wifi_interface_t;
+
+#define WIFI_IF_STA ESP_IF_WIFI_STA
+#define WIFI_IF_AP  ESP_IF_WIFI_AP
 
 typedef enum {
     WIFI_COUNTRY_POLICY_AUTO,   /**< Country policy is auto, use the country info of AP to which the station is connected */

+ 1 - 1
components/esp32/lib

@@ -1 +1 @@
-Subproject commit d518cc7e8b25fda6930129e166bcb490504a7f8e
+Subproject commit b3c748ed8a2603f57a4ecda8cbf0405570586597

+ 1 - 1
components/lwip/port/esp32/netif/wlanif.c

@@ -114,7 +114,7 @@ low_level_output(struct netif *netif, struct pbuf *p)
   struct pbuf *q = p;
   err_t ret;
 
-  if (wifi_if > WIFI_IF_AP) {
+  if (wifi_if >= ESP_IF_MAX) {
     return ERR_IF;
   }