Skip to content

Alignment to nrfx_timer rework #3349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: collab-nrfx-4.0
Choose a base branch
from
+284 −376
Draft

Alignment to nrfx_timer rework #3349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9cd79b1
[nrf fromtree] samples: usb: uac2: Support High-Speed operation
tmon-nordic Jun 25, 2025
7981aea
[nrf fromtree] samples: usb: uac2: explicit: Fix SOF offset integer c…
tmon-nordic Aug 21, 2025
0020b12
[nrf fromtree] drivers: serial: nrfx_uarte: Remove redundant pinctrl …
nordic-krch Sep 29, 2025
067b173
[nrf fromlist] modules: hal_nordic: add new errno error handling
mib1-nordic Oct 1, 2025
ef0988b
[nrf fromlist] modules: hal_nordic: remove TIMER config symbols
mib1-nordic Oct 3, 2025
852f497
[nrf fromlist] tests: drivers: uart: remove TIMER config symbols
mib1-nordic Oct 3, 2025
e5500c1
[nrf fromlist] samples: usb: uac2: align feedback_nrf to changes in nrfx
mib1-nordic Oct 1, 2025
6803053
[nrf noup] drivers: serial: uart_nrfx_uarte: align to changes in nrfx
mib1-nordic Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions drivers/serial/Kconfig.nrfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,39 +213,4 @@ nrfx_uart_num = 137
rsource "Kconfig.nrfx_uart_instance"
endif

config NRFX_TIMER0
default y
depends on UART_0_NRF_HW_ASYNC_TIMER = 0 \
|| UART_1_NRF_HW_ASYNC_TIMER = 0 \
|| UART_2_NRF_HW_ASYNC_TIMER = 0 \
|| UART_3_NRF_HW_ASYNC_TIMER = 0

config NRFX_TIMER1
default y
depends on UART_0_NRF_HW_ASYNC_TIMER = 1 \
|| UART_1_NRF_HW_ASYNC_TIMER = 1 \
|| UART_2_NRF_HW_ASYNC_TIMER = 1 \
|| UART_3_NRF_HW_ASYNC_TIMER = 1

config NRFX_TIMER2
default y
depends on UART_0_NRF_HW_ASYNC_TIMER = 2 \
|| UART_1_NRF_HW_ASYNC_TIMER = 2 \
|| UART_2_NRF_HW_ASYNC_TIMER = 2 \
|| UART_3_NRF_HW_ASYNC_TIMER = 2

config NRFX_TIMER3
default y
depends on UART_0_NRF_HW_ASYNC_TIMER = 3 \
|| UART_1_NRF_HW_ASYNC_TIMER = 3 \
|| UART_2_NRF_HW_ASYNC_TIMER = 3 \
|| UART_3_NRF_HW_ASYNC_TIMER = 3

config NRFX_TIMER4
default y
depends on UART_0_NRF_HW_ASYNC_TIMER = 4 \
|| UART_1_NRF_HW_ASYNC_TIMER = 4 \
|| UART_2_NRF_HW_ASYNC_TIMER = 4 \
|| UART_3_NRF_HW_ASYNC_TIMER = 4

endif # UART_NRFX
19 changes: 9 additions & 10 deletions drivers/serial/uart_nrfx_uarte.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@
#endif
#ifdef UARTE_ANY_ASYNC
struct uarte_async_cb *async;
nrfx_timer_t timer;
#endif
atomic_val_t poll_out_lock;
atomic_t flags;
Expand Down Expand Up @@ -448,7 +449,6 @@
size_t bounce_buf_swap_len;
struct uarte_async_rx_cbwt *cbwt_data;
#endif
nrfx_timer_t timer;
uint8_t *tx_cache;
uint8_t *rx_flush_buf;
#endif
Expand Down Expand Up @@ -878,7 +878,7 @@
#ifdef UARTE_ANY_ASYNC
if (data->async) {
if (HW_RX_COUNTING_ENABLED(config)) {
const nrfx_timer_t *timer = &config->timer;
nrfx_timer_t *timer = &data->timer;

nrfx_timer_enable(timer);

Expand Down Expand Up @@ -1067,26 +1067,26 @@

if (HW_RX_COUNTING_ENABLED(cfg)) {
nrfx_timer_config_t tmr_config = NRFX_TIMER_DEFAULT_CONFIG(
NRF_TIMER_BASE_FREQUENCY_GET(cfg->timer.p_reg));
NRF_TIMER_BASE_FREQUENCY_GET(data->timer.p_reg));
uint32_t evt_addr = nrf_uarte_event_address_get(uarte, NRF_UARTE_EVENT_RXDRDY);
uint32_t tsk_addr = nrfx_timer_task_address_get(&cfg->timer, NRF_TIMER_TASK_COUNT);
uint32_t tsk_addr = nrfx_timer_task_address_get(&data->timer, NRF_TIMER_TASK_COUNT);

tmr_config.mode = NRF_TIMER_MODE_COUNTER;
tmr_config.bit_width = NRF_TIMER_BIT_WIDTH_32;
ret = nrfx_timer_init(&cfg->timer,
ret = nrfx_timer_init(&data->timer,
&tmr_config,
timer_handler);
if (ret != NRFX_SUCCESS) {

Check notice on line 1079 in drivers/serial/uart_nrfx_uarte.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/serial/uart_nrfx_uarte.c:1079 
-		nrfx_timer_config_t tmr_config = NRFX_TIMER_DEFAULT_CONFIG(
-						NRF_TIMER_BASE_FREQUENCY_GET(data->timer.p_reg));
+		nrfx_timer_config_t tmr_config =
+			NRFX_TIMER_DEFAULT_CONFIG(NRF_TIMER_BASE_FREQUENCY_GET(data->timer.p_reg));
 		uint32_t evt_addr = nrf_uarte_event_address_get(uarte, NRF_UARTE_EVENT_RXDRDY);
 		uint32_t tsk_addr = nrfx_timer_task_address_get(&data->timer, NRF_TIMER_TASK_COUNT);
 
 		tmr_config.mode = NRF_TIMER_MODE_COUNTER;
 		tmr_config.bit_width = NRF_TIMER_BIT_WIDTH_32;
-		ret = nrfx_timer_init(&data->timer,
-				      &tmr_config,
-				      timer_handler);
+		ret = nrfx_timer_init(&data->timer, &tmr_config, timer_handler);
LOG_ERR("Timer already initialized");
return -EINVAL;
}

nrfx_timer_clear(&cfg->timer);
nrfx_timer_clear(&data->timer);

ret = nrfx_gppi_channel_alloc(&data->async->rx.cnt.ppi);
if (ret != NRFX_SUCCESS) {
LOG_ERR("Failed to allocate PPI Channel");
nrfx_timer_uninit(&cfg->timer);
nrfx_timer_uninit(&data->timer);
return -EINVAL;
}

Expand Down Expand Up @@ -3202,7 +3202,6 @@
const struct uarte_nrfx_config *cfg = dev->config;

if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME) || !LOW_POWER_ENABLED(cfg)) {
(void)pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
uarte_periph_enable(dev);
}
}
Expand Down Expand Up @@ -3578,7 +3577,7 @@
NRF_DT_CHECK_NODE_HAS_REQUIRED_MEMORY_REGIONS(UARTE(idx)); \
UARTE_INT_DRIVEN(idx); \
PINCTRL_DT_DEFINE(UARTE(idx)); \
IF_ENABLED(CONFIG_UART_##idx##_ASYNC, ( \

Check notice on line 3580 in drivers/serial/uart_nrfx_uarte.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/serial/uart_nrfx_uarte.c:3580 
-					      (PM_DEVICE_ISR_SAFE), (0))))))   \
-
-#define UART_NRF_UARTE_DEVICE(idx)					       \
-	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(UARTE(idx));		       \
-	NRF_DT_CHECK_NODE_HAS_REQUIRED_MEMORY_REGIONS(UARTE(idx));	       \
-	UARTE_INT_DRIVEN(idx);						       \
-	PINCTRL_DT_DEFINE(UARTE(idx));					       \
+					      (PM_DEVICE_ISR_SAFE), (0))))))
+
+#define UART_NRF_UARTE_DEVICE(idx)                                                                                                                                                                                      \
+	NRF_DT_CHECK_NODE_HAS_PINCTRL_SLEEP(UARTE(idx));                                                                                                                                                                \
+	NRF_DT_CHECK_NODE_HAS_REQUIRED_MEMORY_REGIONS(UARTE(idx));                                                                                                                                                      \
+	UARTE_INT_DRIVEN(idx);                                                                                                                                                                                          \
+	PINCTRL_DT_DEFINE(UARTE(idx));                                                                                                                                                                                  \
IF_ENABLED(UTIL_AND(IS_ENABLED(CONFIG_UARTE_NRFX_UARTE_COUNT_BYTES_WITH_TIMER), \
UARTE_HAS_PROP(idx, timer)), \
(static uint8_t uart##idx##_bounce_buf[CONFIG_UART_NRFX_UARTE_BOUNCE_BUF_LEN] \
Expand Down Expand Up @@ -3640,8 +3639,8 @@
IF_ENABLED(CONFIG_UARTE_NRFX_UARTE_COUNT_BYTES_WITH_TIMER, \
(UARTE_COUNT_BYTES_WITH_TIMER_CONFIG(idx))) \
IF_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC, \
(.timer = NRFX_TIMER_INSTANCE( \
CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER),)) \
(.timer = NRFX_TIMER_INSTANCE(NRF_TIMER_INST_GET( \
CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER)),)) \
IF_ENABLED(INSTANCE_IS_FAST(_, /*empty*/, idx, _), \
(.clk_dev = DEVICE_DT_GET_OR_NULL(DT_CLOCKS_CTLR(UARTE(idx))), \
.clk_spec = { \
Expand Down Expand Up @@ -3676,7 +3675,7 @@
UARTE_INIT_LEVEL(idx), \
UARTE_INIT_PRIO(idx), \
&uart_nrfx_uarte_driver_api)

Check notice on line 3678 in drivers/serial/uart_nrfx_uarte.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/serial/uart_nrfx_uarte.c:3678 
-		struct uarte_async_cb uarte##idx##_async;))		       \
-	static uint8_t uarte##idx##_poll_out_byte DMM_MEMORY_SECTION(UARTE(idx));\
-	static uint8_t uarte##idx##_poll_in_byte DMM_MEMORY_SECTION(UARTE(idx)); \
-	static struct uarte_nrfx_data uarte_##idx##_data = {		       \
-		IF_ENABLED(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
-				(.uart_config = UARTE_CONFIG(idx),))	       \
-		IF_ENABLED(CONFIG_UART_##idx##_ASYNC,			       \
-			    (.async = &uarte##idx##_async,))		       \
-		IF_ENABLED(CONFIG_UART_##idx##_INTERRUPT_DRIVEN,	       \
-			    (.int_driven = &uarte##idx##_int_driven,))	       \
-	};								       \
+		struct uarte_async_cb uarte##idx##_async;))                                                                                                                                                             \
+	static uint8_t uarte##idx##_poll_out_byte DMM_MEMORY_SECTION(UARTE(idx));                                                                                                                                       \
+	static uint8_t uarte##idx##_poll_in_byte DMM_MEMORY_SECTION(UARTE(idx));                                                                                                                                        \
+	static struct uarte_nrfx_data uarte_##idx##_data = {IF_ENABLED(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
+				(.uart_config = UARTE_CONFIG(idx),))                                                                                                     \
+			 IF_ENABLED(CONFIG_UART_##idx##_ASYNC,			       \
+			    (.async = &uarte##idx##_async,))                                                                                                                                               \
+					    IF_ENABLED(CONFIG_UART_##idx##_INTERRUPT_DRIVEN,	       \
+			    (.int_driven = &uarte##idx##_int_driven,)) };                                                                                                                      \
 	COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE, (),		       \
 		(BUILD_ASSERT(UARTE_GET_BAUDRATE(idx) > 0,		       \
-			      "Unsupported baudrate");))		       \
-	static const struct uarte_nrfx_config uarte_##idx##z_config = {	       \
-		COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
+			      "Unsupported baudrate");))                                                                                                                                                    \
+	static const struct uarte_nrfx_config uarte_##idx##z_config = {COND_CODE_1(CONFIG_UART_USE_RUNTIME_CONFIGURE,		       \
 			(.clock_freq = NRF_PERIPH_GET_FREQUENCY(UARTE(idx)),),  \
 		    (IF_ENABLED(UARTE_HAS_FRAME_TIMEOUT,		       \
 			(.baudrate = UARTE_PROP(idx, current_speed),))	       \
 		     .nrf_baudrate = UARTE_GET_BAUDRATE(idx),		       \
-		     .hw_config = UARTE_NRF_CONFIG(idx),))		       \
-		.pcfg = PINCTRL_DT_DEV_CONFIG_GET(UARTE(idx)),		       \
-		.uarte_regs = _CONCAT(NRF_UARTE, idx),                         \
-		IF_ENABLED(CONFIG_HAS_NORDIC_DMM,			       \
-				(.mem_reg = DMM_DEV_TO_REG(UARTE(idx)),))      \
-		.flags =						       \
-			(IS_ENABLED(CONFIG_UART_##idx##_ENHANCED_POLL_OUT) ?   \
-				UARTE_CFG_FLAG_PPI_ENDTX : 0) |		       \
-			(IS_ENABLED(CONFIG_UART_##idx##_NRF_HW_ASYNC) ?        \
-				UARTE_CFG_FLAG_HW_BYTE_COUNTING : 0) |	       \
-			(!IS_ENABLED(CONFIG_HAS_NORDIC_DMM) ? 0 :	       \
-			  (UARTE_IS_CACHEABLE(idx) ?			       \
-				UARTE_CFG_FLAG_CACHEABLE : 0)) |	       \
-			(IS_ENABLED(CONFIG_UART_NRFX_UARTE_SPURIOUS_RXTO_WORKAROUND) && \
-			 INSTANCE_IS_HIGH_SPEED(_, /*empty*/, idx, _) ?	       \
-			 UARTE_CFG_FLAG_SPURIOUS_RXTO : 0) |		       \
-			((IS_ENABLED(UARTE_BAUDRATE_RETENTION_WORKAROUND) &&   \
-			  UARTE_IS_CACHEABLE(idx)) ?			       \
-			   UARTE_CFG_FLAG_VOLATILE_BAUDRATE : 0) |	       \
-			UARTE_HAS_VAR_PRIO(idx) |			       \
-			USE_LOW_POWER(idx),				       \
-		UARTE_DISABLE_RX_INIT(UARTE(idx)),			       \
-		.poll_out_byte = &uarte##idx##_poll_out_byte,		       \
-		.poll_i
#define UARTE_INT_DRIVEN(idx) \
IF_ENABLED(CONFIG_UART_##idx##_INTERRUPT_DRIVEN, \
(static uint8_t uarte##idx##_tx_buffer \
Expand Down
130 changes: 2 additions & 128 deletions modules/hal_nordic/nrfx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,7 @@ config NRFX_MRAMC
config NRFX_NFCT
bool "NFCT driver"
depends on $(dt_nodelabel_exists,nfct)
select NRFX_TIMER4 if SOC_SERIES_NRF52X
select NRFX_TIMER2 if SOC_SERIES_NRF53X
select NRFX_TIMER

config NRFX_NVMC
bool "NVMC driver"
Expand Down Expand Up @@ -764,132 +763,7 @@ config NRFX_TEMP
depends on $(dt_nodelabel_exists,temp)

config NRFX_TIMER
bool

config NRFX_TIMER0
bool "TIMER0 driver instance"
depends on $(dt_nodelabel_exists,timer0)
select NRFX_TIMER

config NRFX_TIMER1
bool "TIMER1 driver instance"
depends on $(dt_nodelabel_exists,timer1)
select NRFX_TIMER

config NRFX_TIMER2
bool "TIMER2 driver instance"
depends on $(dt_nodelabel_exists,timer2)
select NRFX_TIMER

config NRFX_TIMER3
bool "TIMER3 driver instance"
depends on $(dt_nodelabel_exists,timer3)
select NRFX_TIMER

config NRFX_TIMER4
bool "TIMER4 driver instance"
depends on $(dt_nodelabel_exists,timer4)
select NRFX_TIMER

config NRFX_TIMER00
bool "TIMER00 driver instance"
depends on $(dt_nodelabel_exists,timer00)
select NRFX_TIMER

config NRFX_TIMER10
bool "TIMER10 driver instance"
depends on $(dt_nodelabel_exists,timer10)
select NRFX_TIMER

config NRFX_TIMER20
bool "TIMER20 driver instance"
depends on $(dt_nodelabel_exists,timer20)
select NRFX_TIMER

config NRFX_TIMER21
bool "TIMER21 driver instance"
depends on $(dt_nodelabel_exists,timer21)
select NRFX_TIMER

config NRFX_TIMER22
bool "TIMER22 driver instance"
depends on $(dt_nodelabel_exists,timer22)
select NRFX_TIMER

config NRFX_TIMER23
bool "TIMER23 driver instance"
depends on $(dt_nodelabel_exists,timer23)
select NRFX_TIMER

config NRFX_TIMER24
bool "TIMER24 driver instance"
depends on $(dt_nodelabel_exists,timer24)
select NRFX_TIMER

config NRFX_TIMER020
bool "TIMER020 driver instance"
depends on $(dt_nodelabel_exists,timer020)
select NRFX_TIMER

config NRFX_TIMER021
bool "TIMER021 driver instance"
depends on $(dt_nodelabel_exists,timer021)
select NRFX_TIMER

config NRFX_TIMER022
bool "TIMER022 driver instance"
depends on $(dt_nodelabel_exists,timer022)
select NRFX_TIMER

config NRFX_TIMER120
bool "TIMER120 driver instance"
depends on $(dt_nodelabel_exists,timer120)
select NRFX_TIMER

config NRFX_TIMER121
bool "TIMER121 driver instance"
depends on $(dt_nodelabel_exists,timer121)
select NRFX_TIMER

config NRFX_TIMER130
bool "TIMER130 driver instance"
depends on $(dt_nodelabel_exists,timer130)
select NRFX_TIMER

config NRFX_TIMER131
bool "TIMER131 driver instance"
depends on $(dt_nodelabel_exists,timer131)
select NRFX_TIMER

config NRFX_TIMER132
bool "TIMER132 driver instance"
depends on $(dt_nodelabel_exists,timer132)
select NRFX_TIMER

config NRFX_TIMER133
bool "TIMER133 driver instance"
depends on $(dt_nodelabel_exists,timer133)
select NRFX_TIMER

config NRFX_TIMER134
bool "TIMER134 driver instance"
depends on $(dt_nodelabel_exists,timer134)
select NRFX_TIMER

config NRFX_TIMER135
bool "TIMER135 driver instance"
depends on $(dt_nodelabel_exists,timer135)
select NRFX_TIMER

config NRFX_TIMER136
bool "TIMER136 driver instance"
depends on $(dt_nodelabel_exists,timer136)
select NRFX_TIMER

config NRFX_TIMER137
bool "TIMER137 driver instance"
depends on $(dt_nodelabel_exists,timer137)
select NRFX_TIMER
bool "TIMER driver"

config NRFX_TWI
bool
Expand Down
22 changes: 22 additions & 0 deletions modules/hal_nordic/nrfx/nrfx_glue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,25 @@
default: return "unknown";
}
}

char const *nrfx_new_error_string_get(int code)
{
#define NRFX_NEW_ERROR_STRING_CASE(code) case code: return #code

Check warning on line 51 in modules/hal_nordic/nrfx/nrfx_glue.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

MACRO_WITH_FLOW_CONTROL 

modules/hal_nordic/nrfx/nrfx_glue.c:51  Macros with flow control statements should be avoided
switch (-code)

Check failure on line 52 in modules/hal_nordic/nrfx/nrfx_glue.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

OPEN_BRACE 

modules/hal_nordic/nrfx/nrfx_glue.c:52  that open brace { should be on the previous line
{
NRFX_NEW_ERROR_STRING_CASE(0);

Check notice on line 54 in modules/hal_nordic/nrfx/nrfx_glue.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

modules/hal_nordic/nrfx/nrfx_glue.c:54 
-	#define NRFX_NEW_ERROR_STRING_CASE(code)  case code: return #code
-	switch (-code)
-	{
+#define NRFX_NEW_ERROR_STRING_CASE(code)                                                           \
+	case code:                                                                                 \
+		return #code
+	switch (-code) {
NRFX_NEW_ERROR_STRING_CASE(ECANCELED);
NRFX_NEW_ERROR_STRING_CASE(ENOMEM);
NRFX_NEW_ERROR_STRING_CASE(ENOTSUP);
NRFX_NEW_ERROR_STRING_CASE(EINVAL);
NRFX_NEW_ERROR_STRING_CASE(EINPROGRESS);
NRFX_NEW_ERROR_STRING_CASE(E2BIG);
NRFX_NEW_ERROR_STRING_CASE(ETIMEDOUT);
NRFX_NEW_ERROR_STRING_CASE(EPERM);
NRFX_NEW_ERROR_STRING_CASE(EFAULT);
NRFX_NEW_ERROR_STRING_CASE(EACCES);
NRFX_NEW_ERROR_STRING_CASE(EBUSY);
NRFX_NEW_ERROR_STRING_CASE(EALREADY);
default: return "unknown";
}

Check notice on line 68 in modules/hal_nordic/nrfx/nrfx_glue.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

modules/hal_nordic/nrfx/nrfx_glue.c:68 
-		default: return "unknown";
+	default:
+		return "unknown";
}
78 changes: 0 additions & 78 deletions modules/hal_nordic/nrfx/nrfx_kconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,84 +659,6 @@
#ifdef CONFIG_NRFX_TIMER
#define NRFX_TIMER_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER_LOG
#define NRFX_TIMER_CONFIG_LOG_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER0
#define NRFX_TIMER0_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER1
#define NRFX_TIMER1_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER2
#define NRFX_TIMER2_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER3
#define NRFX_TIMER3_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER4
#define NRFX_TIMER4_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER00
#define NRFX_TIMER00_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER10
#define NRFX_TIMER10_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER20
#define NRFX_TIMER20_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER21
#define NRFX_TIMER21_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER22
#define NRFX_TIMER22_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER23
#define NRFX_TIMER23_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER24
#define NRFX_TIMER24_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER020
#define NRFX_TIMER020_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER021
#define NRFX_TIMER021_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER022
#define NRFX_TIMER022_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER120
#define NRFX_TIMER120_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER121
#define NRFX_TIMER121_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER130
#define NRFX_TIMER130_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER131
#define NRFX_TIMER131_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER132
#define NRFX_TIMER132_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER133
#define NRFX_TIMER133_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER134
#define NRFX_TIMER134_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER135
#define NRFX_TIMER135_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER136
#define NRFX_TIMER136_ENABLED 1
#endif
#ifdef CONFIG_NRFX_TIMER137
#define NRFX_TIMER137_ENABLED 1
#endif

#ifdef CONFIG_NRFX_TWI
#define NRFX_TWI_ENABLED 1
Expand Down
10 changes: 10 additions & 0 deletions modules/hal_nordic/nrfx/nrfx_log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,16 @@
#define NRFX_LOG_ERROR_STRING_GET(error_code) nrfx_error_string_get(error_code)
extern char const *nrfx_error_string_get(nrfx_err_t code);

/**
* @brief Macro for getting the textual representation of a given errno error code.
*
* @param[in] error_code Errno error code.
*
* @return String containing the textual representation of the errno error code.
*/
#define NRFX_NEW_LOG_ERROR_STRING_GET(error_code) nrfx_new_error_string_get(error_code)
extern char const *nrfx_new_error_string_get(int code);

Check notice on line 139 in modules/hal_nordic/nrfx/nrfx_log.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

modules/hal_nordic/nrfx/nrfx_log.h:139 
-#define NRFX_NEW_LOG_ERROR_STRING_GET(error_code)  nrfx_new_error_string_get(error_code)
+#define NRFX_NEW_LOG_ERROR_STRING_GET(error_code) nrfx_new_error_string_get(error_code)

/** @} */

#ifdef __cplusplus
Expand Down
1 change: 1 addition & 0 deletions samples/subsys/usb/uac2_explicit_feedback/app.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
compatible = "zephyr,uac2";
status = "okay";
full-speed;
high-speed;
audio-function = <AUDIO_FUNCTION_OTHER>;

uac_aclk: aclk {
Expand Down
2 changes: 1 addition & 1 deletion samples/subsys/usb/uac2_explicit_feedback/boards/nrf5340dk_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Enable timer for asynchronous feedback
CONFIG_NRFX_TIMER2=y
CONFIG_NRFX_TIMER=y
Loading
Loading