Skip to content

Commit 9f659db

Browse files
committed
fixup! align to new DPPI API
1 parent 3de766c commit 9f659db

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

subsys/esb/esb_dppi.c

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -225,44 +225,46 @@ int esb_ppi_init(void)
225225

226226
#else
227227

228-
err = nrfx_dppi_channel_alloc(&radio_address_timer_stop);
228+
nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
229+
230+
err = nrfx_dppi_channel_alloc(&dppi, &radio_address_timer_stop);
229231
if (err != NRFX_SUCCESS) {
230232
goto error;
231233
}
232234

233-
err = nrfx_dppi_channel_alloc(&timer_compare0_radio_disable);
235+
err = nrfx_dppi_channel_alloc(&dppi, &timer_compare0_radio_disable);
234236
if (err != NRFX_SUCCESS) {
235237
goto error;
236238
}
237239

238-
err = nrfx_dppi_channel_alloc(&timer_compare1_radio_txen);
240+
err = nrfx_dppi_channel_alloc(&dppi, &timer_compare1_radio_txen);
239241
if (err != NRFX_SUCCESS) {
240242
goto error;
241243
}
242244

243-
err = nrfx_dppi_channel_alloc(&disabled_phy_end_egu);
245+
err = nrfx_dppi_channel_alloc(&dppi, &disabled_phy_end_egu);
244246
if (err != NRFX_SUCCESS) {
245247
goto error;
246248
}
247249

248-
err = nrfx_dppi_channel_alloc(&egu_timer_start);
250+
err = nrfx_dppi_channel_alloc(&dppi, &egu_timer_start);
249251
if (err != NRFX_SUCCESS) {
250252
goto error;
251253
}
252254

253-
err = nrfx_dppi_channel_alloc(&egu_ramp_up);
255+
err = nrfx_dppi_channel_alloc(&dppi, &egu_ramp_up);
254256
if (err != NRFX_SUCCESS) {
255257
goto error;
256258
}
257259

258260
if (IS_ENABLED(CONFIG_ESB_NEVER_DISABLE_TX)) {
259-
err = nrfx_dppi_channel_alloc(&radio_end_timer_start);
261+
err = nrfx_dppi_channel_alloc(&dppi, &radio_end_timer_start);
260262
if (err != NRFX_SUCCESS) {
261263
goto error;
262264
}
263265
}
264266

265-
err = nrfx_dppi_group_alloc(&ramp_up_dppi_group);
267+
err = nrfx_dppi_group_alloc(&dppi, &ramp_up_dppi_group);
266268
if (err != NRFX_SUCCESS) {
267269
LOG_ERR("gppi_group_alloc failed with: %d\n", err);
268270
return -ENODEV;
@@ -315,44 +317,46 @@ void esb_ppi_deinit(void)
315317

316318
#else
317319

318-
err = nrfx_dppi_channel_free(radio_address_timer_stop);
320+
nrfx_dppi_t dppi = NRFX_DPPI_INSTANCE(0);
321+
322+
err = nrfx_dppi_channel_free(&dppi, radio_address_timer_stop);
319323
if (err != NRFX_SUCCESS) {
320324
goto error;
321325
}
322326

323-
err = nrfx_dppi_channel_free(timer_compare0_radio_disable);
327+
err = nrfx_dppi_channel_free(&dppi, timer_compare0_radio_disable);
324328
if (err != NRFX_SUCCESS) {
325329
goto error;
326330
}
327331

328-
err = nrfx_dppi_channel_free(timer_compare1_radio_txen);
332+
err = nrfx_dppi_channel_free(&dppi, timer_compare1_radio_txen);
329333
if (err != NRFX_SUCCESS) {
330334
goto error;
331335
}
332336

333-
err = nrfx_dppi_channel_free(disabled_phy_end_egu);
337+
err = nrfx_dppi_channel_free(&dppi, disabled_phy_end_egu);
334338
if (err != NRFX_SUCCESS) {
335339
goto error;
336340
}
337341

338-
err = nrfx_dppi_channel_free(egu_timer_start);
342+
err = nrfx_dppi_channel_free(&dppi, egu_timer_start);
339343
if (err != NRFX_SUCCESS) {
340344
goto error;
341345
}
342346

343-
err = nrfx_dppi_channel_free(egu_ramp_up);
347+
err = nrfx_dppi_channel_free(&dppi, egu_ramp_up);
344348
if (err != NRFX_SUCCESS) {
345349
goto error;
346350
}
347351

348352
if (IS_ENABLED(CONFIG_ESB_NEVER_DISABLE_TX)) {
349-
err = nrfx_dppi_channel_free(radio_end_timer_start);
353+
err = nrfx_dppi_channel_free(&dppi, radio_end_timer_start);
350354
if (err != NRFX_SUCCESS) {
351355
goto error;
352356
}
353357
}
354358

355-
err = nrfx_dppi_group_free(ramp_up_dppi_group);
359+
err = nrfx_dppi_group_free(&dppi, ramp_up_dppi_group);
356360
if (err != NRFX_SUCCESS) {
357361
goto error;
358362
}

0 commit comments

Comments
 (0)