zephyr
/
nrf_hw_models
mirror of https://github.com/zephyrproject-rtos/nrf_hw_models.git
1
0
Fork 0
Code Issues Releases Wiki Activity

CLOCK: Add missing TASK sideeffecting prototypes, and fix typo 

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
This commit is contained in:
Alberto Escolar Piedras 2023-09-14 13:51:42 +02:00
parent 56c7581a3e
commit a70c73bbae
3 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/HW_models/NHW_CLOCK.c
View File

@ -379,7 +379,7 @@ void nhw_clock_TASKS_CTSTOP(uint inst) {
}
#endif /* NHW_CLKPWR_HAS_CALTIMER */
void nhw_clock_reqw_sideeffects_INTENSET(uint i) {
void nhw_clock_regw_sideeffects_INTENSET(uint i) {
if (NRF_CLOCK_regs[i]->INTENSET) { /* LCOV_EXCL_BR_LINE */
struct clkpwr_status *this = &nhw_clkpwr_st[i];
@ -389,7 +389,7 @@ void nhw_clock_reqw_sideeffects_INTENSET(uint i) {
}
}
void nhw_clock_reqw_sideeffects_INTENCLR(uint i) {
void nhw_clock_regw_sideeffects_INTENCLR(uint i) {
if (NRF_CLOCK_regs[i]->INTENCLR) { /* LCOV_EXCL_BR_LINE */
struct clkpwr_status *this = &nhw_clkpwr_st[i];
@ -400,31 +400,31 @@ void nhw_clock_reqw_sideeffects_INTENCLR(uint i) {
}
}
#define nhw_clock_reqw_sideeffects_TASKS_(x) \
void nhw_clock_reqw_sideeffects_TASKS_##x(uint i) { \
#define nhw_clock_regw_sideeffects_TASKS_(x) \
void nhw_clock_regw_sideeffects_TASKS_##x(uint i) { \
if (NRF_CLOCK_regs[i]->TASKS_##x) { /* LCOV_EXCL_BR_LINE */\
NRF_CLOCK_regs[i]->TASKS_##x = 0; \
nhw_clock_TASKS_##x(i); \
} \
}
nhw_clock_reqw_sideeffects_TASKS_(LFCLKSTART)
nhw_clock_reqw_sideeffects_TASKS_(LFCLKSTOP)
nhw_clock_reqw_sideeffects_TASKS_(HFCLKSTART)
nhw_clock_reqw_sideeffects_TASKS_(HFCLKSTOP)
nhw_clock_regw_sideeffects_TASKS_(LFCLKSTART)
nhw_clock_regw_sideeffects_TASKS_(LFCLKSTOP)
nhw_clock_regw_sideeffects_TASKS_(HFCLKSTART)
nhw_clock_regw_sideeffects_TASKS_(HFCLKSTOP)
#if (NHW_CLKPWR_HAS_HFCLKAUDIOCLK)
nhw_clock_reqw_sideeffects_TASKS_(HFCLKAUDIOSTART)
nhw_clock_reqw_sideeffects_TASKS_(HFCLKAUDIOSTOP)
nhw_clock_regw_sideeffects_TASKS_(HFCLKAUDIOSTART)
nhw_clock_regw_sideeffects_TASKS_(HFCLKAUDIOSTOP)
#endif
#if (NHW_CLKPWR_HAS_HFCLK192MCLK)
nhw_clock_reqw_sideeffects_TASKS_(HFCLK192MSTART)
nhw_clock_reqw_sideeffects_TASKS_(HFCLK192MSTOP)
nhw_clock_regw_sideeffects_TASKS_(HFCLK192MSTART)
nhw_clock_regw_sideeffects_TASKS_(HFCLK192MSTOP)
#endif
nhw_clock_reqw_sideeffects_TASKS_(CAL)
nhw_clock_regw_sideeffects_TASKS_(CAL)
#if (NHW_CLKPWR_HAS_CALTIMER)
nhw_clock_reqw_sideeffects_TASKS_(CTSTART)
nhw_clock_reqw_sideeffects_TASKS_(CTSTOP)
nhw_clock_regw_sideeffects_TASKS_(CTSTART)
nhw_clock_regw_sideeffects_TASKS_(CTSTOP)
#endif /* NHW_CLKPWR_HAS_CALTIMER */
void nhw_pwrclk_regw_sideeffects_EVENTS_all(uint i) {

22
src/HW_models/NHW_CLOCK.h
View File

@ -20,15 +20,19 @@ void nhw_clock_TASKS_HFCLKSTOP(uint i);
void nhw_clock_TASKS_CAL(uint i);
void nhw_clock_TASKS_CTSTART(uint inst);
void nhw_clock_TASKS_CTSTOP(uint inst);
void nhw_clock_reqw_sideeffects_INTENSET(uint i);
void nhw_clock_reqw_sideeffects_INTENCLR(uint i);
void nhw_clock_reqw_sideeffects_TASKS_LFCLKSTART(uint i);
void nhw_clock_reqw_sideeffects_TASKS_LFCLKSTOP(uint i);
void nhw_clock_reqw_sideeffects_TASKS_HFCLKSTART(uint i);
void nhw_clock_reqw_sideeffects_TASKS_HFCLKSTOP(uint i);
void nhw_clock_reqw_sideeffects_TASKS_CAL(uint i);
void nhw_clock_reqw_sideeffects_TASKS_CTSTART(uint i);
void nhw_clock_reqw_sideeffects_TASKS_CTSTOP(uint i);
void nhw_clock_regw_sideeffects_INTENSET(uint i);
void nhw_clock_regw_sideeffects_INTENCLR(uint i);
void nhw_clock_regw_sideeffects_TASKS_LFCLKSTART(uint i);
void nhw_clock_regw_sideeffects_TASKS_LFCLKSTOP(uint i);
void nhw_clock_regw_sideeffects_TASKS_HFCLKSTART(uint i);
void nhw_clock_regw_sideeffects_TASKS_HFCLKSTOP(uint i);
void nhw_clock_regw_sideeffects_TASKS_HFCLKAUDIOSTART(uint i);
void nhw_clock_regw_sideeffects_TASKS_HFCLKAUDIOSTOP(uint i);
void nhw_clock_regw_sideeffects_TASKS_HFCLK192MSTART(uint i);
void nhw_clock_regw_sideeffects_TASKS_HFCLK192MSTOP(uint i);
void nhw_clock_regw_sideeffects_TASKS_CAL(uint i);
void nhw_clock_regw_sideeffects_TASKS_CTSTART(uint i);
void nhw_clock_regw_sideeffects_TASKS_CTSTOP(uint i);
/* Side-effecting function when any event register is written: */
void nhw_pwrclk_regw_sideeffects_EVENTS_all(uint i);
void nhw_clock_regw_sideeffects_SUBSCRIBE_HFCLKSTART(uint i);

6
src/nrfx/hal/nrf_clock.c
View File

@ -23,7 +23,7 @@ void nrf_clock_int_enable(NRF_CLOCK_Type * p_reg, uint32_t mask)
p_reg->INTENSET = mask;
int i = clock_number_from_ptr(p_reg);
nhw_clock_reqw_sideeffects_INTENSET(i);
nhw_clock_regw_sideeffects_INTENSET(i);
}
void nrf_clock_int_disable(NRF_CLOCK_Type * p_reg, uint32_t mask)
@ -31,7 +31,7 @@ void nrf_clock_int_disable(NRF_CLOCK_Type * p_reg, uint32_t mask)
p_reg->INTENCLR = mask;
int i = clock_number_from_ptr(p_reg);
nhw_clock_reqw_sideeffects_INTENCLR(i);
nhw_clock_regw_sideeffects_INTENCLR(i);
}
void nrf_clock_task_trigger(NRF_CLOCK_Type * p_reg, nrf_clock_task_t task)
@ -41,7 +41,7 @@ void nrf_clock_task_trigger(NRF_CLOCK_Type * p_reg, nrf_clock_task_t task)
int i = clock_number_from_ptr(p_reg);
#define CASE_TASK(TASKN) \
case NRF_CLOCK_TASK_##TASKN: nhw_clock_reqw_sideeffects_TASKS_##TASKN(i); break;
case NRF_CLOCK_TASK_##TASKN: nhw_clock_regw_sideeffects_TASKS_##TASKN(i); break;
switch (task) {
CASE_TASK(HFCLKSTART)