fix(wifi_remote): Preprocess injected headers

Author: david-cermak

components/esp_wifi_remote/CMakeLists.txt

@@ -48,7 +48,7 @@ idf_component_get_property(wifi esp_wifi COMPONENT_LIB)
 
 # Update wifi include directories to prepend the injected dir with modified headers supporting SLAVE capability
 get_target_property(original_wifi_dirs ${wifi} INTERFACE_INCLUDE_DIRECTORIES)
-set(updated_wifi_dirs "${CMAKE_CURRENT_SOURCE_DIR}/include/injected" ${original_wifi_dirs})
+set(updated_wifi_dirs "${CMAKE_CURRENT_SOURCE_DIR}/${IDF_VER_DIR}/include/injected" ${original_wifi_dirs})
 set_target_properties(${wifi} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${updated_wifi_dirs}")
 
 target_link_libraries(${wifi} PUBLIC ${COMPONENT_LIB})

components/esp_wifi_remote/idf_v5.5/include/injected/esp_wifi.h

@@ -123,55 +123,55 @@ typedef struct {
     int                    magic;                  /**< WiFi init magic number, it should be the last field */
 } wifi_init_config_t;
 
-#ifdef CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM
-#define WIFI_STATIC_TX_BUFFER_NUM CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM
+#ifdef CONFIG_WIFI_RMT_STATIC_TX_BUFFER_NUM
+#define WIFI_STATIC_TX_BUFFER_NUM CONFIG_WIFI_RMT_STATIC_TX_BUFFER_NUM
 #else
 #define WIFI_STATIC_TX_BUFFER_NUM 0
 #endif
 
-#ifdef CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM
-#define WIFI_CACHE_TX_BUFFER_NUM  CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM
+#ifdef CONFIG_WIFI_RMT_CACHE_TX_BUFFER_NUM
+#define WIFI_CACHE_TX_BUFFER_NUM  CONFIG_WIFI_RMT_CACHE_TX_BUFFER_NUM
 #else
 #define WIFI_CACHE_TX_BUFFER_NUM  0
 #endif
 
-#ifdef CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
-#define WIFI_DYNAMIC_TX_BUFFER_NUM CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
+#ifdef CONFIG_WIFI_RMT_DYNAMIC_TX_BUFFER_NUM
+#define WIFI_DYNAMIC_TX_BUFFER_NUM CONFIG_WIFI_RMT_DYNAMIC_TX_BUFFER_NUM
 #else
 #define WIFI_DYNAMIC_TX_BUFFER_NUM 0
 #endif
 
-#ifdef CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF
-#define WIFI_RX_MGMT_BUF_NUM_DEF CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF
+#ifdef CONFIG_WIFI_RMT_RX_MGMT_BUF_NUM_DEF
+#define WIFI_RX_MGMT_BUF_NUM_DEF CONFIG_WIFI_RMT_RX_MGMT_BUF_NUM_DEF
 #else
 #define WIFI_RX_MGMT_BUF_NUM_DEF 0
 #endif
 
-#if CONFIG_ESP_WIFI_CSI_ENABLED
+#if CONFIG_WIFI_RMT_CSI_ENABLED
 #define WIFI_CSI_ENABLED         1
 #else
 #define WIFI_CSI_ENABLED         0
 #endif
 
-#if CONFIG_ESP_WIFI_AMPDU_RX_ENABLED
+#if CONFIG_WIFI_RMT_AMPDU_RX_ENABLED
 #define WIFI_AMPDU_RX_ENABLED        1
 #else
 #define WIFI_AMPDU_RX_ENABLED        0
 #endif
 
-#if CONFIG_ESP_WIFI_AMPDU_TX_ENABLED
+#if CONFIG_WIFI_RMT_AMPDU_TX_ENABLED
 #define WIFI_AMPDU_TX_ENABLED        1
 #else
 #define WIFI_AMPDU_TX_ENABLED        0
 #endif
 
-#if CONFIG_ESP_WIFI_AMSDU_TX_ENABLED
+#if CONFIG_WIFI_RMT_AMSDU_TX_ENABLED
 #define WIFI_AMSDU_TX_ENABLED        1
 #else
 #define WIFI_AMSDU_TX_ENABLED        0
 #endif
 
-#if CONFIG_ESP_WIFI_NVS_ENABLED
+#if CONFIG_WIFI_RMT_NVS_ENABLED
 #define WIFI_NVS_ENABLED          1
 #else
 #define WIFI_NVS_ENABLED          0
@@ -188,37 +188,37 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
 
 #define WIFI_INIT_CONFIG_MAGIC    0x1F2F3F4F
 
-#ifdef CONFIG_ESP_WIFI_AMPDU_RX_ENABLED
-#define WIFI_DEFAULT_RX_BA_WIN CONFIG_ESP_WIFI_RX_BA_WIN
+#ifdef CONFIG_WIFI_RMT_AMPDU_RX_ENABLED
+#define WIFI_DEFAULT_RX_BA_WIN CONFIG_WIFI_RMT_RX_BA_WIN
 #else
 #define WIFI_DEFAULT_RX_BA_WIN 0 /* unused if ampdu_rx_enable == false */
 #endif
 
-#if CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1
+#if CONFIG_WIFI_RMT_TASK_PINNED_TO_CORE_1
 #define WIFI_TASK_CORE_ID 1
 #else
 #define WIFI_TASK_CORE_ID 0
 #endif
 
-#ifdef CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN
-#define WIFI_SOFTAP_BEACON_MAX_LEN CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN
+#ifdef CONFIG_WIFI_RMT_SOFTAP_BEACON_MAX_LEN
+#define WIFI_SOFTAP_BEACON_MAX_LEN CONFIG_WIFI_RMT_SOFTAP_BEACON_MAX_LEN
 #else
 #define WIFI_SOFTAP_BEACON_MAX_LEN 752
 #endif
 
-#ifdef CONFIG_ESP_WIFI_MGMT_SBUF_NUM
-#define WIFI_MGMT_SBUF_NUM CONFIG_ESP_WIFI_MGMT_SBUF_NUM
+#ifdef CONFIG_WIFI_RMT_MGMT_SBUF_NUM
+#define WIFI_MGMT_SBUF_NUM CONFIG_WIFI_RMT_MGMT_SBUF_NUM
 #else
 #define WIFI_MGMT_SBUF_NUM 32
 #endif
 
-#if CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE
+#if CONFIG_WIFI_RMT_STA_DISCONNECTED_PM_ENABLE
 #define WIFI_STA_DISCONNECTED_PM_ENABLED true
 #else
 #define WIFI_STA_DISCONNECTED_PM_ENABLED false
 #endif
 
-#if CONFIG_ESP_WIFI_ENABLE_WPA3_SAE
+#if CONFIG_WIFI_RMT_ENABLE_WPA3_SAE
 #define WIFI_ENABLE_WPA3_SAE (1<<0)
 #else
 #define WIFI_ENABLE_WPA3_SAE 0
@@ -230,50 +230,50 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
 #define WIFI_ENABLE_CACHE_TX_BUFFER 0
 #endif
 
-#if CONFIG_ESP_WIFI_FTM_INITIATOR_SUPPORT
+#if CONFIG_WIFI_RMT_FTM_INITIATOR_SUPPORT
 #define WIFI_FTM_INITIATOR (1<<2)
 #else
 #define WIFI_FTM_INITIATOR 0
 #endif
 
-#if CONFIG_ESP_WIFI_FTM_RESPONDER_SUPPORT
+#if CONFIG_WIFI_RMT_FTM_RESPONDER_SUPPORT
 #define WIFI_FTM_RESPONDER (1<<3)
 #else
 #define WIFI_FTM_RESPONDER 0
 #endif
 
-#if CONFIG_ESP_WIFI_GCMP_SUPPORT
+#if CONFIG_WIFI_RMT_GCMP_SUPPORT
 #define WIFI_ENABLE_GCMP (1<<4)
 #else
 #define WIFI_ENABLE_GCMP 0
 #endif
 
-#if CONFIG_ESP_WIFI_GMAC_SUPPORT
+#if CONFIG_WIFI_RMT_GMAC_SUPPORT
 #define WIFI_ENABLE_GMAC (1<<5)
 #else
 #define WIFI_ENABLE_GMAC 0
 #endif
 
-#if CONFIG_ESP_WIFI_11R_SUPPORT
+#if CONFIG_WIFI_RMT_11R_SUPPORT
 #define WIFI_ENABLE_11R (1<<6)
 #else
 #define WIFI_ENABLE_11R 0
 #endif
 
-#if CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT
+#if CONFIG_WIFI_RMT_ENTERPRISE_SUPPORT
 #define WIFI_ENABLE_ENTERPRISE (1<<7)
 #else
 #define WIFI_ENABLE_ENTERPRISE 0
 #endif
 
-#if CONFIG_ESP_WIFI_ENABLE_DUMP_HESIGB && !WIFI_CSI_ENABLED
+#if CONFIG_WIFI_RMT_ENABLE_DUMP_HESIGB && !WIFI_CSI_ENABLED
 #define WIFI_DUMP_HESIGB_ENABLED  true
 #else
 #define WIFI_DUMP_HESIGB_ENABLED  false
 #endif
 
-#if CONFIG_ESP_WIFI_TX_HETB_QUEUE_NUM
-#define WIFI_TX_HETB_QUEUE_NUM CONFIG_ESP_WIFI_TX_HETB_QUEUE_NUM
+#if CONFIG_WIFI_RMT_TX_HETB_QUEUE_NUM
+#define WIFI_TX_HETB_QUEUE_NUM CONFIG_WIFI_RMT_TX_HETB_QUEUE_NUM
 #else
 #define WIFI_TX_HETB_QUEUE_NUM 1
 #endif
@@ -300,12 +300,12 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
 #define WIFI_INIT_CONFIG_DEFAULT() { \
     .osi_funcs = &g_wifi_osi_funcs, \
     .wpa_crypto_funcs = g_wifi_default_wpa_crypto_funcs, \
-    .static_rx_buf_num = CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM,\
-    .dynamic_rx_buf_num = CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM,\
-    .tx_buf_type = CONFIG_ESP_WIFI_TX_BUFFER_TYPE,\
+    .static_rx_buf_num = CONFIG_WIFI_RMT_STATIC_RX_BUFFER_NUM,\
+    .dynamic_rx_buf_num = CONFIG_WIFI_RMT_DYNAMIC_RX_BUFFER_NUM,\
+    .tx_buf_type = CONFIG_WIFI_RMT_TX_BUFFER_TYPE,\
     .static_tx_buf_num = WIFI_STATIC_TX_BUFFER_NUM,\
     .dynamic_tx_buf_num = WIFI_DYNAMIC_TX_BUFFER_NUM,\
-    .rx_mgmt_buf_type = CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF,\
+    .rx_mgmt_buf_type = CONFIG_WIFI_RMT_DYNAMIC_RX_MGMT_BUF,\
     .rx_mgmt_buf_num = WIFI_RX_MGMT_BUF_NUM_DEF,\
     .cache_tx_buf_num = WIFI_CACHE_TX_BUFFER_NUM,\
     .csi_enable = WIFI_CSI_ENABLED,\
@@ -320,7 +320,7 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
     .mgmt_sbuf_num = WIFI_MGMT_SBUF_NUM, \
     .feature_caps = WIFI_FEATURE_CAPS, \
     .sta_disconnected_pm = WIFI_STA_DISCONNECTED_PM_ENABLED,  \
-    .espnow_max_encrypt_num = CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM, \
+    .espnow_max_encrypt_num = CONFIG_WIFI_RMT_ESPNOW_MAX_ENCRYPT_NUM, \
     .tx_hetb_queue_num = WIFI_TX_HETB_QUEUE_NUM, \
     .dump_hesigb_enable = WIFI_DUMP_HESIGB_ENABLED, \
     .magic = WIFI_INIT_CONFIG_MAGIC\
@@ -676,8 +676,8 @@ esp_err_t esp_wifi_get_ps(wifi_ps_type_t *type);
 /**
   * @brief     Set protocol type of specified interface
   *            The default protocol is (WIFI_PROTOCOL_11B|WIFI_PROTOCOL_11G|WIFI_PROTOCOL_11N).
-  *            if CONFIG_SOC_WIFI_HE_SUPPORT and band mode is 2.4G, the default protocol is (WIFI_PROTOCOL_11B|WIFI_PROTOCOL_11G|WIFI_PROTOCOL_11N|WIFI_PROTOCOL_11AX).
-  *            if CONFIG_SOC_WIFI_SUPPORT_5G and band mode is 5G, the default protocol is (WIFI_PROTOCOL_11A|WIFI_PROTOCOL_11N|WIFI_PROTOCOL_11AC|WIFI_PROTOCOL_11AX).
+  *            if CONFIG_SLAVE_SOC_WIFI_HE_SUPPORT and band mode is 2.4G, the default protocol is (WIFI_PROTOCOL_11B|WIFI_PROTOCOL_11G|WIFI_PROTOCOL_11N|WIFI_PROTOCOL_11AX).
+  *            if CONFIG_SLAVE_SOC_WIFI_SUPPORT_5G and band mode is 5G, the default protocol is (WIFI_PROTOCOL_11A|WIFI_PROTOCOL_11N|WIFI_PROTOCOL_11AC|WIFI_PROTOCOL_11AX).
   *
   * @attention 1. When WiFi band mode is 2.4G only, support 802.11b or 802.11bg or 802.11bgn or 802.11bgnax or LR mode
   * @attention 2. When WiFi band mode is 5G only, support 802.11a or 802.11an or 802.11anac or 802.11anacax
@@ -1669,8 +1669,8 @@ esp_err_t esp_wifi_get_band(wifi_band_t* band);
   * @attention 1. When the WiFi band mode is set to 2.4G only, it operates exclusively on the 2.4GHz channels.
   * @attention 2. When the WiFi band mode is set to 5G only, it operates exclusively on the 5GHz channels.
   * @attention 3. When the WiFi band mode is set to 2.4G + 5G (WIFI_BAND_MODE_AUTO), it can operate on both the 2.4GHz and 5GHz channels.
-  * @attention 4. WiFi band mode can be set to 5G only or 2.4G + 5G (WIFI_BAND_MODE_AUTO) if CONFIG_SOC_WIFI_SUPPORT_5G is supported.
-  * @attention 5. If CONFIG_SOC_WIFI_SUPPORT_5G is not supported, the API will return ESP_ERR_INVALID_ARG when the band mode is set to either 5G only or 2.4G + 5G (WIFI_BAND_MODE_AUTO).
+  * @attention 4. WiFi band mode can be set to 5G only or 2.4G + 5G (WIFI_BAND_MODE_AUTO) if CONFIG_SLAVE_SOC_WIFI_SUPPORT_5G is supported.
+  * @attention 5. If CONFIG_SLAVE_SOC_WIFI_SUPPORT_5G is not supported, the API will return ESP_ERR_INVALID_ARG when the band mode is set to either 5G only or 2.4G + 5G (WIFI_BAND_MODE_AUTO).
   * @attention 6. When a WiFi band mode change triggers a band change, if no channel is set for the current band, a default channel will be assigned: channel 1 for 2.4G band and channel 36 for 5G band.
   *
   * @param[in]    band_mode store the band mode of WiFi
@@ -1733,7 +1733,7 @@ esp_err_t esp_wifi_set_protocols(wifi_interface_t ifx, wifi_protocols_t *protoco
 /**
   * @brief     Get the current protocol of the specified interface and specified band
   *
-  * @attention 1. The 5G protocol can only be read when CONFIG_SOC_WIFI_SUPPORT_5G is enabled.
+  * @attention 1. The 5G protocol can only be read when CONFIG_SLAVE_SOC_WIFI_SUPPORT_5G is enabled.
   * @attention 2. When the WiFi band mode is set to 2.4G only, it will not get 5G protocol
   * @attention 3. When the WiFi band mode is set to 5G only, it will not get 2.4G protocol
   *
@@ -1772,7 +1772,7 @@ esp_err_t esp_wifi_set_bandwidths(wifi_interface_t ifx, wifi_bandwidths_t* bw);
 /**
   * @brief     Get the bandwidth of specified interface and specified band
   *
-  * @attention 1. The 5G bandwidth can only be read when CONFIG_SOC_WIFI_SUPPORT_5G is enabled.
+  * @attention 1. The 5G bandwidth can only be read when CONFIG_SLAVE_SOC_WIFI_SUPPORT_5G is enabled.
   * @attention 2. When the WiFi band mode is set to 2.4G only, it will not get 5G bandwidth
   * @attention 3. When the WiFi band mode is set to 5G only, it will not get 2.4G bandwidth
   *

components/esp_wifi_remote/idf_v5.5/include/injected/esp_wifi_he_types.h

@@ -41,7 +41,7 @@ enum {
 /**
   * @brief Channel state information(CSI) configuration type
   */
-#if CONFIG_SOC_WIFI_MAC_VERSION_NUM == 3
+#if CONFIG_SLAVE_SOC_WIFI_MAC_VERSION_NUM == 3
 typedef struct {
     uint32_t enable                 : 1;    /**< enable to acquire CSI */
     uint32_t acquire_csi_legacy     : 1;    /**< enable to acquire L-LTF */
@@ -172,7 +172,7 @@ typedef enum {
 /**
   * @brief RxControl Info
   */
-#if CONFIG_SOC_WIFI_MAC_VERSION_NUM == 3
+#if CONFIG_SLAVE_SOC_WIFI_MAC_VERSION_NUM == 3
 typedef struct {
     signed rssi: 8;                               /**< the RSSI of the reception frame */
     unsigned rate: 5;                             /**< if cur_bb_format is RX_BB_FORMAT_11B, it's the transmission rate. otherwise it's Rate field of L-SIG */

components/esp_wifi_remote/idf_v5.5/include/injected/esp_wifi_types_generic.h

@@ -35,7 +35,7 @@ typedef enum {
 typedef enum {
     WIFI_IF_STA = ESP_IF_WIFI_STA,    /**< Station interface */
     WIFI_IF_AP  = ESP_IF_WIFI_AP,     /**< Soft-AP interface */
-#if CONFIG_SOC_WIFI_NAN_SUPPORT || !CONFIG_SOC_WIFI_ENABLED
+#if CONFIG_SLAVE_SOC_WIFI_NAN_SUPPORT || !CONFIG_SLAVE_SOC_WIFI_ENABLED
     WIFI_IF_NAN = ESP_IF_WIFI_NAN,    /**< NAN interface */
 #endif
     WIFI_IF_MAX                       /**< Maximum number of interfaces */
@@ -64,7 +64,7 @@ typedef struct {
     uint8_t               nchan;   /**< Total channel number of the allowed 2.4GHz Wi-Fi channels */
     int8_t                max_tx_power;   /**< This field is used for getting Wi-Fi maximum transmitting power, call esp_wifi_set_max_tx_power to set the maximum transmitting power. */
     wifi_country_policy_t policy;  /**< Country policy */
-#if CONFIG_SOC_WIFI_SUPPORT_5G
+#if CONFIG_SLAVE_SOC_WIFI_SUPPORT_5G
     uint32_t              wifi_5g_channel_mask;  /**< A bitmask representing the allowed 5GHz Wi-Fi channels.
                                                       Each bit in the mask corresponds to a specific channel as wifi_5g_channel_bit_t shown.
                                                       Bitmask set to 0 indicates 5GHz channels are allowed according to local regulatory rules.
@@ -936,7 +936,7 @@ typedef enum {
     WIFI_PHY_RATE_MCS5_LGI  = 0x15, /**< MCS5 with long GI */
     WIFI_PHY_RATE_MCS6_LGI  = 0x16, /**< MCS6 with long GI */
     WIFI_PHY_RATE_MCS7_LGI  = 0x17, /**< MCS7 with long GI */
-#if CONFIG_SOC_WIFI_HE_SUPPORT || !CONFIG_SOC_WIFI_SUPPORTED
+#if CONFIG_SLAVE_SOC_WIFI_HE_SUPPORT || !CONFIG_SLAVE_SOC_WIFI_SUPPORTED
     WIFI_PHY_RATE_MCS8_LGI,         /**< MCS8 with long GI */
     WIFI_PHY_RATE_MCS9_LGI,         /**< MCS9 with long GI */
 #endif
@@ -949,7 +949,7 @@ typedef enum {
     WIFI_PHY_RATE_MCS5_SGI,         /**< MCS5 with short GI */
     WIFI_PHY_RATE_MCS6_SGI,         /**< MCS6 with short GI */
     WIFI_PHY_RATE_MCS7_SGI,         /**< MCS7 with short GI */
-#if CONFIG_SOC_WIFI_HE_SUPPORT || !CONFIG_SOC_WIFI_SUPPORTED
+#if CONFIG_SLAVE_SOC_WIFI_HE_SUPPORT || !CONFIG_SLAVE_SOC_WIFI_SUPPORTED
     WIFI_PHY_RATE_MCS8_SGI,         /**< MCS8 with short GI */
     WIFI_PHY_RATE_MCS9_SGI,         /**< MCS9 with short GI */
 #endif

components/esp_wifi_remote/scripts/generate_and_check.py

@@ -332,30 +332,30 @@ def generate_wifi_native(idf_path, idf_ver_dir, component_path):
     injected_wifi_h = os.path.join(component_path, idf_ver_dir, 'include', 'injected', 'esp_wifi.h')
     original_wifi_h = os.path.join(idf_path, 'components', 'esp_wifi', 'include', 'esp_wifi.h')
     content = open(original_wifi_h, 'r').read()
-    # content = content.replace(r'CONFIG_ESP_WIFI_','CONFIG_WIFI_RMT_')
-    # content = content.replace(r'CONFIG_SOC_WIFI_','CONFIG_SLAVE_SOC_WIFI_')
-    # content = content.replace(r'CONFIG_FREERTOS_','CONFIG_SLAVE_FREERTOS_')
-    # content = content.replace(r'CONFIG_IDF_TARGET_','CONFIG_SLAVE_IDF_TARGET_')
+    content = content.replace(r'CONFIG_ESP_WIFI_','CONFIG_WIFI_RMT_')
+    content = content.replace(r'CONFIG_SOC_WIFI_','CONFIG_SLAVE_SOC_WIFI_')
+    content = content.replace(r'CONFIG_FREERTOS_','CONFIG_SLAVE_FREERTOS_')
+    content = content.replace(r'CONFIG_IDF_TARGET_','CONFIG_SLAVE_IDF_TARGET_')
     open(injected_wifi_h, 'w').write(content)
     native_headers.append(injected_wifi_h)
 
     injected_wifi_generic_types = os.path.join(component_path, idf_ver_dir, 'include', 'injected', 'esp_wifi_types_generic.h')
     original_wifi_generic_types = os.path.join(idf_path, 'components', 'esp_wifi', 'include', 'esp_wifi_types_generic.h')
     content = open(original_wifi_generic_types, 'r').read()
-    # content = content.replace(r'CONFIG_ESP_WIFI_','CONFIG_WIFI_RMT_')
-    # content = content.replace(r'CONFIG_SOC_WIFI_','CONFIG_SLAVE_SOC_WIFI_')
-    # content = content.replace(r'CONFIG_FREERTOS_','CONFIG_SLAVE_FREERTOS_')
-    # content = content.replace(r'CONFIG_IDF_TARGET_','CONFIG_SLAVE_IDF_TARGET_')
+    content = content.replace(r'CONFIG_ESP_WIFI_','CONFIG_WIFI_RMT_')
+    content = content.replace(r'CONFIG_SOC_WIFI_','CONFIG_SLAVE_SOC_WIFI_')
+    content = content.replace(r'CONFIG_FREERTOS_','CONFIG_SLAVE_FREERTOS_')
+    content = content.replace(r'CONFIG_IDF_TARGET_','CONFIG_SLAVE_IDF_TARGET_')
     open(injected_wifi_generic_types, 'w').write(content)
     native_headers.append(injected_wifi_generic_types)
 
     injected_wifi_he_types = os.path.join(component_path, idf_ver_dir, 'include', 'injected', 'esp_wifi_he_types.h')
     original_wifi_he_types = os.path.join(idf_path, 'components', 'esp_wifi', 'include', 'esp_wifi_he_types.h')
     content = open(original_wifi_he_types, 'r').read()
-    # content = content.replace(r'CONFIG_ESP_WIFI_','CONFIG_WIFI_RMT_')
-    # content = content.replace(r'CONFIG_SOC_WIFI_','CONFIG_SLAVE_SOC_WIFI_')
-    # content = content.replace(r'CONFIG_FREERTOS_','CONFIG_SLAVE_FREERTOS_')
-    # content = content.replace(r'CONFIG_IDF_TARGET_','CONFIG_SLAVE_IDF_TARGET_')
+    content = content.replace(r'CONFIG_ESP_WIFI_','CONFIG_WIFI_RMT_')
+    content = content.replace(r'CONFIG_SOC_WIFI_','CONFIG_SLAVE_SOC_WIFI_')
+    content = content.replace(r'CONFIG_FREERTOS_','CONFIG_SLAVE_FREERTOS_')
+    content = content.replace(r'CONFIG_IDF_TARGET_','CONFIG_SLAVE_IDF_TARGET_')
     open(injected_wifi_he_types, 'w').write(content)
     native_headers.append(injected_wifi_he_types)
     return native_headers