Skip to content

Commit 38bf962

Browse files
e-rknordicjm
authored andcommitted
nrf_802154: rev 5a34646bdebdddafe5902119ad3c894be7d051ce
This commit updates revision of the nrf_802154 component. Signed-off-by: Rafal Kuznia <[email protected]>
1 parent 5a62daf commit 38bf962

File tree

44 files changed

+22
-59
lines changed

Some content is hidden

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

44 files changed

+22
-59
lines changed

nrf_802154/doc/CHANGELOG.rst

Lines changed: 2 additions & 0 deletions

nrf_802154/driver/src/nrf_802154_core.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,7 @@
110110
*/
111111
#define PRESTARTED_TIMER_TIMEOUT_US (160U)
112112

113-
#if NRF_802154_RX_BUFFERS > 1
114-
/// Pointer to currently used receive buffer.
115-
static rx_buffer_t * mp_current_rx_buffer;
116-
117-
#else
118-
/// If there is only one buffer use const pointer to the receive buffer.
119-
static rx_buffer_t * const mp_current_rx_buffer = &nrf_802154_rx_buffers[0];
120-
121-
#endif
122-
113+
static rx_buffer_t * mp_current_rx_buffer; /// Pointer to currently used receive buffer.
123114
static uint8_t * mp_ack; ///< Pointer to Ack frame buffer.
124115
static nrf_802154_frame_t m_tx_data; ///< Data structure of the frame to be transmitted.
125116
static uint32_t m_ed_time_left; ///< Remaining time of the current energy detection procedure [us].
@@ -454,11 +445,7 @@ static bool antenna_diversity_is_enabled(void)
454445
*/
455446
static void rx_buffer_in_use_set(rx_buffer_t * p_rx_buffer)
456447
{
457-
#if NRF_802154_RX_BUFFERS > 1
458448
mp_current_rx_buffer = p_rx_buffer;
459-
#else
460-
(void)p_rx_buffer;
461-
#endif
462449
}
463450

464451
/** Check if currently there is available rx buffer.

nrf_802154/driver/src/nrf_802154_rx_buffer.c

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,37 @@
4848
#error Not enough rx buffers in the 802.15.4 radio driver.
4949
#endif
5050

51-
rx_buffer_t nrf_802154_rx_buffers[NRF_802154_RX_BUFFERS]; ///< Receive buffers.
51+
static rx_buffer_t m_nrf_802154_rx_buffers[NRF_802154_RX_BUFFERS]; ///< Receive buffers.
5252

5353
void nrf_802154_rx_buffer_init(void)
5454
{
5555
for (uint32_t i = 0; i < NRF_802154_RX_BUFFERS; i++)
5656
{
57-
nrf_802154_rx_buffers[i].free = true;
57+
m_nrf_802154_rx_buffers[i].free = true;
5858
}
5959
}
6060

6161
rx_buffer_t * nrf_802154_rx_buffer_free_find(void)
6262
{
6363
for (uint32_t i = 0; i < NRF_802154_RX_BUFFERS; i++)
6464
{
65-
if (nrf_802154_rx_buffers[i].free)
65+
if (m_nrf_802154_rx_buffers[i].free)
6666
{
67-
return &nrf_802154_rx_buffers[i];
67+
return &m_nrf_802154_rx_buffers[i];
6868
}
6969
}
7070

7171
return NULL;
7272
}
73+
74+
#ifdef TEST
75+
void nrf_802154_rx_buffer_module_reset(void)
76+
{
77+
/* Reset static data. */
78+
for (uint32_t i = 0; i < NRF_802154_RX_BUFFERS; i++)
79+
{
80+
m_nrf_802154_rx_buffers[i].free = false;
81+
}
82+
}
83+
84+
#endif /* TEST */

nrf_802154/driver/src/nrf_802154_rx_buffer.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,6 @@ typedef struct
5858
bool free; // If this buffer is free or contains a frame.
5959
} rx_buffer_t;
6060

61-
/**
62-
* @brief Array that contains all buffers used to receive frame.
63-
*
64-
* This array is in the global scope to allow optimizations in the core module if there is only
65-
* one buffer provided by this module.
66-
*
67-
*/
68-
extern rx_buffer_t nrf_802154_rx_buffers[];
69-
7061
/**
7162
* @brief Initializes the buffer for received frames.
7263
*/

nrf_802154/driver/src/nrf_802154_swi.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,11 @@ __WEAK void nrf_802154_request_swi_irq_handler(void)
7070
/* Implementation provided by other module if necessary */
7171
}
7272

73-
__WEAK void nrf_802154_sl_clock_swi_irq_handler(void)
74-
{
75-
/* Implementation provided by other module if necessary */
76-
}
77-
7873
static void swi_irq_handler(void)
7974
{
8075
nrf_802154_trx_swi_irq_handler();
8176
nrf_802154_notification_swi_irq_handler();
8277
nrf_802154_request_swi_irq_handler();
83-
nrf_802154_sl_clock_swi_irq_handler();
8478
}
8579

8680
void nrf_802154_swi_init(void)

nrf_802154/sl/sl/include/nrf_802154_sl_periphs.h

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,6 @@
6464
#define NRF_802154_SL_EGU_TIMESTAMP_USED_CHANNELS_MASK 0U
6565
#endif
6666

67-
/**
68-
* @def NRF_802154_SL_EGU_CLOCK_CHANNEL_NO
69-
*
70-
* Number of the EGU channel used for HFCLK control.
71-
*
72-
*/
73-
#ifndef NRF_802154_SL_EGU_CLOCK_CHANNEL_NO
74-
#define NRF_802154_SL_EGU_CLOCK_CHANNEL_NO 5
75-
#endif
76-
77-
#define NRF_802154_SL_EGU_CLOCK_USED_CHANNELS_MASK (1U << NRF_802154_SL_EGU_CLOCK_CHANNEL_NO)
78-
7967
/**
8068
* @def NRF_802154_RTC_INSTANCE_NO
8169
*
@@ -213,9 +201,8 @@
213201
*
214202
* Mask of fixed EGU channels used by the nRF 802.15.4 SL.
215203
*/
216-
#define NRF_802154_SL_EGU_USED_CHANNELS_MASK \
217-
NRF_802154_SL_EGU_TIMESTAMP_USED_CHANNELS_MASK |\
218-
NRF_802154_SL_EGU_CLOCK_USED_CHANNELS_MASK
204+
#define NRF_802154_SL_EGU_USED_CHANNELS_MASK \
205+
NRF_802154_SL_EGU_TIMESTAMP_USED_CHANNELS_MASK
219206

220207
#if defined(NRF54L_SERIES)
221208
/**
-144 Bytes
Binary file not shown.
-144 Bytes
Binary file not shown.
-144 Bytes
Binary file not shown.
-144 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)