From 6b6bb3a321395ec8b57703c343f03378dff99552 Mon Sep 17 00:00:00 2001 From: wuzhenghui Date: Tue, 12 Jul 2022 22:00:58 +0800 Subject: [PATCH] esp32c6: add wpa_supplicant support --- .../wpa_supplicant/esp_supplicant/src/esp_wps.c | 14 +------------- components/wpa_supplicant/src/utils/includes.h | 2 ++ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wps.c b/components/wpa_supplicant/esp_supplicant/src/esp_wps.c index 1c1b5037a5..90b1bb2144 100644 --- a/components/wpa_supplicant/esp_supplicant/src/esp_wps.c +++ b/components/wpa_supplicant/esp_supplicant/src/esp_wps.c @@ -29,19 +29,7 @@ #include "eap_common/eap_wsc_common.h" #include "esp_wpas_glue.h" -#if CONFIG_IDF_TARGET_ESP32 -const char *wps_model_number = "ESP32"; -#elif CONFIG_IDF_TARGET_ESP32S2 -const char *wps_model_number = "ESP32S2"; -#elif CONFIG_IDF_TARGET_ESP32S3 -const char *wps_model_number = "ESP32S3"; -#elif CONFIG_IDF_TARGET_ESP32C3 -const char *wps_model_number = "ESP32C3"; -#elif CONFIG_IDF_TARGET_ESP32C2 -const char *wps_model_number = "ESP32C2"; -#elif CONFIG_IDF_TARGET_ESP32H2 -const char *wps_model_number = "ESP32H2"; -#endif +const char *wps_model_number = CONFIG_IDF_TARGET; void *s_wps_api_lock = NULL; /* Used in WPS public API only, never be freed */ void *s_wps_api_sem = NULL; /* Sync semaphore used between WPS publi API caller task and WPS task */ diff --git a/components/wpa_supplicant/src/utils/includes.h b/components/wpa_supplicant/src/utils/includes.h index 45a2da95ce..f9c4c41599 100644 --- a/components/wpa_supplicant/src/utils/includes.h +++ b/components/wpa_supplicant/src/utils/includes.h @@ -71,6 +71,8 @@ #include "esp32c2/rom/ets_sys.h" #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/ets_sys.h" +#elif CONFIG_IDF_TARGET_ESP32C6 +#include "esp32c6/rom/ets_sys.h" #endif #endif /* !__ets__ */