Changed NRF_CCM to p_reg in src/nrfx/hal/nrf_ccm.c

auroraslb · wopu-ot · commit b8fbafd9e36d · 2020-07-02T11:36:04.000+02:00
Signed-off-by: Sletnes Bjørlo, Aurora &lt;aurora.sletnes@nordicsemi.no&gt;
diff --git a/src/nrfx/hal/nrf_ccm.c b/src/nrfx/hal/nrf_ccm.c
@@ -12,10 +12,10 @@
 void nrf_ccm_task_trigger(NRF_CCM_Type * p_reg, nrf_ccm_task_t task)
 {
   if ( task == NRF_CCM_TASK_KSGEN ) {
-    NRF_CCM->TASKS_KSGEN = 1;
+    p_reg->TASKS_KSGEN = 1;
     nrf_ccm_regw_sideeffects_TASKS_KSGEN();
   } else if ( task == NRF_CCM_TASK_STOP ) {
-    NRF_CCM->TASKS_STOP = 1;
+    p_reg->TASKS_STOP = 1;
     nrf_ccm_regw_sideeffects_TASKS_STOP();
   } else {
     bs_trace_error_line_time("Not supported task started in nrf_ccm\n");
@@ -24,13 +24,13 @@ void nrf_ccm_task_trigger(NRF_CCM_Type * p_reg, nrf_ccm_task_t task)
 
 void nrf_ccm_int_enable(NRF_CCM_Type * p_reg, uint32_t mask)
 {
-  NRF_CCM->INTENSET = mask;
+  p_reg->INTENSET = mask;
   nrf_ccm_regw_sideeffects_INTENSET();
 }
 
 void nrf_ccm_int_disable(NRF_CCM_Type * p_reg, uint32_t mask)
 {
-  NRF_CCM->INTENCLR = mask;
+  p_reg->INTENCLR = mask;
   nrf_ccm_regw_sideeffects_INTENCLR();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@`
`12`	`12`	`void nrf_ccm_task_trigger(NRF_CCM_Type * p_reg, nrf_ccm_task_t task)`
`13`	`13`	`{`
`14`	`14`	`if ( task == NRF_CCM_TASK_KSGEN ) {`
`15`		`- NRF_CCM->TASKS_KSGEN = 1;`
	`15`	`+ p_reg->TASKS_KSGEN = 1;`
`16`	`16`	`nrf_ccm_regw_sideeffects_TASKS_KSGEN();`
`17`	`17`	`} else if ( task == NRF_CCM_TASK_STOP ) {`
`18`		`- NRF_CCM->TASKS_STOP = 1;`
	`18`	`+ p_reg->TASKS_STOP = 1;`
`19`	`19`	`nrf_ccm_regw_sideeffects_TASKS_STOP();`
`20`	`20`	`} else {`
`21`	`21`	`bs_trace_error_line_time("Not supported task started in nrf_ccm\n");`
`@@ -24,13 +24,13 @@ void nrf_ccm_task_trigger(NRF_CCM_Type * p_reg, nrf_ccm_task_t task)`
`24`	`24`
`25`	`25`	`void nrf_ccm_int_enable(NRF_CCM_Type * p_reg, uint32_t mask)`
`26`	`26`	`{`
`27`		`- NRF_CCM->INTENSET = mask;`
	`27`	`+ p_reg->INTENSET = mask;`
`28`	`28`	`nrf_ccm_regw_sideeffects_INTENSET();`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`void nrf_ccm_int_disable(NRF_CCM_Type * p_reg, uint32_t mask)`
`32`	`32`	`{`
`33`		`- NRF_CCM->INTENCLR = mask;`
	`33`	`+ p_reg->INTENCLR = mask;`
`34`	`34`	`nrf_ccm_regw_sideeffects_INTENCLR();`
`35`	`35`	`}`
`36`	`36`