alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'backport/fix_multipan_api_error_and_coex_delay_reg' into 'release/v5.1'

Browse Source 
ieee802154: fix multipan api error and update coex_arb_delay reg(Backport v5.1)

See merge request espressif/esp-idf!24399
This commit is contained in:
Jiang Jiang Jian 2023-07-05 19:30:07 +08:00
commit aa434942c1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/ieee802154/esp_ieee802154.c
View File

@ -17,6 +17,7 @@
#include "esp_log.h" #include "esp_log.h"
#include "esp_coex_i154.h" #include "esp_coex_i154.h"
#include "hal/ieee802154_ll.h" #include "hal/ieee802154_ll.h"
#include "hal/ieee802154_common_ll.h"
esp_err_t esp_ieee802154_enable(void) esp_err_t esp_ieee802154_enable(void)
{ {
@ -168,13 +169,13 @@ esp_err_t esp_ieee802154_set_multipan_extended_address(esp_ieee802154_multipan_i
uint8_t esp_ieee802154_get_multipan_enable(void) uint8_t esp_ieee802154_get_multipan_enable(void)
{ {
return ieee802154_pib_get_multipan_enable(); return ieee802154_ll_get_multipan_enable_mask();
} }
esp_err_t esp_ieee802154_set_multipan_enable(uint8_t mask) esp_err_t esp_ieee802154_set_multipan_enable(uint8_t mask)
{ {
assert(mask < ((1 << ESP_IEEE802154_MULTIPAN_MAX) - 1)); assert(mask < (1 << ESP_IEEE802154_MULTIPAN_MAX));
ieee802154_pib_set_multipan_enable(mask); ieee802154_ll_set_multipan_enable_mask(mask);
return ESP_OK; return ESP_OK;
} }

2
components/soc/esp32c6/include/soc/ieee802154_reg.h
View File

@ -35,7 +35,7 @@ extern "C" {
#define IEEE802154_NO_RSS_TRK_ENB_S 25 #define IEEE802154_NO_RSS_TRK_ENB_S 25
#define IEEE802154_BIT_ORDER (BIT(24)) #define IEEE802154_BIT_ORDER (BIT(24))
#define IEEE802154_BIT_ORDER_S 24 #define IEEE802154_BIT_ORDER_S 24
#define IEEE802154_COEX_ARB_DELAY 0x0000001F #define IEEE802154_COEX_ARB_DELAY 0x000000FF
#define IEEE802154_COEX_ARB_DELAY_S 16 #define IEEE802154_COEX_ARB_DELAY_S 16
#define IEEE802154_FILTER_ENHANCE (BIT(14)) #define IEEE802154_FILTER_ENHANCE (BIT(14))
#define IEEE802154_FILTER_ENHANCE_S 14 #define IEEE802154_FILTER_ENHANCE_S 14

2
components/soc/esp32h2/include/soc/ieee802154_reg.h
View File

@ -36,7 +36,7 @@ extern "C" {
#define IEEE802154_NO_RSS_TRK_ENB_S 25 #define IEEE802154_NO_RSS_TRK_ENB_S 25
#define IEEE802154_BIT_ORDER (BIT(24)) #define IEEE802154_BIT_ORDER (BIT(24))
#define IEEE802154_BIT_ORDER_S 24 #define IEEE802154_BIT_ORDER_S 24
#define IEEE802154_COEX_ARB_DELAY 0x0000001F #define IEEE802154_COEX_ARB_DELAY 0x000000FF
#define IEEE802154_COEX_ARB_DELAY_S 16 #define IEEE802154_COEX_ARB_DELAY_S 16
#define IEEE802154_FILTER_ENHANCE (BIT(14)) #define IEEE802154_FILTER_ENHANCE (BIT(14))
#define IEEE802154_FILTER_ENHANCE_S 14 #define IEEE802154_FILTER_ENHANCE_S 14