Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/support_multipan_feature_rcp_20260603' into 'master'

Browse Source 
feat(openthread): support multipan feature for RCP

See merge request espressif/esp-idf!49222
This commit is contained in:
Shu Chen
2026-08-17 06:04:08 +00:00
parent 93d5482e41 e8742df58c
commit a25d1a419f
27 changed files with 2049 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.codespellrc
View File

@@ -1,4 +1,4 @@
[codespell]
skip = build,*.yuv,components/fatfs/src/*,alice.txt,*.rgb,components/wpa_supplicant/*,components/esp_wifi/*,*.pem,*/COPYING*,docs/sphinx-known-warnings.txt
ignore-words-list = ser,dout,rsource,fram,inout,shs,ans,aci,unstall,unstalling,hart,wheight,wel,ot,fane,assertIn,registr,oen,parms
ignore-words-list = ser,dout,rsource,fram,inout,shs,ans,aci,unstall,unstalling,hart,wheight,wel,ot,fane,assertIn,registr,oen,parms,aCount
write-changes = true

4
components/ieee802154/CMakeLists.txt
View File

@@ -31,6 +31,10 @@ if(CONFIG_IEEE802154_DEBUG)
list(APPEND srcs "driver/esp_ieee802154_debug.c")
endif()
if(CONFIG_IEEE802154_MULTI_PAN_ENABLE)
list(APPEND srcs "esp_ieee802154_multipan.c")
endif()
idf_component_register(
SRCS "${srcs}"
INCLUDE_DIRS "${include}"

16
components/ieee802154/driver/esp_ieee802154_dev.c
View File

@@ -27,6 +27,10 @@
#include "esp_attr.h"
#include "esp_phy_init.h"
#if CONFIG_IEEE802154_MULTI_PAN_ENABLE
#include "esp_ieee802154_multipan.h"
#endif
#if CONFIG_PM_ENABLE
#include "esp_pm.h"
#include "esp_private/esp_clk.h"
@@ -125,6 +129,16 @@ esp_err_t ieee802154_receive_handle_done(const uint8_t *data)
return ESP_OK;
}
static void ieee802154_rx_buffer_clear(void)
{
memset(s_rx_frame, 0, sizeof(s_rx_frame));
memset(s_rx_frame_info, 0, sizeof(s_rx_frame_info));
s_rx_index = 0;
s_recent_rx_frame_info_index = 0;
s_needs_next_operation = false;
s_pending_rx_stop = false;
}
static IRAM_ATTR void event_end_process(void)
{
ieee802154_etm_channel_clear(IEEE802154_ETM_CHANNEL0);
@@ -916,7 +930,7 @@ esp_err_t ieee802154_mac_init(void)
ieee802154_txon_delay_set();
memset(s_rx_frame, 0, sizeof(s_rx_frame));
ieee802154_rx_buffer_clear();
ieee802154_set_state(IEEE802154_STATE_IDLE);
// TODO: Add flags for IEEE802154 ISR allocating. TZ-102

92
components/ieee802154/esp_ieee802154.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2020-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -170,96 +170,6 @@ esp_err_t esp_ieee802154_set_coordinator(bool enable)
return ESP_OK;
}
#if CONFIG_IEEE802154_MULTI_PAN_ENABLE
uint16_t esp_ieee802154_get_multipan_panid(esp_ieee802154_multipan_index_t index)
{
assert(index < CONFIG_IEEE802154_INTERFACE_NUM);
return ieee802154_ll_get_multipan_panid(index);
}
esp_err_t esp_ieee802154_set_multipan_panid(esp_ieee802154_multipan_index_t index, uint16_t panid)
{
assert(index < CONFIG_IEEE802154_INTERFACE_NUM);
ieee802154_ll_set_multipan_panid(index, panid);
return ESP_OK;
}
uint16_t esp_ieee802154_get_multipan_short_address(esp_ieee802154_multipan_index_t index)
{
assert(index < CONFIG_IEEE802154_INTERFACE_NUM);
return ieee802154_ll_get_multipan_short_addr(index);
}
esp_err_t esp_ieee802154_set_multipan_short_address(esp_ieee802154_multipan_index_t index, uint16_t short_address)
{
assert(index < CONFIG_IEEE802154_INTERFACE_NUM);
ieee802154_ll_set_multipan_short_addr(index, short_address);
return ESP_OK;
}
esp_err_t esp_ieee802154_get_multipan_extended_address(esp_ieee802154_multipan_index_t index, uint8_t *ext_addr)
{
assert(index < CONFIG_IEEE802154_INTERFACE_NUM);
assert(ext_addr != NULL);
ieee802154_ll_get_multipan_ext_addr(index, ext_addr);
return ESP_OK;
}
esp_err_t esp_ieee802154_set_multipan_extended_address(esp_ieee802154_multipan_index_t index, const uint8_t *ext_addr)
{
assert(index < CONFIG_IEEE802154_INTERFACE_NUM);
assert(ext_addr != NULL);
ieee802154_ll_set_multipan_ext_addr(index, ext_addr);
return ESP_OK;
}
uint8_t esp_ieee802154_get_multipan_enable(void)
{
return ieee802154_ll_get_multipan_enable_mask();
}
esp_err_t esp_ieee802154_set_multipan_enable(uint8_t mask)
{
assert(mask < (1 << CONFIG_IEEE802154_INTERFACE_NUM));
ieee802154_ll_set_multipan_enable_mask(mask);
return ESP_OK;
}
esp_ieee802154_pending_mode_t esp_ieee802154_multipan_get_pending_mode(esp_ieee802154_multipan_index_t index)
{
assert(index < CONFIG_IEEE802154_INTERFACE_NUM);
return ieee802154_pib_get_pending_mode(index);
}
esp_err_t esp_ieee802154_multipan_set_pending_mode(esp_ieee802154_multipan_index_t inf_index, esp_ieee802154_pending_mode_t pending_mode)
{
assert(inf_index < CONFIG_IEEE802154_INTERFACE_NUM);
ieee802154_pib_set_pending_mode(inf_index, pending_mode);
return ESP_OK;
}
esp_err_t esp_ieee802154_multipan_add_pending_addr(esp_ieee802154_multipan_index_t inf_index, const uint8_t *addr, bool is_short)
{
assert(inf_index < CONFIG_IEEE802154_INTERFACE_NUM);
return ieee802154_add_pending_addr(inf_index, addr, is_short);
}
esp_err_t esp_ieee802154_multipan_clear_pending_addr(esp_ieee802154_multipan_index_t inf_index, const uint8_t *addr, bool is_short)
{
assert(inf_index < CONFIG_IEEE802154_INTERFACE_NUM);
return ieee802154_clear_pending_addr(inf_index, addr, is_short);
}
esp_err_t esp_ieee802154_multipan_reset_pending_table(esp_ieee802154_multipan_index_t inf_index, bool is_short)
{
assert(inf_index < CONFIG_IEEE802154_INTERFACE_NUM);
ieee802154_reset_pending_table(inf_index, is_short);
return ESP_OK;
}
#endif // CONFIG_IEEE802154_MULTI_PAN_ENABLE
esp_err_t esp_ieee802154_set_ack_timeout(uint32_t timeout)
{
// Divide by 16 and round it up.

141
components/ieee802154/esp_ieee802154_multipan.c Normal file
View File

@@ -0,0 +1,141 @@
/*
* SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "sdkconfig.h"
#include <stdint.h>
#include "esp_err.h"
#include "esp_ieee802154_ack.h"
#include "esp_ieee802154_pib.h"
#include "esp_ieee802154_util.h"
static uint8_t s_rx_when_idle_mask = 0;
uint16_t esp_ieee802154_get_multipan_panid(esp_ieee802154_multipan_index_t index)
{
IEEE802154_ASSERT(index < CONFIG_IEEE802154_INTERFACE_NUM);
return ieee802154_ll_get_multipan_panid(index);
}
esp_err_t esp_ieee802154_set_multipan_panid(esp_ieee802154_multipan_index_t index, uint16_t panid)
{
IEEE802154_ASSERT(index < CONFIG_IEEE802154_INTERFACE_NUM);
ieee802154_ll_set_multipan_panid(index, panid);
return ESP_OK;
}
uint16_t esp_ieee802154_get_multipan_short_address(esp_ieee802154_multipan_index_t index)
{
IEEE802154_ASSERT(index < CONFIG_IEEE802154_INTERFACE_NUM);
return ieee802154_ll_get_multipan_short_addr(index);
}
esp_err_t esp_ieee802154_set_multipan_short_address(esp_ieee802154_multipan_index_t index, uint16_t short_address)
{
IEEE802154_ASSERT(index < CONFIG_IEEE802154_INTERFACE_NUM);
ieee802154_ll_set_multipan_short_addr(index, short_address);
return ESP_OK;
}
esp_err_t esp_ieee802154_get_multipan_extended_address(esp_ieee802154_multipan_index_t index, uint8_t *ext_addr)
{
IEEE802154_ASSERT(index < CONFIG_IEEE802154_INTERFACE_NUM);
IEEE802154_ASSERT(ext_addr != NULL);
ieee802154_ll_get_multipan_ext_addr(index, ext_addr);
return ESP_OK;
}
esp_err_t esp_ieee802154_set_multipan_extended_address(esp_ieee802154_multipan_index_t index, const uint8_t *ext_addr)
{
IEEE802154_ASSERT(index < CONFIG_IEEE802154_INTERFACE_NUM);
IEEE802154_ASSERT(ext_addr != NULL);
ieee802154_ll_set_multipan_ext_addr(index, ext_addr);
return ESP_OK;
}
uint8_t esp_ieee802154_get_multipan_enable(void)
{
return ieee802154_ll_get_multipan_enable_mask();
}
esp_err_t esp_ieee802154_set_multipan_enable(uint8_t mask)
{
IEEE802154_ASSERT(mask < (1 << CONFIG_IEEE802154_INTERFACE_NUM));
ieee802154_ll_set_multipan_enable_mask(mask);
return ESP_OK;
}
esp_ieee802154_pending_mode_t esp_ieee802154_multipan_get_pending_mode(esp_ieee802154_multipan_index_t index)
{
IEEE802154_ASSERT(index < CONFIG_IEEE802154_INTERFACE_NUM);
return ieee802154_pib_get_pending_mode(index);
}
esp_err_t esp_ieee802154_multipan_set_pending_mode(esp_ieee802154_multipan_index_t inf_index, esp_ieee802154_pending_mode_t pending_mode)
{
IEEE802154_ASSERT(inf_index < CONFIG_IEEE802154_INTERFACE_NUM);
ieee802154_pib_set_pending_mode(inf_index, pending_mode);
return ESP_OK;
}
esp_err_t esp_ieee802154_multipan_add_pending_addr(esp_ieee802154_multipan_index_t inf_index, const uint8_t *addr, bool is_short)
{
IEEE802154_ASSERT(inf_index < CONFIG_IEEE802154_INTERFACE_NUM);
return ieee802154_add_pending_addr(inf_index, addr, is_short);
}
esp_err_t esp_ieee802154_multipan_clear_pending_addr(esp_ieee802154_multipan_index_t inf_index, const uint8_t *addr, bool is_short)
{
IEEE802154_ASSERT(inf_index < CONFIG_IEEE802154_INTERFACE_NUM);
return ieee802154_clear_pending_addr(inf_index, addr, is_short);
}
esp_err_t esp_ieee802154_multipan_reset_pending_table(esp_ieee802154_multipan_index_t inf_index, bool is_short)
{
IEEE802154_ASSERT(inf_index < CONFIG_IEEE802154_INTERFACE_NUM);
ieee802154_reset_pending_table(inf_index, is_short);
return ESP_OK;
}
esp_err_t esp_ieee802154_multipan_sleep(int8_t idx)
{
IEEE802154_ASSERT(idx >= 0 && idx < CONFIG_IEEE802154_INTERFACE_NUM);
uint8_t enable_mask = ieee802154_ll_get_multipan_enable_mask();
enable_mask &= ~(1 << idx);
IEEE802154_ASSERT(enable_mask < (1 << CONFIG_IEEE802154_INTERFACE_NUM));
ieee802154_ll_set_multipan_enable_mask(enable_mask);
if (enable_mask == 0) {
return ieee802154_sleep();
}
return ESP_OK;
}
esp_err_t esp_ieee802154_multipan_receive(int8_t idx)
{
IEEE802154_ASSERT(idx >= 0 && idx < CONFIG_IEEE802154_INTERFACE_NUM);
uint8_t enable_mask = ieee802154_ll_get_multipan_enable_mask();
enable_mask |= (1 << idx);
IEEE802154_ASSERT(enable_mask < (1 << CONFIG_IEEE802154_INTERFACE_NUM));
ieee802154_ll_set_multipan_enable_mask(enable_mask);
return ieee802154_receive();
}
esp_err_t esp_ieee802154_multipan_set_rx_when_idle(int8_t idx, bool enable)
{
IEEE802154_ASSERT(idx >= 0 && idx < CONFIG_IEEE802154_INTERFACE_NUM);
if (enable) {
s_rx_when_idle_mask |= (1 << idx);
ieee802154_pib_set_rx_when_idle(true);
} else {
s_rx_when_idle_mask &= ~(1 << idx);
if (s_rx_when_idle_mask == 0) {
ieee802154_pib_set_rx_when_idle(false);
}
}
return ESP_OK;
}
// Note: multipan receive_at is not supported yet.

166
components/ieee802154/include/esp_ieee802154.h
View File

@@ -286,98 +286,6 @@ esp_err_t esp_ieee802154_get_extended_address(uint8_t *ext_addr);
*/
esp_err_t esp_ieee802154_set_extended_address(const uint8_t *ext_addr);
/**
* @brief Get the device PAN ID for specific interface.
*
* @param[in] index The interface index.
*
* @return The device PAN ID.
*
*/
uint16_t esp_ieee802154_get_multipan_panid(esp_ieee802154_multipan_index_t index);
/**
* @brief Set the device PAN ID for specific interface.
*
* @param[in] index The interface index.
* @param[in] panid The device PAN ID.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_set_multipan_panid(esp_ieee802154_multipan_index_t index, uint16_t panid);
/**
* @brief Get the device short address for specific interface.
*
* @param[in] index The interface index.
*
* @return The device short address.
*
*/
uint16_t esp_ieee802154_get_multipan_short_address(esp_ieee802154_multipan_index_t index);
/**
* @brief Set the device short address for specific interface.
*
* @param[in] index The interface index.
* @param[in] short_address The device short address.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_set_multipan_short_address(esp_ieee802154_multipan_index_t index, uint16_t short_address);
/**
* @brief Get the device extended address for specific interface.
*
* @param[in] index The interface index.
* @param[out] ext_addr The pointer to the device extended address. Must not be NULL.
*
* @return
* - ESP_OK on success.
* - ESP_ERR_INVALID_ARG if ext_addr is NULL.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_get_multipan_extended_address(esp_ieee802154_multipan_index_t index, uint8_t *ext_addr);
/**
* @brief Set the device extended address for specific interface.
*
* @param[in] index The interface index.
* @param[in] ext_addr The pointer to the device extended address. Must not be NULL.
*
* @return
* - ESP_OK on success.
* - ESP_ERR_INVALID_ARG if addr is NULL.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_set_multipan_extended_address(esp_ieee802154_multipan_index_t index, const uint8_t *ext_addr);
/**
* @brief Get the device current multipan interface enable mask.
*
* @return Current multipan interface enable mask.
*
*/
uint8_t esp_ieee802154_get_multipan_enable(void);
/**
* @brief Enable specific interface for the device.
*
* As an example, call `esp_ieee802154_set_multipan_enable(BIT(ESP_IEEE802154_MULTIPAN_0) | BIT(ESP_IEEE802154_MULTIPAN_1));`
* to enable multipan interface 0 and 1.
*
* @param[in] mask The multipan interface bit mask.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_set_multipan_enable(uint8_t mask);
/**
* @brief Get the device coordinator.
*
@@ -779,80 +687,6 @@ esp_err_t esp_ieee802154_event_callback_list_register(esp_ieee802154_event_cb_li
*/
esp_err_t esp_ieee802154_event_callback_list_unregister(void);
/**
* @brief Add a pending address to the multipan table for the specified interface.
*
* @note This API should be called only when the IEEE 802.15.4 subsystem is enabled.
*
* @param inf_index Index of the interface.
* @param addr Pointer to the address to add.
* @param is_short True if the address is a short address, false if extended.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_multipan_add_pending_addr(esp_ieee802154_multipan_index_t inf_index, const uint8_t *addr, bool is_short);
/**
* @brief Remove a pending address from the multipan table for the specified interface.
*
* @note This API should be called only when the IEEE 802.15.4 subsystem is enabled.
*
* @param inf_index Index of the interface.
* @param addr Pointer to the address to remove.
* @param is_short True if the address is a short address, false if extended.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_multipan_clear_pending_addr(esp_ieee802154_multipan_index_t inf_index, const uint8_t *addr, bool is_short);
/**
* @brief Reset the pending address table for the specified interface.
*
* @note This API clears all pending addresses of the specified type (short or extended) for the interface.
*
* @param inf_index Index of the interface.
* @param is_short True to reset short addresses, false to reset extended addresses.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_multipan_reset_pending_table(esp_ieee802154_multipan_index_t inf_index, bool is_short);
/**
* @brief Get the auto frame pending mode of the specified multipan interface.
*
* @note This API returns the logical pending mode configured for a given multipan
* interface. The value is used by the ACK generation logic together with the
* per-interface pending address table.
*
* @param inf_index Index of the multipan interface.
*
* @return
* - Current pending mode of type refer to esp_ieee802154_pending_mode_t
*/
esp_ieee802154_pending_mode_t esp_ieee802154_multipan_get_pending_mode(esp_ieee802154_multipan_index_t inf_index);
/**
* @brief Set the auto frame pending mode of the specified multipan interface.
*
* @note This API configures the logical pending mode for a given multipan interface.
* The configured mode is used by the ACK generation logic together with the
* per-interface pending address table.
*
* @param inf_index Index of the multipan interface.
* @param pending_mode Pending mode to set for this interface.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_multipan_set_pending_mode(esp_ieee802154_multipan_index_t inf_index, esp_ieee802154_pending_mode_t pending_mode);
#ifdef __cplusplus
}
#endif

224
components/ieee802154/include/esp_ieee802154_multipan.h Normal file
View File

@@ -0,0 +1,224 @@
/*
* SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
#include <stdint.h>
#include <stdbool.h>
#include "sdkconfig.h"
#include "esp_err.h"
#include "esp_ieee802154_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief Get the device PAN ID for specific interface.
*
* @param[in] index The interface index.
*
* @return The device PAN ID.
*
*/
uint16_t esp_ieee802154_get_multipan_panid(esp_ieee802154_multipan_index_t index);
/**
* @brief Set the device PAN ID for specific interface.
*
* @param[in] index The interface index.
* @param[in] panid The device PAN ID.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_set_multipan_panid(esp_ieee802154_multipan_index_t index, uint16_t panid);
/**
* @brief Get the device short address for specific interface.
*
* @param[in] index The interface index.
*
* @return The device short address.
*
*/
uint16_t esp_ieee802154_get_multipan_short_address(esp_ieee802154_multipan_index_t index);
/**
* @brief Set the device short address for specific interface.
*
* @param[in] index The interface index.
* @param[in] short_address The device short address.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_set_multipan_short_address(esp_ieee802154_multipan_index_t index, uint16_t short_address);
/**
* @brief Get the device extended address for specific interface.
*
* @param[in] index The interface index.
* @param[out] ext_addr The pointer to the device extended address. Must not be NULL.
*
* @return
* - ESP_OK on success.
* - ESP_ERR_INVALID_ARG if ext_addr is NULL.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_get_multipan_extended_address(esp_ieee802154_multipan_index_t index, uint8_t *ext_addr);
/**
* @brief Set the device extended address for specific interface.
*
* @param[in] index The interface index.
* @param[in] ext_addr The pointer to the device extended address. Must not be NULL.
*
* @return
* - ESP_OK on success.
* - ESP_ERR_INVALID_ARG if addr is NULL.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_set_multipan_extended_address(esp_ieee802154_multipan_index_t index, const uint8_t *ext_addr);
/**
* @brief Get the device current multipan interface enable mask.
*
* @return Current multipan interface enable mask.
*
*/
uint8_t esp_ieee802154_get_multipan_enable(void);
/**
* @brief Enable specific interface for the device.
*
* As an example, call `esp_ieee802154_set_multipan_enable(BIT(ESP_IEEE802154_MULTIPAN_0) | BIT(ESP_IEEE802154_MULTIPAN_1));`
* to enable multipan interface 0 and 1.
*
* @param[in] mask The multipan interface bit mask.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_set_multipan_enable(uint8_t mask);
/**
* @brief Add a pending address to the multipan table for the specified interface.
*
* @note This API should be called only when the IEEE 802.15.4 subsystem is enabled.
*
* @param inf_index Index of the interface.
* @param addr Pointer to the address to add.
* @param is_short True if the address is a short address, false if extended.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_multipan_add_pending_addr(esp_ieee802154_multipan_index_t inf_index, const uint8_t *addr, bool is_short);
/**
* @brief Remove a pending address from the multipan table for the specified interface.
*
* @note This API should be called only when the IEEE 802.15.4 subsystem is enabled.
*
* @param inf_index Index of the interface.
* @param addr Pointer to the address to remove.
* @param is_short True if the address is a short address, false if extended.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_multipan_clear_pending_addr(esp_ieee802154_multipan_index_t inf_index, const uint8_t *addr, bool is_short);
/**
* @brief Reset the pending address table for the specified interface.
*
* @note This API clears all pending addresses of the specified type (short or extended) for the interface.
*
* @param inf_index Index of the interface.
* @param is_short True to reset short addresses, false to reset extended addresses.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_multipan_reset_pending_table(esp_ieee802154_multipan_index_t inf_index, bool is_short);
/**
* @brief Get the auto frame pending mode of the specified multipan interface.
*
* @note This API returns the logical pending mode configured for a given multipan
* interface. The value is used by the ACK generation logic together with the
* per-interface pending address table.
*
* @param inf_index Index of the multipan interface.
*
* @return
* - Current pending mode of type refer to esp_ieee802154_pending_mode_t
*/
esp_ieee802154_pending_mode_t esp_ieee802154_multipan_get_pending_mode(esp_ieee802154_multipan_index_t inf_index);
/**
* @brief Set the auto frame pending mode of the specified multipan interface.
*
* @note This API configures the logical pending mode for a given multipan interface.
* The configured mode is used by the ACK generation logic together with the
* per-interface pending address table.
*
* @param inf_index Index of the multipan interface.
* @param pending_mode Pending mode to set for this interface.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_multipan_set_pending_mode(esp_ieee802154_multipan_index_t inf_index, esp_ieee802154_pending_mode_t pending_mode);
/**
* @brief Set the IEEE 802.15.4 Radio to sleep state for the specified multipan interface.
*
* @param[in] idx Index of the multipan interface.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_multipan_sleep(int8_t idx);
/**
* @brief Set the IEEE 802.15.4 Radio to receive state for the specified multipan interface.
*
* @param[in] idx Index of the multipan interface.
*
* @return
* - ESP_OK on success.
* - ESP_FAIL on failure.
*/
esp_err_t esp_ieee802154_multipan_receive(int8_t idx);
/**
* @brief Set the RxOnWhenIdle mode for the specified multipan interface.
*
* Each interface owns one bit in an internal mask. The hardware RxOnWhenIdle
* setting is enabled when any interface requests it, and is disabled only
* when all interface bits are cleared.
*
* @param[in] idx Index of the multipan interface.
* @param[in] enable True to enable RxOnWhenIdle for this interface.
*
* @return
* - ESP_OK on success.
*/
esp_err_t esp_ieee802154_multipan_set_rx_when_idle(int8_t idx, bool enable);
#ifdef __cplusplus
}
#endif

6
components/ieee802154/linker.lf
View File

@@ -79,9 +79,9 @@ entries:
esp_ieee802154_util: ieee802154_channel_to_freq (noflash)
if IEEE802154_MULTI_PAN_ENABLE = y:
esp_ieee802154: esp_ieee802154_get_multipan_extended_address (noflash)
esp_ieee802154: esp_ieee802154_get_multipan_panid (noflash)
esp_ieee802154: esp_ieee802154_get_multipan_short_address (noflash)
esp_ieee802154_multipan: esp_ieee802154_get_multipan_extended_address (noflash)
esp_ieee802154_multipan: esp_ieee802154_get_multipan_panid (noflash)
esp_ieee802154_multipan: esp_ieee802154_get_multipan_short_address (noflash)
esp_ieee802154_dev: is_broadcast_addr (noflash)
esp_ieee802154_dev: is_broadcast_panid (noflash)
esp_ieee802154_dev: update_mpf_index (noflash)

16
components/openthread/Kconfig
View File

@@ -534,6 +534,22 @@ menu "OpenThread"
OpenThread esp_netif, attaches the esp_netif glue, and enables
lwIP-specific DNS/netif handling.
config OPENTHREAD_MULTIPAN_RCP_ENABLE
bool "Enable Multipan RCP"
depends on (OPENTHREAD_RADIO && IEEE802154_MULTI_PAN_ENABLE)
default n
help
Enable MULTI-PAN RCP support. This also enables multiple OpenThread
instances. Currently only radio devices are supported.
config OPENTHREAD_MULTIPLE_INTERFACES_COUNT
int "The number of multiple interfaces"
depends on OPENTHREAD_MULTIPAN_RCP_ENABLE
default 2
range 2 3
help
Number of multiple interfaces.
endmenu
menu "Thread Log"

2
components/openthread/openthread

Submodule components/openthread/openthread updated: b678a4f63b...43cc05a9bc

6
components/openthread/private_include/esp_openthread_common_macro.h
View File

@@ -43,3 +43,9 @@
#else
#define ESP_OPENTHREAD_ASSERT(a) assert(a)
#endif
#if CONFIG_OPENTHREAD_MULTIPAN_RCP_ENABLE
#define OT_INSTANCE_COUNT CONFIG_OPENTHREAD_MULTIPLE_INTERFACES_COUNT
#else
#define OT_INSTANCE_COUNT 1
#endif

56
components/openthread/private_include/esp_openthread_instance.h Normal file
View File

@@ -0,0 +1,56 @@
/*
* SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
#include <stdbool.h>
#include "openthread/instance.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief Initialize OpenThread instance(s) for the selected build (single or multiple).
*
* @return true on success, false otherwise.
*/
bool esp_openthread_instances_init(void);
/**
* @brief Finalize OpenThread instance(s) for the selected build (single or multiple).
*
* @param[in] instance Instance provided by the caller (may be unused in multi-instance builds).
*/
void esp_openthread_instances_deinit(otInstance *instance);
/**
* @brief Check whether tasklets are pending.
*
* @param[in] instance Instance provided by the caller (may be unused in multi-instance builds).
*/
bool esp_openthread_tasklets_are_pending(otInstance *instance);
/**
* @brief Process pending tasklets.
*
* @param[in] instance Instance provided by the caller (may be unused in multi-instance builds).
*/
void esp_openthread_tasklets_process(otInstance *instance);
/**
* @brief Initialize the NCP/RCP application for the selected instance mode.
*
* @param[in] instance Instance provided by the caller (may be unused in multi-instance builds).
*
* @note Only used when CONFIG_OPENTHREAD_RADIO is enabled.
*/
void esp_openthread_ncp_app_init(otInstance *instance);
#ifdef __cplusplus
}
#endif

15
components/openthread/private_include/esp_openthread_ncp.h
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -10,8 +10,21 @@
extern "C" {
#endif
/**
* @brief This function initializes the NCP for a single instance
*
* @param[in] aInstance The OpenThread instance.
*/
void otAppNcpInit(otInstance *aInstance);
/**
* @brief This function initializes the NCP for multiple instances
*
* @param[in] aInstances The array of OpenThread instances.
* @param[in] aCount The number of instances.
*/
void otAppNcpInitMulti(otInstance **aInstances, uint8_t aCount);
#if CONFIG_OPENTHREAD_RCP_SPINEL_CONSOLE
esp_err_t esp_console_redirect_to_otlog(void);
#endif // CONFIG_OPENTHREAD_RCP_SPINEL_CONSOLE

33
components/openthread/private_include/esp_openthread_platform.h
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -155,6 +155,37 @@ void esp_openthread_set_storage_name(const char *name);
*/
uint32_t esp_openthread_get_alloc_caps(void);
/**
* @brief This function gets the index of the instance
*
* @param[in] instance The OpenThread instance.
*
* @note Invalid input is logged and asserted.
*
* @return
* - The index of the instance
*/
int8_t esp_openthread_get_idx_from_instance(otInstance *instance);
/**
* @brief This function gets the instance from the index
*
* @param[in] idx The index of the instance.
*
* @note Invalid index is logged and asserted. A valid index always has an instance.
*
* @return
* - The instance
*/
otInstance *esp_openthread_get_instance_from_idx(int8_t idx);
/**
* @brief This function sets the active instance
*
* @param[in] instance The OpenThread instance.
*/
void esp_openthread_set_active_instance(otInstance *instance);
#ifdef __cplusplus
} // end of extern "C"
#endif

56
components/openthread/private_include/openthread-core-esp32x-radio-config.h
View File

@@ -165,6 +165,62 @@
#define OPENTHREAD_CONFIG_TIME_SYNC_ENABLE 0
#endif
/**
* @def OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
*
* Define to 1 to enable multiple instance support.
*/
#ifdef OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
#error `OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE` is redefined.
#endif
#if CONFIG_OPENTHREAD_MULTIPAN_RCP_ENABLE
#define OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE 1
#else
#define OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE 0
#endif
/**
* @def OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE
*
* Define to 1 to enable multipan RCP support.
*/
#ifdef OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE
#error `OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE` is redefined.
#endif
#if CONFIG_OPENTHREAD_MULTIPAN_RCP_ENABLE
#define OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE 1
#else
#define OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE 0
#endif
/**
* @def OPENTHREAD_CONFIG_MULTIPLE_STATIC_INSTANCE_ENABLE
*
* Define to 1 to enable multiple static instance support.
*/
#ifdef OPENTHREAD_CONFIG_MULTIPLE_STATIC_INSTANCE_ENABLE
#error `OPENTHREAD_CONFIG_MULTIPLE_STATIC_INSTANCE_ENABLE` is redefined.
#endif
#if CONFIG_OPENTHREAD_MULTIPAN_RCP_ENABLE
#define OPENTHREAD_CONFIG_MULTIPLE_STATIC_INSTANCE_ENABLE 1
#else
#define OPENTHREAD_CONFIG_MULTIPLE_STATIC_INSTANCE_ENABLE 0
#endif
/**
* @def OPENTHREAD_SPINEL_CONFIG_BROADCAST_IID
*
* Define broadcast IID for spinel frames dedicated to all hosts in multipan configuration.
* Host interfaces use IID 0 .. COUNT-1; broadcast takes the next slot.
*
*/
#ifdef OPENTHREAD_SPINEL_CONFIG_BROADCAST_IID
#error `OPENTHREAD_SPINEL_CONFIG_BROADCAST_IID` is redefined.
#endif
#if CONFIG_OPENTHREAD_MULTIPAN_RCP_ENABLE
#define OPENTHREAD_SPINEL_CONFIG_BROADCAST_IID SPINEL_HEADER_IID(CONFIG_OPENTHREAD_MULTIPLE_INTERFACES_COUNT)
#endif
/*----The following options set fixed default values but can be overridden by the user header file.----*/
#if CONFIG_OPENTHREAD_LINK_METRICS

8
components/openthread/private_include/openthread-core-esp32x-spinel-config.h
View File

@@ -90,11 +90,11 @@
#endif
/**
* @def OPENTHREAD_CONFIG_MAC_SOFTWARE_RETX_SECURITY_ENABLE
* @def OPENTHREAD_CONFIG_CRYPTO_LIB
*
* Workaround for SPINEL_ONLY build configuration.
* See esp-idf MR !50530 for details.
* See esp-idf MR !49222 for details.
*/
#ifndef OPENTHREAD_CONFIG_MAC_SOFTWARE_RETX_SECURITY_ENABLE
#define OPENTHREAD_CONFIG_MAC_SOFTWARE_RETX_SECURITY_ENABLE 0
#ifndef OPENTHREAD_CONFIG_CRYPTO_LIB
#define OPENTHREAD_CONFIG_CRYPTO_LIB OPENTHREAD_CONFIG_CRYPTO_LIB_PSA
#endif

2
components/openthread/sbom_openthread.yml
View File

@@ -5,7 +5,7 @@ supplier: 'Organization: Espressif Systems (Shanghai) CO LTD'
originator: 'Organization: Google LLC'
description: OpenThread released by Google is an open-source implementation of the Thread networking
url: https://github.com/espressif/openthread
hash: b678a4f63b6f9397d1a0fa8f31e5b8e0271a4d00
hash: 43cc05a9bcf780bd758bad53d897e2d88cf8cb75
cve-exclude-list:
- cve: CVE-2026-8369
reason: We use Espressif’s NAT64 implementation and hence this CVE from the upstream NAT64 implementation is not applicable.

15
components/openthread/src/esp_openthread.cpp
View File

@@ -12,8 +12,8 @@
#include "esp_openthread_common_macro.h"
#include "esp_openthread_cli.h"
#include "esp_openthread_dns64.h"
#include "esp_openthread_instance.h"
#include "esp_openthread_lock.h"
#include "esp_openthread_ncp.h"
#include "esp_openthread_netif_glue.h"
#include "esp_openthread_platform.h"
#include "esp_openthread_sleep.h"
@@ -26,7 +26,6 @@
#include "openthread/instance.h"
#include "openthread/logging.h"
#include "openthread/netdata.h"
#include "openthread/tasklet.h"
#include "openthread/thread.h"
#if CONFIG_OPENTHREAD_FTD
@@ -81,7 +80,7 @@ esp_err_t esp_openthread_init(const esp_openthread_platform_config_t *config)
"Failed to initialize OpenThread platform driver");
esp_openthread_lock_acquire(portMAX_DELAY);
esp_err_t ret = ESP_OK;
ESP_GOTO_ON_FALSE(otInstanceInitSingle() != NULL, ESP_FAIL, exit, OT_PLAT_LOG_TAG,
ESP_GOTO_ON_FALSE(esp_openthread_instances_init(), ESP_FAIL, exit, OT_PLAT_LOG_TAG,
"Failed to initialize OpenThread instance");
#if CONFIG_OPENTHREAD_DNS64_CLIENT
ESP_GOTO_ON_ERROR(esp_openthread_dns64_client_init(), exit, OT_PLAT_LOG_TAG,
@@ -203,7 +202,7 @@ esp_err_t esp_openthread_launch_mainloop(void)
esp_openthread_lock_acquire(portMAX_DELAY);
esp_openthread_platform_update(&mainloop);
if (otTaskletsArePending(instance)) {
if (esp_openthread_tasklets_are_pending(instance)) {
mainloop.timeout.tv_sec = 0;
mainloop.timeout.tv_usec = 0;
}
@@ -222,9 +221,7 @@ esp_err_t esp_openthread_launch_mainloop(void)
if (result >= 0) {
esp_openthread_lock_acquire(portMAX_DELAY);
error = esp_openthread_platform_process(instance, &mainloop);
while (otTaskletsArePending(instance)) {
otTaskletsProcess(instance);
}
esp_openthread_tasklets_process(instance);
esp_openthread_lock_release();
if (error != ESP_OK) {
ESP_LOGE(OT_PLAT_LOG_TAG, "esp_openthread_platform_process failed");
@@ -244,7 +241,7 @@ esp_err_t esp_openthread_launch_mainloop(void)
esp_err_t esp_openthread_deinit(void)
{
otInstanceFinalize(esp_openthread_get_instance());
esp_openthread_instances_deinit(esp_openthread_get_instance());
return esp_openthread_platform_deinit();
}
@@ -271,7 +268,7 @@ static void ot_task_worker(void *aContext)
#endif // CONFIG_OPENTHREAD_CLI
#if CONFIG_OPENTHREAD_RADIO
otAppNcpInit(esp_openthread_get_instance());
esp_openthread_ncp_app_init(esp_openthread_get_instance());
#endif
xSemaphoreGive(s_ot_syn_semaphore);

47
components/openthread/src/esp_openthread_instance.cpp Normal file
View File

@@ -0,0 +1,47 @@
/*
* SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "sdkconfig.h"
#include "core/instance/instance.hpp"
#include "esp_openthread.h"
#include "esp_openthread_instance.h"
#include "esp_openthread_ncp.h"
#include "openthread/instance.h"
#include "openthread/tasklet.h"
bool esp_openthread_instances_init(void)
{
return otInstanceInitSingle() != NULL;
}
void esp_openthread_instances_deinit(otInstance *instance)
{
otInstanceFinalize(instance);
}
bool esp_openthread_tasklets_are_pending(otInstance *instance)
{
return otTaskletsArePending(instance);
}
void esp_openthread_tasklets_process(otInstance *instance)
{
while (otTaskletsArePending(instance)) {
otTaskletsProcess(instance);
}
}
#if CONFIG_OPENTHREAD_RADIO
void esp_openthread_ncp_app_init(otInstance *instance)
{
otAppNcpInit(instance);
}
#endif
otInstance *esp_openthread_get_instance(void)
{
return (otInstance *)&ot::Instance::Get();
}

6
components/openthread/src/esp_openthread_platform.cpp
View File

@@ -23,7 +23,6 @@
#include "esp_partition.h"
#include "common/code_utils.hpp"
#include "common/logging.hpp"
#include "core/instance/instance.hpp"
#include "freertos/FreeRTOS.h"
#include "freertos/queue.h"
#include "openthread/cli.h"
@@ -175,11 +174,6 @@ exit:
return ret;
}
otInstance *esp_openthread_get_instance(void)
{
return (otInstance *)&ot::Instance::Get();
}
esp_err_t esp_openthread_platform_deinit(void)
{
ESP_RETURN_ON_FALSE(s_openthread_platform_initialized, ESP_ERR_INVALID_STATE, OT_PLAT_LOG_TAG,

113
components/openthread/src/multiple_instances/esp_openthread_instance.cpp Normal file
View File

@@ -0,0 +1,113 @@
/*
* SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "sdkconfig.h"
#include <assert.h>
#include "esp_log.h"
#include "esp_openthread.h"
#include "esp_openthread_common_macro.h"
#include "esp_openthread_instance.h"
#include "esp_openthread_ncp.h"
#include "esp_openthread_platform.h"
#include "openthread/instance.h"
#include "openthread/tasklet.h"
static otInstance *s_active_instance = NULL;
static otInstance *s_instances[OT_INSTANCE_COUNT] = {NULL};
bool esp_openthread_instances_init(void)
{
for (int i = 0; i < OT_INSTANCE_COUNT; i++) {
s_instances[i] = otInstanceInitMultiple(i);
assert(s_instances[i]);
}
esp_openthread_set_active_instance(s_instances[0]);
return true;
}
void esp_openthread_instances_deinit(otInstance *instance)
{
otInstanceFinalize(instance);
}
bool esp_openthread_tasklets_are_pending(otInstance *instance)
{
(void)instance;
for (int idx = 0; idx < OT_INSTANCE_COUNT; idx++) {
if (otTaskletsArePending(esp_openthread_get_instance_from_idx(idx))) {
return true;
}
}
return false;
}
void esp_openthread_tasklets_process(otInstance *instance)
{
(void)instance;
for (int idx = 0; idx < OT_INSTANCE_COUNT; idx++) {
otInstance *inst = esp_openthread_get_instance_from_idx(idx);
while (otTaskletsArePending(inst)) {
otTaskletsProcess(inst);
}
}
}
#if CONFIG_OPENTHREAD_RADIO
void esp_openthread_ncp_app_init(otInstance *instance)
{
(void)instance;
otInstance *instances[OT_INSTANCE_COUNT] = {nullptr};
for (int idx = 0; idx < OT_INSTANCE_COUNT; idx++) {
instances[idx] = esp_openthread_get_instance_from_idx(idx);
}
otAppNcpInitMulti(instances, OT_INSTANCE_COUNT);
}
#endif
otInstance *esp_openthread_get_instance(void)
{
return s_active_instance;
}
int8_t esp_openthread_get_idx_from_instance(otInstance *instance)
{
if (instance == nullptr) {
ESP_LOGE(OT_PLAT_LOG_TAG, "Instance is NULL");
assert(instance != nullptr);
}
uint8_t idx = otInstanceGetIndex(instance);
if (idx >= OT_INSTANCE_COUNT) {
ESP_LOGE(OT_PLAT_LOG_TAG, "Index %u is out of range", idx);
assert(idx < OT_INSTANCE_COUNT);
}
return static_cast<int8_t>(idx);
}
otInstance *esp_openthread_get_instance_from_idx(int8_t idx)
{
if (idx < 0 || idx >= OT_INSTANCE_COUNT) {
ESP_LOGE(OT_PLAT_LOG_TAG, "Index %d is out of range", idx);
assert(idx >= 0 && idx < OT_INSTANCE_COUNT);
}
otInstance *instance = otInstanceGetInstance(static_cast<uint8_t>(idx));
if (instance == nullptr) {
ESP_LOGE(OT_PLAT_LOG_TAG, "No instance for index %d", idx);
assert(instance != nullptr);
}
return instance;
}
void esp_openthread_set_active_instance(otInstance *instance)
{
s_active_instance = instance;
}

167
components/openthread/src/multiple_instances/port/esp_openthread_alarm.c Normal file
View File

@@ -0,0 +1,167 @@
/*
* SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "esp_openthread_alarm.h"
#include <stdbool.h>
#include <stdint.h>
#include <sys/time.h>
#include "esp_log.h"
#include "esp_openthread.h"
#include "esp_openthread_common_macro.h"
#include "esp_openthread_platform.h"
#include "esp_timer.h"
#include "openthread-core-config.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "openthread/platform/alarm-micro.h"
#include "openthread/platform/alarm-milli.h"
#include "openthread/platform/diag.h"
#include "openthread/platform/radio.h"
#include "openthread/platform/time.h"
typedef struct {
uint32_t alarm_ms;
bool is_ms_running;
uint32_t alarm_us;
bool is_us_running;
otInstance *instance;
} esp_openthread_alarm_t;
static esp_openthread_alarm_t s_alarms[OT_INSTANCE_COUNT];
static const char *alarm_workflow = "alarm";
static inline bool is_expired(uint32_t target, uint32_t now)
{
return (((now - target) & (1 << 31)) == 0);
}
static inline uint32_t calculate_duration(uint32_t target, uint32_t now)
{
return is_expired(target, now) ? 0 : target - now;
}
uint64_t otPlatTimeGet(void)
{
return (uint64_t)esp_timer_get_time();
}
void otPlatAlarmMilliStartAt(otInstance *aInstance, uint32_t aT0, uint32_t aDt)
{
int8_t idx = esp_openthread_get_idx_from_instance(aInstance);
s_alarms[idx].alarm_ms = aT0 + aDt;
s_alarms[idx].is_ms_running = true;
ESP_LOGD(OT_PLAT_LOG_TAG, "Millisecond timer alarm start running, t0=%"PRIu32", dt=%"PRIu32"", aT0, aDt);
}
void otPlatAlarmMilliStop(otInstance *aInstance)
{
int8_t idx = esp_openthread_get_idx_from_instance(aInstance);
s_alarms[idx].is_ms_running = false;
}
uint32_t inline otPlatAlarmMilliGetNow(void)
{
return otPlatTimeGet() / US_PER_MS;
}
void otPlatAlarmMicroStartAt(otInstance *aInstance, uint32_t aT0, uint32_t aDt)
{
int8_t idx = esp_openthread_get_idx_from_instance(aInstance);
s_alarms[idx].alarm_us = aT0 + aDt;
s_alarms[idx].is_us_running = true;
ESP_LOGD(OT_PLAT_LOG_TAG, "Microsecond timer alarm start running, t0=%"PRIu32", dt=%"PRIu32"", aT0, aDt);
}
void otPlatAlarmMicroStop(otInstance *aInstance)
{
int8_t idx = esp_openthread_get_idx_from_instance(aInstance);
s_alarms[idx].is_us_running = false;
}
uint32_t inline otPlatAlarmMicroGetNow(void)
{
return otPlatTimeGet();
}
esp_err_t esp_openthread_alarm_init(void)
{
for (int idx = 0; idx < OT_INSTANCE_COUNT; idx++) {
memset((void *)(&s_alarms[idx]), 0, sizeof(esp_openthread_alarm_t));
}
return esp_openthread_platform_workflow_register(&esp_openthread_alarm_update, &esp_openthread_alarm_process,
alarm_workflow);
}
void esp_openthread_alarm_deinit(void)
{
esp_openthread_platform_workflow_unregister(alarm_workflow);
}
void esp_openthread_alarm_update(esp_openthread_mainloop_context_t *mainloop)
{
struct timeval *timeout = &mainloop->timeout;
int64_t remain_min_time_us = INT64_MAX;
int64_t remaining_us = 0;
for (int idx = 0; idx < OT_INSTANCE_COUNT; idx++) {
if (s_alarms[idx].is_ms_running) {
remaining_us = calculate_duration(s_alarms[idx].alarm_ms, otPlatAlarmMilliGetNow()) * US_PER_MS;
if (remain_min_time_us > remaining_us) {
remain_min_time_us = remaining_us;
}
}
if (s_alarms[idx].is_us_running) {
remaining_us = calculate_duration(s_alarms[idx].alarm_us, otPlatAlarmMicroGetNow());
if (remain_min_time_us > remaining_us) {
remain_min_time_us = remaining_us;
}
}
}
if (remain_min_time_us != INT64_MAX && remain_min_time_us > 0) {
timeout->tv_sec = remain_min_time_us / US_PER_S;
timeout->tv_usec = remain_min_time_us % US_PER_S;
} else {
timeout->tv_sec = 0;
timeout->tv_usec = 0;
}
}
esp_err_t esp_openthread_alarm_process(otInstance *aInstance, const esp_openthread_mainloop_context_t *mainloop)
{
OT_UNUSED_VARIABLE(aInstance);
OT_UNUSED_VARIABLE(mainloop);
for (int idx = 0; idx < OT_INSTANCE_COUNT; idx++) {
otInstance *instance = esp_openthread_get_instance_from_idx(idx);
if (s_alarms[idx].is_ms_running && is_expired(s_alarms[idx].alarm_ms, otPlatAlarmMilliGetNow())) {
s_alarms[idx].is_ms_running = false;
#if OPENTHREAD_CONFIG_DIAG_ENABLE
if (otPlatDiagModeGet()) {
otPlatDiagAlarmFired(instance);
} else
#endif
{
otPlatAlarmMilliFired(instance);
}
ESP_LOGD(OT_PLAT_LOG_TAG, "Millisecond timer alarm fired");
}
if (s_alarms[idx].is_us_running && is_expired(s_alarms[idx].alarm_us, otPlatAlarmMicroGetNow())) {
s_alarms[idx].is_us_running = false;
otPlatAlarmMicroFired(instance);
ESP_LOGD(OT_PLAT_LOG_TAG, "Microsecond timer alarm fired");
}
}
return ESP_OK;
}

1064
components/openthread/src/multiple_instances/port/esp_openthread_radio.c Normal file
View File

File diff suppressed because it is too large Load Diff

35
components/openthread/src/ncp/esp_openthread_ncp.cpp
View File

@@ -92,6 +92,31 @@ static esp_err_t init_console_command_worker()
}
#endif // CONFIG_OPENTHREAD_RCP_SPINEL_CONSOLE
static void ncp_init_console(void)
{
#if CONFIG_OPENTHREAD_RCP_SPINEL_CONSOLE
esp_err_t err = esp_console_redirect_to_otlog();
if (err != ESP_OK) {
ESP_LOGE(NO_LOG_TAG, "Failed to redirect console to otPlatLog: %s", esp_err_to_name(err));
}
init_console_command_worker();
#endif
}
#if CONFIG_OPENTHREAD_MULTIPAN_RCP_ENABLE
extern "C" void otAppNcpInitMulti(otInstance **aInstances, uint8_t aCount)
{
#if (CONFIG_OPENTHREAD_RCP_UART || CONFIG_OPENTHREAD_RCP_USB_SERIAL_JTAG || CONFIG_OPENTHREAD_RCP_CUSTOM)
IgnoreError(otPlatUartEnable());
otNcpHdlcInitMulti(aInstances, aCount, NcpSend);
#else
#error "Multiple instances based on SPI are not supported yet"
#endif
ncp_init_console();
}
#else
extern "C" void otAppNcpInit(otInstance *aInstance)
{
#if (CONFIG_OPENTHREAD_RCP_UART || CONFIG_OPENTHREAD_RCP_USB_SERIAL_JTAG || CONFIG_OPENTHREAD_RCP_CUSTOM)
@@ -101,15 +126,9 @@ extern "C" void otAppNcpInit(otInstance *aInstance)
otNcpSpiInit(aInstance);
#endif
#if CONFIG_OPENTHREAD_RCP_SPINEL_CONSOLE
esp_err_t err = esp_console_redirect_to_otlog();
if (err != ESP_OK) {
ESP_LOGE(NO_LOG_TAG, "Failed to redirect console to otPlatLog: %s", esp_err_to_name(err));
}
init_console_command_worker();
#endif // CONFIG_OPENTHREAD_RCP_SPINEL_CONSOLE
ncp_init_console();
}
#endif
namespace ot {
namespace Ncp {

28
components/openthread/src/ncp/esp_openthread_ncp_hdlc.cpp
View File

@@ -1,9 +1,10 @@
/*
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "sdkconfig.h"
#include "common/new.hpp"
#include "ncp_hdlc.hpp"
@@ -12,6 +13,30 @@ namespace Ncp {
static OT_DEFINE_ALIGNED_VAR(sNcpRaw, sizeof(NcpHdlc), uint64_t);
#if CONFIG_OPENTHREAD_MULTIPAN_RCP_ENABLE
extern "C" void otNcpHdlcInitMulti(otInstance **aInstances, uint8_t aCount, otNcpHdlcSendCallback aSendCallback)
{
NcpHdlc *ncpHdlc = nullptr;
ot::Instance *instances[SPINEL_HEADER_IID_MAX];
OT_ASSERT(aCount < SPINEL_HEADER_IID_MAX + 1);
OT_ASSERT(aCount > 0);
OT_ASSERT(aInstances[0] != nullptr);
for (int i = 0; i < aCount; i++)
{
OT_ASSERT(aInstances[i] != nullptr);
instances[i] = static_cast<ot::Instance *>(aInstances[i]);
}
ncpHdlc = new (&sNcpRaw) NcpHdlc(instances, aCount, aSendCallback);
if (ncpHdlc == nullptr || ncpHdlc != NcpBase::GetNcpInstance())
{
OT_ASSERT(false);
}
}
#else
extern "C" void otNcpHdlcInit(otInstance *aInstance, otNcpHdlcSendCallback aSendCallback)
{
NcpHdlc *ncpHdlc = nullptr;
@@ -24,6 +49,7 @@ extern "C" void otNcpHdlcInit(otInstance *aInstance, otNcpHdlcSendCallback aSend
OT_ASSERT(false);
}
}
#endif
} // namespace Ncp
} // namespace ot

25
components/openthread/srcs_radio.cmake
View File

@@ -61,18 +61,31 @@ set(rcp_srcs
openthread/src/ncp/ncp_base_dispatcher.cpp
openthread/src/ncp/ncp_base_radio.cpp
openthread/examples/apps/ncp/ncp.c
# ESP port
src/port/esp_openthread_alarm.c
# ESP port (logging/misc/settings stay at the original path)
src/port/esp_openthread_logging.c
src/port/esp_openthread_misc.c
src/port/esp_openthread_radio.c
src/port/esp_openthread_settings.c
# ESP sources
src/esp_openthread.cpp
src/esp_openthread_lock.c
src/esp_openthread_platform.cpp
src/esp_openthread_task_queue.c
# ESP NCP
)
# Single-instance files stay at the original src/ paths. Multipan RCP swaps in
# radio/alarm/instance under src/multiple_instances/. NCP is shared in src/ncp/.
if(CONFIG_OPENTHREAD_MULTIPAN_RCP_ENABLE)
set(OT_PORT_DIR "src/multiple_instances/port")
set(OT_INSTANCE_SRC "src/multiple_instances/esp_openthread_instance.cpp")
else()
set(OT_PORT_DIR "src/port")
set(OT_INSTANCE_SRC "src/esp_openthread_instance.cpp")
endif()
list(APPEND rcp_srcs
${OT_PORT_DIR}/esp_openthread_alarm.c
${OT_PORT_DIR}/esp_openthread_radio.c
${OT_INSTANCE_SRC}
src/ncp/esp_openthread_ncp.cpp
)
@@ -88,7 +101,9 @@ elseif(CONFIG_OPENTHREAD_RCP_SPI)
list(APPEND rcp_srcs
openthread/src/ncp/ncp_spi.cpp
src/port/esp_openthread_spi_slave.c)
if(CONFIG_OPENTHREAD_NCP_VENDOR_HOOK)
# Multipan SPI NCP is not supported; the compile-time check lives in
# src/ncp/esp_openthread_ncp.cpp.
if(CONFIG_OPENTHREAD_NCP_VENDOR_HOOK AND NOT CONFIG_OPENTHREAD_MULTIPAN_RCP_ENABLE)
list(APPEND rcp_srcs src/ncp/esp_openthread_ncp_spi.cpp)
endif()
elseif(CONFIG_OPENTHREAD_RCP_CUSTOM)

3
examples/openthread/ot_rcp/sdkconfig.ci.multipan Normal file
View File

@@ -0,0 +1,3 @@
CONFIG_IEEE802154_MULTI_PAN_ENABLE=y
CONFIG_OPENTHREAD_MULTIPAN_RCP_ENABLE=y
CONFIG_OPENTHREAD_MULTIPLE_INTERFACES_COUNT=2