Skip to content

Commit 1ed467f

Browse files
ankunsSebastianBoe
authored andcommitted
nrf_802154: rev 19db7cacff691f3d331473c69432ada969a30697
This commit updates revision of the nrf_802154 component to commit 19db7cacff691f3d331473c69432ada969a30697 of the sdk-nrf-802154 repository. Signed-off-by: Andrzej Kuros <[email protected]>
1 parent ed9a0bf commit 1ed467f

File tree

2 files changed

+25
-12
lines changed

2 files changed

+25
-12
lines changed

nrf_802154/driver/src/mac_features/nrf_802154_ifs.c

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,16 @@ static bool is_ifs_needed_by_address(const uint8_t * p_frame)
9999
PARSE_LEVEL_ADDRESSING_END,
100100
&frame_data);
101101

102-
assert(result);
103-
(void)result;
104-
105-
addr = nrf_802154_frame_parser_dst_addr_get(&frame_data);
106-
is_extended = nrf_802154_frame_parser_dst_addr_is_extended(&frame_data);
102+
if (result)
103+
{
104+
addr = nrf_802154_frame_parser_dst_addr_get(&frame_data);
105+
is_extended = nrf_802154_frame_parser_dst_addr_is_extended(&frame_data);
106+
}
107+
else
108+
{
109+
addr = NULL;
110+
is_extended = false;
111+
}
107112

108113
if (!addr)
109114
{
@@ -226,11 +231,16 @@ void nrf_802154_ifs_transmitted_hook(const uint8_t * p_frame)
226231
PARSE_LEVEL_ADDRESSING_END,
227232
&frame_data);
228233

229-
assert(result);
230-
(void)result;
231-
232-
addr = nrf_802154_frame_parser_dst_addr_get(&frame_data);
233-
m_is_last_address_extended = nrf_802154_frame_parser_dst_addr_is_extended(&frame_data);
234+
if (result)
235+
{
236+
addr = nrf_802154_frame_parser_dst_addr_get(&frame_data);
237+
m_is_last_address_extended = nrf_802154_frame_parser_dst_addr_is_extended(&frame_data);
238+
}
239+
else
240+
{
241+
addr = NULL;
242+
m_is_last_address_extended = false;
243+
}
234244

235245
if (!addr)
236246
{

nrf_802154/driver/src/nrf_802154_core.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2250,8 +2250,11 @@ static bool ack_match_check_version_2(const uint8_t * p_tx_frame, const uint8_t
22502250
p_tx_frame[PHR_OFFSET] + PHR_SIZE,
22512251
PARSE_LEVEL_ADDRESSING_END,
22522252
&tx_data);
2253-
assert(parse_result);
2254-
(void)parse_result;
2253+
if (!parse_result)
2254+
{
2255+
return false;
2256+
}
2257+
22552258
parse_result = nrf_802154_frame_parser_data_init(p_ack_frame,
22562259
p_ack_frame[PHR_OFFSET] + PHR_SIZE,
22572260
PARSE_LEVEL_ADDRESSING_END,

0 commit comments

Comments
 (0)