Skip to content

Commit

Permalink
Merge branch 'fix/ieee802154_include_header_issue_v5.1' into 'release…
Browse files Browse the repository at this point in the history
…/v5.1'

Fix/ieee802154 include header issue (backport v5.1)

See merge request espressif/esp-idf!30331
  • Loading branch information
jack0c committed Apr 22, 2024
2 parents c686e23 + f0d0463 commit 2fd087b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 2 additions & 0 deletions components/ieee802154/driver/esp_ieee802154_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,9 @@ static IRAM_ATTR void next_operation(void)
enable_rx();
} else {
ieee802154_set_state(IEEE802154_STATE_IDLE);
#if !CONFIG_IEEE802154_TEST
ieee802154_sleep();
#endif
}
}
}
Expand Down
12 changes: 7 additions & 5 deletions components/ieee802154/private_include/esp_ieee802154_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

#include <stdint.h>
#include <stdbool.h>
#include "sdkconfig.h"
#include "soc/soc_caps.h"
#include "esp_ieee802154_dev.h"
#include "hal/ieee802154_ll.h"
#include "esp_timer.h"
Expand Down Expand Up @@ -172,7 +174,7 @@ extern ieee802154_probe_info_t g_ieee802154_probe;
*/
void ieee802154_assert_print(void);
#define IEEE802154_ASSERT(a) do { \
if(!(a)) { \
if(unlikely(!(a))) { \
ieee802154_assert_print(); \
assert(a); \
} \
Expand Down Expand Up @@ -280,9 +282,9 @@ void ieee802154_set_txrx_pti(ieee802154_txrx_scene_t txrx_scene);
#endif // !CONFIG_IEEE802154_TEST && CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE

/**
* @brief Convert the frequence to the index of channel.
* @brief Convert the frequency to the index of channel.
*
* @param[in] freq The frequence where the radio is processing.
* @param[in] freq The frequency where the radio is processing.
*
* @return
* The channel index.
Expand All @@ -291,12 +293,12 @@ void ieee802154_set_txrx_pti(ieee802154_txrx_scene_t txrx_scene);
uint8_t ieee802154_freq_to_channel(uint8_t freq);

/**
* @brief Convert the index of channel to the frequence.
* @brief Convert the index of channel to the frequency.
*
* @param[in] channel The index of channel where the radio is processing.
*
* @return
* The frequence.
* The frequency.
*
*/
uint8_t ieee802154_channel_to_freq(uint8_t channel);
Expand Down

0 comments on commit 2fd087b

Please sign in to comment.