Merge branch 'feat/split_154_hal_components_v6.0' into 'release/v6.0'

feat(ieee802154): separated the 802.15.4 HAL codes from the HAL component (v6.0)

See merge request espressif/esp-idf!44966
This commit is contained in:
Jiang Jiang Jian
2026-02-02 19:07:06 +08:00
12 changed files with 28 additions and 22 deletions
@@ -0,0 +1,15 @@
idf_build_get_property(target IDF_TARGET)
set(includes "include")
set(srcs "")
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${target}/include")
list(APPEND includes "${target}/include")
endif()
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${target}/ieee802154_periph.c")
list(APPEND srcs "${target}/ieee802154_periph.c")
endif()
idf_component_register(SRCS ${srcs}
INCLUDE_DIRS ${includes})
@@ -1,10 +1,10 @@
/* /*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include "soc/ieee802154_periph.h" #include "hal/ieee802154_periph.h"
const ieee802154_conn_t ieee802154_periph = { const ieee802154_conn_t ieee802154_periph = {
.module = PERIPH_IEEE802154_MODULE, .module = PERIPH_IEEE802154_MODULE,
@@ -1,12 +1,11 @@
/* /*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#pragma once #pragma once
#include <stdbool.h>
#include "hal/ieee802154_common_ll.h" #include "hal/ieee802154_common_ll.h"
#define IEEE802154_TXPOWER_VALUE_MAX 20 #define IEEE802154_TXPOWER_VALUE_MAX 20
@@ -1,10 +1,10 @@
/* /*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include "soc/ieee802154_periph.h" #include "hal/ieee802154_periph.h"
const ieee802154_conn_t ieee802154_periph = { const ieee802154_conn_t ieee802154_periph = {
.module = PERIPH_IEEE802154_MODULE, .module = PERIPH_IEEE802154_MODULE,
@@ -1,12 +1,11 @@
/* /*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#pragma once #pragma once
#include <stdbool.h>
#include "hal/ieee802154_common_ll.h" #include "hal/ieee802154_common_ll.h"
#define IEEE802154_TXPOWER_VALUE_MAX 20 #define IEEE802154_TXPOWER_VALUE_MAX 20
@@ -1,10 +1,10 @@
/* /*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include "soc/ieee802154_periph.h" #include "hal/ieee802154_periph.h"
const ieee802154_conn_t ieee802154_periph = { const ieee802154_conn_t ieee802154_periph = {
.module = PERIPH_IEEE802154_MODULE, .module = PERIPH_IEEE802154_MODULE,
@@ -1,12 +1,11 @@
/* /*
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#pragma once #pragma once
#include <stdbool.h>
#include "hal/ieee802154_common_ll.h" #include "hal/ieee802154_common_ll.h"
#ifdef __cplusplus #ifdef __cplusplus
@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
+1 -1
View File
@@ -37,5 +37,5 @@ idf_component_register(
PRIV_INCLUDE_DIRS "${private_include}" PRIV_INCLUDE_DIRS "${private_include}"
LDFRAGMENTS linker.lf LDFRAGMENTS linker.lf
REQUIRES esp_coex REQUIRES esp_coex
PRIV_REQUIRES esp_phy esp_timer soc hal esp_pm PRIV_REQUIRES esp_phy esp_timer soc hal esp_pm esp_hal_ieee802154
) )
@@ -9,7 +9,7 @@
#include "freertos/portmacro.h" #include "freertos/portmacro.h"
#include "soc/periph_defs.h" #include "soc/periph_defs.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/ieee802154_periph.h" #include "hal/ieee802154_periph.h"
#include "esp_private/esp_modem_clock.h" #include "esp_private/esp_modem_clock.h"
#include "esp_check.h" #include "esp_check.h"
#include "esp_coex_i154.h" #include "esp_coex_i154.h"
-6
View File
@@ -82,12 +82,6 @@ if(CONFIG_SOC_SDMMC_HOST_SUPPORTED)
list(APPEND srcs "${target_folder}/sdmmc_periph.c") list(APPEND srcs "${target_folder}/sdmmc_periph.c")
endif() endif()
if(CONFIG_SOC_IEEE802154_SUPPORTED)
if(NOT target STREQUAL "esp32h4")
list(APPEND srcs "${target_folder}/ieee802154_periph.c")
endif()
endif()
if(CONFIG_SOC_SDIO_SLAVE_SUPPORTED) if(CONFIG_SOC_SDIO_SLAVE_SUPPORTED)
list(APPEND srcs "${target_folder}/sdio_slave_periph.c") list(APPEND srcs "${target_folder}/sdio_slave_periph.c")
endif() endif()