Skip to content

Commit

Permalink
nrf_802154: rev b5764deaf3c05fc4343a17ed2ac86e07589af4bb
Browse files Browse the repository at this point in the history
This commit updates revision of the nrf_802154 component.

Signed-off-by: Rafal Kuznia <[email protected]>
  • Loading branch information
e-rk committed Nov 29, 2024
1 parent bcab5c5 commit ece3d16
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 17 deletions.
23 changes: 11 additions & 12 deletions nrf_802154/driver/src/nrf_802154_peripherals_nrf52.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include <nrfx.h>
#include "nrf_802154_config.h"
#include "nrf_802154_debug.h"
#include "hal/nrf_ppi.h"
#include "nrf_802154_sl_periphs.h"

#ifdef __cplusplus
Expand Down Expand Up @@ -113,7 +112,7 @@ extern "C" {
*
*/
#ifndef NRF_802154_PPI_RADIO_RAMP_UP_TRIGG
#define NRF_802154_PPI_RADIO_RAMP_UP_TRIGG NRF_PPI_CHANNEL6
#define NRF_802154_PPI_RADIO_RAMP_UP_TRIGG 6U
#endif

/**
Expand All @@ -126,7 +125,7 @@ extern "C" {
*
*/
#ifndef NRF_802154_PPI_RADIO_DISABLED_TO_EGU
#define NRF_802154_PPI_RADIO_DISABLED_TO_EGU NRF_PPI_CHANNEL6
#define NRF_802154_PPI_RADIO_DISABLED_TO_EGU 6U
#endif

/**
Expand All @@ -138,7 +137,7 @@ extern "C" {
*
*/
#ifndef NRF_802154_PPI_EGU_TO_RADIO_RAMP_UP
#define NRF_802154_PPI_EGU_TO_RADIO_RAMP_UP NRF_PPI_CHANNEL7
#define NRF_802154_PPI_EGU_TO_RADIO_RAMP_UP 7U
#endif

/**
Expand All @@ -150,7 +149,7 @@ extern "C" {
*
*/
#ifndef NRF_802154_PPI_EGU_TO_TIMER_START
#define NRF_802154_PPI_EGU_TO_TIMER_START NRF_PPI_CHANNEL8
#define NRF_802154_PPI_EGU_TO_TIMER_START 8U
#endif

/**
Expand All @@ -164,7 +163,7 @@ extern "C" {
*
*/
#ifndef NRF_802154_PPI_RADIO_CRCERROR_TO_TIMER_CLEAR
#define NRF_802154_PPI_RADIO_CRCERROR_TO_TIMER_CLEAR NRF_PPI_CHANNEL9
#define NRF_802154_PPI_RADIO_CRCERROR_TO_TIMER_CLEAR 9U
#endif

/**
Expand All @@ -178,7 +177,7 @@ extern "C" {
*
*/
#ifndef NRF_802154_PPI_RADIO_CCAIDLE_TO_FEM_GPIOTE
#define NRF_802154_PPI_RADIO_CCAIDLE_TO_FEM_GPIOTE NRF_PPI_CHANNEL9
#define NRF_802154_PPI_RADIO_CCAIDLE_TO_FEM_GPIOTE 9U
#endif

/**
Expand All @@ -192,7 +191,7 @@ extern "C" {
*
*/
#ifndef NRF_802154_PPI_TIMER_COMPARE_TO_RADIO_TXEN
#define NRF_802154_PPI_TIMER_COMPARE_TO_RADIO_TXEN NRF_PPI_CHANNEL9
#define NRF_802154_PPI_TIMER_COMPARE_TO_RADIO_TXEN 9U
#endif

/**
Expand All @@ -205,7 +204,7 @@ extern "C" {
*
*/
#ifndef NRF_802154_PPI_RADIO_CCABUSY_TO_RADIO_CCASTART
#define NRF_802154_PPI_RADIO_CCABUSY_TO_RADIO_CCASTART NRF_PPI_CHANNEL10
#define NRF_802154_PPI_RADIO_CCABUSY_TO_RADIO_CCASTART 10U
#endif

/**
Expand All @@ -216,7 +215,7 @@ extern "C" {
*
*/
#ifndef NRF_802154_PPI_RADIO_SYNC_TO_EGU_SYNC
#define NRF_802154_PPI_RADIO_SYNC_TO_EGU_SYNC NRF_PPI_CHANNEL11
#define NRF_802154_PPI_RADIO_SYNC_TO_EGU_SYNC 11U
#endif

#define NRF_802154_DISABLE_BCC_MATCHING_PPI_CHANNELS_USED_MASK \
Expand All @@ -231,7 +230,7 @@ extern "C" {
*
*/
#ifndef NRF_802154_PPI_CORE_GROUP
#define NRF_802154_PPI_CORE_GROUP NRF_PPI_CHANNEL_GROUP0
#define NRF_802154_PPI_CORE_GROUP 0U
#endif

/**
Expand All @@ -241,7 +240,7 @@ extern "C" {
*
*/
#ifndef NRF_802154_PPI_ABORT_GROUP
#define NRF_802154_PPI_ABORT_GROUP NRF_PPI_CHANNEL_GROUP1
#define NRF_802154_PPI_ABORT_GROUP 1U
#endif

/**
Expand Down
8 changes: 4 additions & 4 deletions nrf_802154/sl/sl/include/nrf_802154_sl_periphs.h
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
#if defined(DPPI_PRESENT)
#define NRF_802154_PPI_RTC_COMPARE_TO_TIMER_CAPTURE 13U
#else
#define NRF_802154_PPI_RTC_COMPARE_TO_TIMER_CAPTURE NRF_PPI_CHANNEL13
#define NRF_802154_PPI_RTC_COMPARE_TO_TIMER_CAPTURE 13U
#endif
#endif

Expand All @@ -157,7 +157,7 @@
#if defined(DPPI_PRESENT)
#define NRF_802154_PPI_TIMESTAMP_EVENT_TO_TIMER_CAPTURE 11U
#else
#define NRF_802154_PPI_TIMESTAMP_EVENT_TO_TIMER_CAPTURE NRF_PPI_CHANNEL14
#define NRF_802154_PPI_TIMESTAMP_EVENT_TO_TIMER_CAPTURE 14U
#endif
#endif

Expand All @@ -181,9 +181,9 @@
*/
#ifndef NRF_802154_PPI_TIMESTAMP_GROUP
#if defined(DPPI_PRESENT)
#define NRF_802154_PPI_TIMESTAMP_GROUP NRF_DPPI_CHANNEL_GROUP1
#define NRF_802154_PPI_TIMESTAMP_GROUP 1U
#else
#define NRF_802154_PPI_TIMESTAMP_GROUP NRF_PPI_CHANNEL_GROUP2
#define NRF_802154_PPI_TIMESTAMP_GROUP 2U
#endif
#endif

Expand Down
Binary file modified nrf_802154/sl/sl/lib/nrf54h20_cpurad/hard-float/libnrf-802154-sl.a
Binary file not shown.
Binary file modified nrf_802154/sl/sl/lib/nrf54h20_cpurad/soft-float/libnrf-802154-sl.a
Binary file not shown.
Binary file not shown.
Binary file modified nrf_802154/sl/sl/lib/nrf54l15_cpuapp/hard-float/libnrf-802154-sl.a
Binary file not shown.
Binary file modified nrf_802154/sl/sl/lib/nrf54l15_cpuapp/soft-float/libnrf-802154-sl.a
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified nrf_802154/sl/sl/lib/nrf54l20_cpuapp/hard-float/libnrf-802154-sl.a
Binary file not shown.
Binary file modified nrf_802154/sl/sl/lib/nrf54l20_cpuapp/soft-float/libnrf-802154-sl.a
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 4 additions & 1 deletion nrf_802154/zephyr/Kconfig.nrfxlib
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ config NRF_802154_SL
select SENSOR if NRF_802154_TEMPERATURE_UPDATE
select TEMP_NRF5_MPSL if NRF_802154_TEMPERATURE_UPDATE
select NRFX_PPI if SOC_COMPATIBLE_NRF52X
select NRFX_DPPI if SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF53X
select NRFX_DPPI0 if SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF53X
select NRFX_DPPI20 if SOC_SERIES_NRF54LX
select NRFX_PPIB11 if SOC_SERIES_NRF54LX
select NRFX_PPIB21 if SOC_SERIES_NRF54LX
depends on !NRF_802154_SOURCE_HAL_NORDIC
help
Use of Nordic Semiconductor proprietary implementation of nRF 802.15.4 Service Layer.
Expand Down

0 comments on commit ece3d16

Please sign in to comment.