Merge branch 'fix/remove_the_duplicate_macro_definition_v5.4' into 'release/v5.4'

fix(openthread): remove the duplicate macro definition (v5.4)

See merge request espressif/esp-idf!43709

Author: chshu

components/openthread/include/esp_radio_spinel.h

@@ -18,10 +18,6 @@ extern "C" {
 
 #define ESP_SPINEL_LOG_TAG "ESP_RADIO_SPINEL"
 
-#define SPINEL_PROP_VENDOR_ESP_SET_COORDINATOR (SPINEL_PROP_VENDOR_ESP__BEGIN + 1)  /* Vendor command for coordinator.*/
-
-#define SPINEL_PROP_VENDOR_ESP_SET_PENDINGMODE (SPINEL_PROP_VENDOR_ESP__BEGIN + 2)  /* Vendor command for pending mode.*/
-
 typedef enum {
     ESP_RADIO_SPINEL_ZIGBEE = 0x0,      /* The index of Zigbee.*/
     ESP_RADIO_SPINEL_OPENTHREAD = 0x1,  /* The index of OpenThread.*/

components/openthread/private_include/esp_openthread_ncp.h

@@ -4,19 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <spinel.h>
 #include <esp_openthread.h>
 
-#if CONFIG_OPENTHREAD_NCP_VENDOR_HOOK
-
-#define SPINEL_PROP_VENDOR_ESP_SET_COORDINATOR (SPINEL_PROP_VENDOR_ESP__BEGIN + 1)
-
-#define SPINEL_PROP_VENDOR_ESP_SET_PENDINGMODE (SPINEL_PROP_VENDOR_ESP__BEGIN + 2)
-
-#define SPINEL_PROP_VENDOR_ESP_COEX_EVENT (SPINEL_PROP_VENDOR_ESP__BEGIN + 3)
-
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif

components/openthread/private_include/esp_spinel_ncp_vendor_macro.h

@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "spinel.h"
+
+#define SPINEL_PROP_VENDOR_ESP_SET_COORDINATOR (SPINEL_PROP_VENDOR_ESP__BEGIN + 1)  /* Vendor command for coordinator.*/
+
+#define SPINEL_PROP_VENDOR_ESP_SET_PENDINGMODE (SPINEL_PROP_VENDOR_ESP__BEGIN + 2)  /* Vendor command for pending mode.*/
+
+#define SPINEL_PROP_VENDOR_ESP_COEX_EVENT (SPINEL_PROP_VENDOR_ESP__BEGIN + 3)

components/openthread/src/ncp/esp_openthread_ncp.cpp

@@ -7,6 +7,7 @@
 #include "sdkconfig.h"
 #include "esp_ieee802154.h"
 #include "esp_openthread_ncp.h"
+#include "esp_spinel_ncp_vendor_macro.h"
 #include "ncp_base.hpp"
 
 #if (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)

components/openthread/src/spinel/esp_radio_spinel.cpp

@@ -12,6 +12,7 @@
 #include "esp_radio_spinel.h"
 #include "esp_radio_spinel_platform.h"
 #include "esp_radio_spinel_adapter.hpp"
+#include "esp_spinel_ncp_vendor_macro.h"
 #include "esp_radio_spinel_uart_interface.hpp"
 #include "spinel_driver.hpp"
 #include "openthread/link.h"