fixup! manifest: Update sdk-zephyr revision and align to new API

nrfconnect · Oct 23, 2024 · b7a79c7 · b7a79c7
1 parent 43c31ed
commit b7a79c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/subsys/debug/cpu_load/cpu_load.c b/subsys/debug/cpu_load/cpu_load.c
@@ -42,6 +42,7 @@ static uint32_t shared_ch_mask;
 	(IS_ENABLED(CONFIG_CPU_LOAD_USE_SHARED_DPPI_CHANNELS) && \
 	(BIT(ch) & shared_ch_mask))
 
+
 /** @brief Allocate (D)PPI channel. */
 static nrfx_err_t ppi_alloc(uint8_t *ch, uint32_t evt)
 {

diff --git a/subsys/debug/ppi_trace/ppi_trace.c b/subsys/debug/ppi_trace/ppi_trace.c
@@ -51,10 +51,6 @@ LOG_MODULE_REGISTER(ppi_trace, CONFIG_PPI_TRACE_LOG_LEVEL);
 	[DT_PROP(gpio_node, port)] = \
 		NRFX_GPIOTE_INSTANCE(DT_PROP(GPIOTE_NODE(gpio_node), instance)),
 
-#ifdef DPPI_PRESENT
-static nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
-#endif
-
 static const nrfx_gpiote_t *get_gpiote(nrfx_gpiote_pin_t pin)
 {
 	static const nrfx_gpiote_t gpiote[GPIO_COUNT] = {
@@ -69,6 +65,8 @@ static nrfx_err_t ppi_alloc(uint8_t *ch, uint32_t evt)
 {
 	nrfx_err_t err;
 #ifdef DPPI_PRESENT
+	nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
+
 	if (*PUBLISH_ADDR(evt) != 0) {
 		/* Use mask of one of subscribe registers in the system,
 		 * assuming that all subscribe registers has the same mask for