Skip to content

Commit e0d7e26

Browse files
e-rkanangl
authored andcommitted
nrf_802154: rev d1578ec65e5f57cea9b2dea145c80b97964006e0
This commit updates revision of the nrf_802154 component. Signed-off-by: Rafal Kuznia <[email protected]>
1 parent c967500 commit e0d7e26

File tree

79 files changed

+1938
-1817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1938
-1817
lines changed

nrf_802154/doc/CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Added
1818

1919
* Added the new flag to :c:type:`nrf_802154_transmitted_frame_props_t` that allows to request encoding the transmit timestamp in the transmitted payload.
2020
The feature can be enabled with the :c:macro:`NRF_802154_TX_TIMESTAMP_PROVIDER_ENABLED` configuration macro. (KRKNWK-20426)
21+
* The HFXO startup latency can now be configured on all SoC families.
22+
On the nRF52 and nRF53 Series, a conservative default value of 1400 µs is assumed if :c:func:`nrf_802154_clock_hfclk_latency_set` is not called. (KRKNWK-20716)
2123

2224
nRF Connect SDK v3.1.0 - nRF 802.15.4 Radio Driver
2325
**************************************************

nrf_802154/driver/src/mac_features/ack_generator/nrf_802154_ack_data.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include "nrf_802154_assert.h"
4545
#include <string.h>
4646

47-
#include "mac_features/nrf_802154_frame_parser.h"
47+
#include "mac_features/nrf_802154_frame.h"
4848
#include "nrf_802154_config.h"
4949
#include "nrf_802154_const.h"
5050

@@ -333,11 +333,11 @@ static bool addr_index_find(const uint8_t * p_addr,
333333
* @retval true Pending bit is to be set.
334334
* @retval false Pending bit is to be cleared.
335335
*/
336-
static bool addr_match_thread(const nrf_802154_frame_parser_data_t * p_frame_data)
336+
static bool addr_match_thread(const nrf_802154_frame_t * p_frame_data)
337337
{
338338
uint32_t location;
339-
bool extended = nrf_802154_frame_parser_src_addr_is_extended(p_frame_data);
340-
const uint8_t * p_src_addr = nrf_802154_frame_parser_src_addr_get(p_frame_data);
339+
bool extended = nrf_802154_frame_src_addr_is_extended(p_frame_data);
340+
const uint8_t * p_src_addr = nrf_802154_frame_src_addr_get(p_frame_data);
341341

342342
// The pending bit is set by default.
343343
if (!m_pending_bit.enabled || (NULL == p_src_addr))
@@ -356,7 +356,7 @@ static bool addr_match_thread(const nrf_802154_frame_parser_data_t * p_frame_dat
356356
* @retval true Pending bit is to be set.
357357
* @retval false Pending bit is to be cleared.
358358
*/
359-
static bool addr_match_zigbee(const nrf_802154_frame_parser_data_t * p_frame_data)
359+
static bool addr_match_zigbee(const nrf_802154_frame_t * p_frame_data)
360360
{
361361
uint8_t src_addr_type;
362362
uint32_t location;
@@ -371,10 +371,10 @@ static bool addr_match_zigbee(const nrf_802154_frame_parser_data_t * p_frame_dat
371371
}
372372

373373
// Check the frame type.
374-
p_src_addr = nrf_802154_frame_parser_src_addr_get(p_frame_data);
375-
src_addr_type = nrf_802154_frame_parser_src_addr_type_get(p_frame_data);
374+
p_src_addr = nrf_802154_frame_src_addr_get(p_frame_data);
375+
src_addr_type = nrf_802154_frame_src_addr_type_get(p_frame_data);
376376

377-
p_cmd = nrf_802154_frame_parser_mac_command_id_get(p_frame_data);
377+
p_cmd = nrf_802154_frame_mac_command_id_get(p_frame_data);
378378

379379
// Check frame type and command type.
380380
if ((p_cmd != NULL) && (*p_cmd == MAC_CMD_DATA_REQ))
@@ -407,7 +407,7 @@ static bool addr_match_zigbee(const nrf_802154_frame_parser_data_t * p_frame_dat
407407
*
408408
* @retval true Pending bit is to be set.
409409
*/
410-
static bool addr_match_standard_compliant(const nrf_802154_frame_parser_data_t * p_frame_data)
410+
static bool addr_match_standard_compliant(const nrf_802154_frame_t * p_frame_data)
411411
{
412412
(void)p_frame_data;
413413
return true;
@@ -597,18 +597,18 @@ static bool ie_data_set(uint32_t location, bool extended, const uint8_t * p_data
597597
ie_data_t * ie_data =
598598
extended ? &m_ie.ext_data[location].ie_data : &m_ie.short_data[location].ie_data;
599599

600-
const uint8_t new_ie_id = nrf_802154_frame_parser_ie_id_get(p_data);
600+
const uint8_t new_ie_id = nrf_802154_frame_ie_id_get(p_data);
601601

602-
for (const uint8_t * ie = nrf_802154_frame_parser_header_ie_iterator_begin(ie_data->p_data);
603-
nrf_802154_frame_parser_ie_iterator_end(ie, ie_data->p_data + ie_data->len) == false;
604-
ie = nrf_802154_frame_parser_ie_iterator_next(ie))
602+
for (const uint8_t * ie = nrf_802154_frame_header_ie_iterator_begin(ie_data->p_data);
603+
nrf_802154_frame_ie_iterator_end(ie, ie_data->p_data + ie_data->len) == false;
604+
ie = nrf_802154_frame_ie_iterator_next(ie))
605605
{
606-
if (nrf_802154_frame_parser_ie_id_get(ie) != new_ie_id)
606+
if (nrf_802154_frame_ie_id_get(ie) != new_ie_id)
607607
{
608608
continue;
609609
}
610610

611-
if (IE_DATA_OFFSET + nrf_802154_frame_parser_ie_length_get(ie) != data_len)
611+
if (IE_DATA_OFFSET + nrf_802154_frame_ie_length_get(ie) != data_len)
612612
{
613613
/* Overwriting an existing IE with a different size is not supported. */
614614
return false;
@@ -738,7 +738,7 @@ void nrf_802154_ack_data_src_addr_matching_method_set(nrf_802154_src_addr_match_
738738
}
739739

740740
bool nrf_802154_ack_data_pending_bit_should_be_set(
741-
const nrf_802154_frame_parser_data_t * p_frame_data)
741+
const nrf_802154_frame_t * p_frame_data)
742742
{
743743
bool ret;
744744

nrf_802154/driver/src/mac_features/ack_generator/nrf_802154_ack_data.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#include <stdint.h>
4646

4747
#include "nrf_802154_types.h"
48-
#include "mac_features/nrf_802154_frame_parser.h"
48+
#include "mac_features/nrf_802154_frame.h"
4949

5050
/**
5151
* @brief Initializes the ACK data generator module.
@@ -130,7 +130,7 @@ void nrf_802154_ack_data_src_addr_matching_method_set(nrf_802154_src_addr_match_
130130
* @retval false Pending bit is to be cleared.
131131
*/
132132
bool nrf_802154_ack_data_pending_bit_should_be_set(
133-
const nrf_802154_frame_parser_data_t * p_frame_data);
133+
const nrf_802154_frame_t * p_frame_data);
134134

135135
/**
136136
* @brief Gets the IE data stored in the list for the source address of the provided frame.

nrf_802154/driver/src/mac_features/ack_generator/nrf_802154_ack_generator.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ typedef enum
5454
} frame_version_t;
5555

5656
static frame_version_t frame_version_is_2015_or_above(
57-
const nrf_802154_frame_parser_data_t * p_frame_data)
57+
const nrf_802154_frame_t * p_frame_data)
5858
{
59-
switch (nrf_802154_frame_parser_frame_version_get(p_frame_data))
59+
switch (nrf_802154_frame_version_get(p_frame_data))
6060
{
6161
case FRAME_VERSION_0:
6262
case FRAME_VERSION_1:
@@ -84,10 +84,10 @@ void nrf_802154_ack_generator_reset(void)
8484
nrf_802154_enh_ack_generator_reset();
8585
}
8686

87-
uint8_t * nrf_802154_ack_generator_create(const nrf_802154_frame_parser_data_t * p_frame_data)
87+
uint8_t * nrf_802154_ack_generator_create(const nrf_802154_frame_t * p_frame_data)
8888
{
8989
// This function should not be called if ACK is not requested.
90-
NRF_802154_ASSERT(nrf_802154_frame_parser_ar_bit_is_set(p_frame_data));
90+
NRF_802154_ASSERT(nrf_802154_frame_ar_bit_is_set(p_frame_data));
9191

9292
switch (frame_version_is_2015_or_above(p_frame_data))
9393
{

nrf_802154/driver/src/mac_features/ack_generator/nrf_802154_ack_generator.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
#include <stdint.h>
4444

45-
#include "mac_features/nrf_802154_frame_parser.h"
45+
#include "mac_features/nrf_802154_frame.h"
4646

4747
/** Initializes the ACK generator module. */
4848
void nrf_802154_ack_generator_init(void);
@@ -69,6 +69,6 @@ void nrf_802154_ack_generator_reset(void);
6969
* of the created ACK frame, or NULL when the response cannot be created.
7070
*/
7171
uint8_t * nrf_802154_ack_generator_create(
72-
const nrf_802154_frame_parser_data_t * p_frame_data);
72+
const nrf_802154_frame_t * p_frame_data);
7373

7474
#endif // NRF_802154_ACK_GENERATOR_H

0 commit comments

Comments
 (0)