diff --git a/r/source/sdl/esm/sdl_esm_priv.c b/r/source/sdl/esm/sdl_esm_priv.c index 2ade538..8b8370f 100644 --- a/r/source/sdl/esm/sdl_esm_priv.c +++ b/r/source/sdl/esm/sdl_esm_priv.c @@ -335,7 +335,7 @@ void SDL_ESM_loInterruptHandler (void *arg) } else { - SDL_ESM_interruptHandler((uint32_t)base_addr, ESM_INTR_PRIORITY_LEVEL_LOW, arg); + SDL_ESM_interruptHandler((uint32_t)base_addr, ESM_INTR_PRIORITY_LEVEL_LOW, (void *)esm_inst); } } /* Call common Interrupt handler */ diff --git a/r/source/sdl/esm/soc/am62ax/sdl_esm.c b/r/source/sdl/esm/soc/am62ax/sdl_esm.c index d8454c4..bece01f 100644 --- a/r/source/sdl/esm/soc/am62ax/sdl_esm.c +++ b/r/source/sdl/esm/soc/am62ax/sdl_esm.c @@ -150,15 +150,17 @@ int32_t SDL_ESM_verifyConfig(SDL_ESM_Inst instance, const SDL_ESM_config *pCofni uint32_t intNum; int32_t SDLRet= SDL_PASS; uint32_t enableRd; - SDL_ESM_Instance_t *SDL_ESM_Instance; esmIntrPriorityLvl_t intrPriorityLvlWr; uint32_t enableWr; - /* Check for valid esmInstConfig and esmInstType, and initialize appropriate - * esmInstBaseAddr for register base and SDM_ESM_instance for SW instance structure. Also get Maximum number of events corresponding to the instance */ - if ((SDL_ESM_selectEsmInst(instance, &SDL_ESM_Instance) == ((bool)false)) || - (SDL_ESM_getBaseAddr(instance, &esmInstBaseAddr) == ((bool)false))) + /** + * Initialize appropriate esmInstBaseAddr for register base and + * SDM_ESM_instance for SW instance structure. + * Get Maximum number of events corresponding to the instance. + * Check for valid instance is done in SDL_ESM_getBaseAddr itself. + */ + if (SDL_ESM_getBaseAddr(instance, &esmInstBaseAddr) == ((bool)false)) { result = SDL_EBADARGS; } @@ -607,11 +609,14 @@ int32_t SDL_ESM_registerECCCallback(SDL_ESM_Inst esmInstType,uint32_t eventBitma retval = ESM_init(instance,pConfig,applicationCallback,appArg); } - if (retval == SDL_PASS) { - if ((instance ==SDL_ESM_INST_WKUP_ESM0) ||(instance ==SDL_ESM_INST_MAIN_ESM0)) { + if (retval == SDL_PASS) + { + + /** + * ESM_init validates the instance before reaching Esmhandlerinit + */ retval = Esmhandlerinit(instance); - } - } + } return retval; } diff --git a/r/source/sdl/esm/soc/am62ax/sdl_esm_core.c b/r/source/sdl/esm/soc/am62ax/sdl_esm_core.c index c49d3d8..4660e25 100644 --- a/r/source/sdl/esm/soc/am62ax/sdl_esm_core.c +++ b/r/source/sdl/esm/soc/am62ax/sdl_esm_core.c @@ -236,11 +236,12 @@ bool SDL_ESM_checkSpecialEvent(uint32_t esm_base_addr, uint32_t priority, uint32 bool ret = (bool)false; uint32_t intSrc; esmGroupIntrStatus_t localEsmGroupIntrStatus; + uint32_t check_addr; *isCfgEvt = (bool)false; -SDL_ESM_getBaseAddr(SDL_ESM_INST_MAIN_ESM0, base_addr); - if (*base_addr != esm_base_addr) + SDL_ESM_getBaseAddr(SDL_ESM_INST_MAIN_ESM0, &check_addr); + if (check_addr != esm_base_addr) { (void)SDL_ESM_getGroupIntrStatus(esm_base_addr, priority, &localEsmGroupIntrStatus); intSrc = localEsmGroupIntrStatus.highestPendLvlIntNum; @@ -257,8 +258,8 @@ SDL_ESM_getBaseAddr(SDL_ESM_INST_MAIN_ESM0, base_addr); ret = (bool)true; } } - SDL_ESM_getBaseAddr(SDL_ESM_INST_WKUP_ESM0, base_addr); - if (*base_addr != esm_base_addr) + SDL_ESM_getBaseAddr(SDL_ESM_INST_WKUP_ESM0, &check_addr); + if (check_addr != esm_base_addr) { (void)SDL_ESM_getGroupIntrStatus(esm_base_addr, priority, &localEsmGroupIntrStatus); intSrc = localEsmGroupIntrStatus.highestPendLvlIntNum; diff --git a/r/source/sdl/esm/v0/sdl_ip_esm.c b/r/source/sdl/esm/v0/sdl_ip_esm.c index 38ace2a..a358cbe 100644 --- a/r/source/sdl/esm/v0/sdl_ip_esm.c +++ b/r/source/sdl/esm/v0/sdl_ip_esm.c @@ -950,9 +950,7 @@ int32_t SDL_ESM_reset(uint32_t baseAddr) int32_t retVal = SDL_EBADARGS; if (baseAddr != ((uint32_t) (0u))) { - HW_WR_FIELD32(baseAddr +SDL_ESM_SFT_RST, - SDL_ESM_SFT_RST_KEY, - ESM_SFT_RST_KEY_RESET_VAL); + HW_WR_REG32(baseAddr+SDL_ESM_SFT_RST, ESM_SFT_RST_KEY_RESET_VAL); retVal = SDL_PASS; } return retVal;