blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/linker_script_check_missing_function' into 'master'

Browse Source 
fix(802.15.4): add no inline to some static function

Closes TZ-1266

See merge request espressif/esp-idf!34702
This commit is contained in:
Shu Chen 2024-11-06 20:13:32 +08:00
commit 8bd4071f92
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,7 +161,7 @@ uint8_t ieee802154_get_recent_lqi(void)
return s_rx_frame_info[s_recent_rx_frame_info_index].lqi;
}
IEEE802154_STATIC void set_next_rx_buffer(void)
IEEE802154_STATIC IEEE802154_NOINLINE void set_next_rx_buffer(void)
{
uint8_t* next_rx_buffer = NULL;
uint8_t index = 0;
@ -194,7 +194,7 @@ IEEE802154_STATIC void set_next_rx_buffer(void)
ieee802154_ll_set_rx_addr(next_rx_buffer);
}
static bool stop_rx(void)
IEEE802154_NOINLINE static bool stop_rx(void)
{
ieee802154_ll_events events;
@ -210,7 +210,7 @@ static bool stop_rx(void)
return true;
}
static bool stop_tx_ack(void)
IEEE802154_NOINLINE static bool stop_tx_ack(void)
{
ieee802154_set_cmd(IEEE802154_CMD_STOP);
@ -221,7 +221,7 @@ static bool stop_tx_ack(void)
return true;
}
static bool stop_tx(void)
IEEE802154_NOINLINE static bool stop_tx(void)
{
ieee802154_ll_events events;
@ -245,21 +245,21 @@ static bool stop_tx(void)
return true;
}
static bool stop_cca(void)
IEEE802154_NOINLINE static bool stop_cca(void)
{
ieee802154_set_cmd(IEEE802154_CMD_STOP);
ieee802154_ll_clear_events(IEEE802154_EVENT_ED_DONE | IEEE802154_EVENT_RX_ABORT);
return true;
}
static bool stop_tx_cca(void)
IEEE802154_NOINLINE static bool stop_tx_cca(void)
{
stop_tx(); // in case the transmission already started
ieee802154_ll_clear_events(IEEE802154_EVENT_TX_ABORT);
return true;
}
static bool stop_rx_ack(void)
IEEE802154_NOINLINE static bool stop_rx_ack(void)
{
ieee802154_ll_events events;
@ -281,7 +281,7 @@ static bool stop_rx_ack(void)
return true;
}
static bool stop_ed(void)
IEEE802154_NOINLINE static bool stop_ed(void)
{
ieee802154_set_cmd(IEEE802154_CMD_STOP);
@ -290,7 +290,7 @@ static bool stop_ed(void)
return true;
}
IEEE802154_STATIC bool stop_current_operation(void)
IEEE802154_NOINLINE IEEE802154_STATIC bool stop_current_operation(void)
{
event_end_process();
switch (s_ieee802154_state) {
@ -629,7 +629,7 @@ IEEE802154_STATIC IRAM_ATTR void ieee802154_exit_critical(void)
portEXIT_CRITICAL(&s_ieee802154_spinlock);
}
static void ieee802154_isr(void *arg)
IEEE802154_NOINLINE static void ieee802154_isr(void *arg)
{
ieee802154_enter_critical();
ieee802154_ll_events events = ieee802154_ll_get_events();
@ -878,7 +878,7 @@ esp_err_t ieee802154_transmit(const uint8_t *frame, bool cca)
return ieee802154_transmit_internal(frame, cca);
}
static inline bool is_target_time_expired(uint32_t target, uint32_t now)
IEEE802154_NOINLINE static bool is_target_time_expired(uint32_t target, uint32_t now)
{
return (((now - target) & (1 << 31)) == 0);
}

2
components/ieee802154/driver/esp_ieee802154_pib.c
View File

@ -45,7 +45,7 @@ void ieee802154_pib_init(void)
set_pending();
}
static uint8_t ieee802154_txpower_convert(int8_t txpower)
IEEE802154_NOINLINE static uint8_t ieee802154_txpower_convert(int8_t txpower)
{
uint8_t ieee820154_txpower_index = 0;
if (txpower >= IEEE802154_TXPOWER_VALUE_MAX) {

2
components/ieee802154/linker.lf
View File

@ -44,7 +44,6 @@ entries:
esp_ieee802154_dev: ieee802154_receive (noflash)
esp_ieee802154_pib: ieee802154_pib_update (noflash)
esp_ieee802154_pib: ieee802154_txpower_convert (noflash)
esp_ieee802154_pib: ieee802154_set_panid_addr (noflash)
esp_ieee802154_util: ieee802154_channel_to_freq (noflash)
esp_ieee802154: esp_ieee802154_transmit_at (noflash)
esp_ieee802154: esp_ieee802154_receive_at (noflash)
@ -55,7 +54,6 @@ entries:
esp_ieee802154: esp_ieee802154_enh_ack_generator (noflash)
esp_ieee802154: esp_ieee802154_get_extended_address (noflash)
esp_ieee802154: esp_ieee802154_set_transmit_security (noflash)
esp_ieee802154_pib: ieee802154_pib_get_extended_address (noflash)
if OPENTHREAD_LINK_METRICS = y:
esp_ieee802154: esp_ieee802154_get_recent_lqi (noflash)