Merge branch 'backport/2015_enhack_v52' into 'release/v5.2'

chshu · chshu · commit da635ecd9d55 · 2024-11-18T12:53:30.000+08:00
fix(802.15.4): add case for 2015 frame enh-ack (Backport v5.2)

See merge request espressif/esp-idf!34952
diff --git a/components/ieee802154/esp_ieee802154.c b/components/ieee802154/esp_ieee802154.c
@@ -298,6 +298,7 @@ esp_ieee802154_state_t esp_ieee802154_get_state(void)
     case IEEE802154_STATE_CCA:
     case IEEE802154_STATE_TX:
     case IEEE802154_STATE_RX_ACK:
+    case IEEE802154_STATE_TX_ENH_ACK:
         return ESP_IEEE802154_RADIO_TRANSMIT;
 
     default:
@@ -390,7 +391,8 @@ __attribute__((weak)) void esp_ieee802154_ed_failed(uint16_t error)
 
 __attribute__((weak)) esp_err_t esp_ieee802154_enh_ack_generator(uint8_t *frame, esp_ieee802154_frame_info_t *frame_info, uint8_t* enhack_frame)
 {
-    return ESP_OK;
+    ESP_EARLY_LOGE(IEEE802154_TAG, "Not implement for the enh-ack generating handler");
+    return ESP_FAIL;
 }
 
 __attribute__((weak)) void esp_ieee802154_timer0_done(void)

Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,7 @@ esp_ieee802154_state_t esp_ieee802154_get_state(void)`
`298`	`298`	`case IEEE802154_STATE_CCA:`
`299`	`299`	`case IEEE802154_STATE_TX:`
`300`	`300`	`case IEEE802154_STATE_RX_ACK:`
	`301`	`+ case IEEE802154_STATE_TX_ENH_ACK:`
`301`	`302`	`return ESP_IEEE802154_RADIO_TRANSMIT;`
`302`	`303`
`303`	`304`	`default:`
`@@ -390,7 +391,8 @@ __attribute__((weak)) void esp_ieee802154_ed_failed(uint16_t error)`
`390`	`391`
`391`	`392`	`__attribute__((weak)) esp_err_t esp_ieee802154_enh_ack_generator(uint8_t frame, esp_ieee802154_frame_info_t frame_info, uint8_t* enhack_frame)`
`392`	`393`	`{`
`393`		`- return ESP_OK;`
	`394`	`+ ESP_EARLY_LOGE(IEEE802154_TAG, "Not implement for the enh-ack generating handler");`
	`395`	`+ return ESP_FAIL;`
`394`	`396`	`}`
`395`	`397`
`396`	`398`	`__attribute__((weak)) void esp_ieee802154_timer0_done(void)`