This is an automated email from the ASF dual-hosted git repository. raiden00 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 46dd4d8d914e32b9f4ee64ff408486adb5722127 Author: Matias N <mat...@protobits.dev> AuthorDate: Mon Aug 24 14:16:47 2020 -0300 nrf52_ppi: pass event and task register addresses as uin32_t directly --- arch/arm/src/nrf52/nrf52_ppi.c | 12 ++++++------ arch/arm/src/nrf52/nrf52_ppi.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/src/nrf52/nrf52_ppi.c b/arch/arm/src/nrf52/nrf52_ppi.c index dcc6d41..1a8f412 100644 --- a/arch/arm/src/nrf52/nrf52_ppi.c +++ b/arch/arm/src/nrf52/nrf52_ppi.c @@ -79,33 +79,33 @@ void nrf52_ppi_channel_enable(uint8_t ch, bool enable) * Name: nrf52_ppi_set_event_ep ****************************************************************************/ -void nrf52_ppi_set_event_ep(uint8_t ch, volatile uint32_t *event_reg) +void nrf52_ppi_set_event_ep(uint8_t ch, uint32_t event_reg) { DEBUGASSERT(ch < NRF52_PPI_NUM_CONFIGURABLE_CHANNELS); - putreg32((uint32_t)event_reg, NRF52_PPI_CHEEP(ch)); + putreg32(event_reg, NRF52_PPI_CHEEP(ch)); } /**************************************************************************** * Name: nrf52_ppi_set_task_ep ****************************************************************************/ -void nrf52_ppi_set_task_ep(uint8_t ch, volatile uint32_t *task_reg) +void nrf52_ppi_set_task_ep(uint8_t ch, uint32_t task_reg) { DEBUGASSERT(ch < NRF52_PPI_NUM_CONFIGURABLE_CHANNELS); - putreg32((uint32_t)task_reg, NRF52_PPI_CHTEP(ch)); + putreg32(task_reg, NRF52_PPI_CHTEP(ch)); } /**************************************************************************** * Name: nrf52_ppi_set_task2_ep ****************************************************************************/ -void nrf52_ppi_set_task2_ep(uint8_t ch, volatile uint32_t *task_reg) +void nrf52_ppi_set_task2_ep(uint8_t ch, uint32_t task_reg) { DEBUGASSERT(ch < NRF52_PPI_NUM_CHANNELS); - putreg32((uint32_t)task_reg, NRF52_PPI_FORKTEP(ch)); + putreg32(task_reg, NRF52_PPI_FORKTEP(ch)); } /**************************************************************************** diff --git a/arch/arm/src/nrf52/nrf52_ppi.h b/arch/arm/src/nrf52/nrf52_ppi.h index 299eda8..81c1ed4 100644 --- a/arch/arm/src/nrf52/nrf52_ppi.h +++ b/arch/arm/src/nrf52/nrf52_ppi.h @@ -86,7 +86,7 @@ void nrf52_ppi_channel_enable(uint8_t ch, bool enable); * ****************************************************************************/ -void nrf52_ppi_set_event_ep(uint8_t ch, volatile uint32_t *event_reg); +void nrf52_ppi_set_event_ep(uint8_t ch, uint32_t event_reg); /**************************************************************************** * Name: nrf52_ppi_set_task_ep @@ -100,7 +100,7 @@ void nrf52_ppi_set_event_ep(uint8_t ch, volatile uint32_t *event_reg); * ****************************************************************************/ -void nrf52_ppi_set_task_ep(uint8_t ch, volatile uint32_t *task_reg); +void nrf52_ppi_set_task_ep(uint8_t ch, uint32_t task_reg); /**************************************************************************** * Name: nrf52_ppi_set_task2_ep @@ -114,7 +114,7 @@ void nrf52_ppi_set_task_ep(uint8_t ch, volatile uint32_t *task_reg); * ****************************************************************************/ -void nrf52_ppi_set_task2_ep(uint8_t ch, volatile uint32_t *task_reg); +void nrf52_ppi_set_task2_ep(uint8_t ch, uint32_t task_reg); /**************************************************************************** * Name: nrf52_ppi_grp_channel_enable