Merge branch 'bugfix/fix_multipan_enable_and_update_reg' into 'master'

ieee802154: fix multipan api error and update coex_arb_delay reg See merge request espressif/esp-idf!24145
espressif · Jun 26, 2023 · 54e45c7 · 54e45c7
2 parents 51aaed8 + 4d4f686
commit 54e45c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/components/ieee802154/esp_ieee802154.c b/components/ieee802154/esp_ieee802154.c
@@ -17,6 +17,7 @@
 #include "esp_log.h"
 #include "esp_coex_i154.h"
 #include "hal/ieee802154_ll.h"
+#include "hal/ieee802154_common_ll.h"
 
 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)
 {
-    return ieee802154_pib_get_multipan_enable();
+    return ieee802154_ll_get_multipan_enable_mask();
 }
 
 esp_err_t esp_ieee802154_set_multipan_enable(uint8_t mask)
 {
-    assert(mask < ((1 << ESP_IEEE802154_MULTIPAN_MAX) - 1));
-    ieee802154_pib_set_multipan_enable(mask);
+    assert(mask < (1 << ESP_IEEE802154_MULTIPAN_MAX));
+    ieee802154_ll_set_multipan_enable_mask(mask);
     return ESP_OK;
 }
 

diff --git a/components/soc/esp32c6/include/soc/ieee802154_reg.h b/components/soc/esp32c6/include/soc/ieee802154_reg.h
@@ -35,7 +35,7 @@ extern "C" {
 #define IEEE802154_NO_RSS_TRK_ENB_S 25
 #define IEEE802154_BIT_ORDER (BIT(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_FILTER_ENHANCE (BIT(14))
 #define IEEE802154_FILTER_ENHANCE_S 14

diff --git a/components/soc/esp32h2/include/soc/ieee802154_reg.h b/components/soc/esp32h2/include/soc/ieee802154_reg.h
@@ -36,7 +36,7 @@ extern "C" {
 #define IEEE802154_NO_RSS_TRK_ENB_S 25
 #define IEEE802154_BIT_ORDER (BIT(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_FILTER_ENHANCE (BIT(14))
 #define IEEE802154_FILTER_ENHANCE_S 14