X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_timer.c;h=2f29263c726627bdf398a7f41eb20ff85acbaa46;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=b532e3e97dd6d1784593acf0c6b0a1a78232df47;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/mt/ss_timer.c b/src/mt/ss_timer.c index b532e3e97..2f29263c7 100644 --- a/src/mt/ss_timer.c +++ b/src/mt/ss_timer.c @@ -163,12 +163,10 @@ S16 units; /* period units*/ PFS16 tmrFnct; /* timer function, typically SActvTmr */ #endif { - S16 ret; - /* ss015.301 - Enclosed all timer activation functions in a union. */ - SsTmrActvFn ssTmrActvFn; - /* ss041.103 - Moved handling to STmrRegHndlr */ - - TRC1(SRegCfgTmr); + S16 ret; + /* ss015.301 - Enclosed all timer activation functions in a union. */ + SsTmrActvFn ssTmrActvFn; + /* ss041.103 - Moved handling to STmrRegHndlr */ ssTmrActvFn.mtFlag = FALSE; ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; @@ -205,8 +203,6 @@ PAIFTMRS16 tmrFnct; /* timer function, typically SActvTmr */ SsTmrActvFn ssTmrActvFn; /* ss041.103 - Moved handling to STmrRegHndlr */ - TRC1(SRegCfgTmr); - ssTmrActvFn.mtFlag = FALSE; ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; ret = STmrRegHndlr(proc, ent, inst, period, units, ssTmrActvFn); @@ -261,8 +257,6 @@ PAIFTMRS16 tmrFnctMt; /* timer function, typically SActvTmr */ /* ss015.301 - Enclosed all timer activation functions in a union. */ SsTmrActvFn ssTmrActvFn; - TRC1(SRegCfgTmrMt); - ssTmrActvFn.actvFnc.tmrActvFnMt = tmrFnctMt; ssTmrActvFn.mtFlag = TRUE; ret = STmrRegHndlr(ent, inst, period, units, ssTmrActvFn); @@ -343,18 +337,16 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #endif /* SS_MULTIPLE_PROCS */ { #if (ERRCLASS & ERRCLS_INT_PAR) - U8 i; + uint8_t i; #endif S16 ret; SsTmrEntry *tmr; #ifdef SS_MULTIPLE_PROCS #if (ERRCLASS & ERRCLS_INT_PAR) - U16 procIdIdx; + uint16_t procIdIdx; #endif /* ERRCLASS & ERRCLS_INT_PAR */ #endif /* SS_MULTPLE_PROCS */ - TRC1(STmrRegHndlr); - #if (ERRCLASS & ERRCLS_INT_PAR) #ifdef SS_MULTIPLE_PROCS @@ -517,7 +509,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #else && (osCp.tmrTbl[i].ssTmrActvFn.actvFnc.tmrActvFn == ssTmrActvFn.actvFnc.tmrActvFn) #endif - && (osCp.tmrTbl[i].interval == (U32) ((period * SS_TICKS_SEC) / units))) + && (osCp.tmrTbl[i].interval == (uint32_t) ((period * SS_TICKS_SEC) / units))) { /* is this timer in use ? (unexpired) */ if (osCp.tmrTbl[i].used == TRUE) @@ -545,7 +537,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #endif /* SS_MULTIPLE_PROCS */ tmr->ownerEnt = ent; tmr->ownerInst = inst; - tmr->interval = (U32) ((period * SS_TICKS_SEC) / units); + tmr->interval = (uint32_t) ((period * SS_TICKS_SEC) / units); tmr->ssTmrActvFn.mtFlag = ssTmrActvFn.mtFlag; /* ss041.103 */ @@ -647,8 +639,6 @@ PFS16 tmrFnct; /* timer function */ SsTmrActvFn ssTmrActvFn; /* ss041.103 - Moved handling to STmrDeregHndlr */ - TRC1(SDeregCfgTmr); - ssTmrActvFn.mtFlag = FALSE; ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; ret = STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn); @@ -684,8 +674,6 @@ PAIFTMRS16 tmrFnct; /* timer function */ /* ss041.103 - Moved handling to STmrDeregHndlr */ - TRC1(SDeregCfgTmr); - ssTmrActvFn.mtFlag = FALSE; ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct; ret = STmrDeregHndlr(proc, ent, inst, period, units, ssTmrActvFn); @@ -735,8 +723,6 @@ PAIFTMRS16 tmrFnctMt; /* timer function */ /* ss015.301 Enclosed all timer activation functions in a union. */ SsTmrActvFn ssTmrActvFn; - TRC1(SDeregCfgTmrMt); - ssTmrActvFn.actvFnc.tmrActvFnMt = tmrFnctMt; ssTmrActvFn.mtFlag = TRUE; @@ -822,14 +808,11 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ SsTmrEntry *tmr; #ifdef SS_MULTIPLE_PROCS #if (ERRCLASS & ERRCLS_INT_PAR) - U16 procIdIdx; + uint16_t procIdIdx; #endif /* ERRCLASS & ERRCLS_INT_PAR */ #endif /* SS_MULTIPLE_PROCS */ - TRC1(STmrDeregHndlr); - - #if (ERRCLASS & ERRCLS_INT_PAR) #ifdef SS_MULTIPLE_PROCS @@ -980,7 +963,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #else && osCp.tmrTbl[idx].ssTmrActvFn.actvFnc.tmrActvFn == ssTmrActvFn.actvFnc.tmrActvFn #endif - && osCp.tmrTbl[idx].interval == (U32) ((period * SS_TICKS_SEC) / units)) + && osCp.tmrTbl[idx].interval == (uint32_t) ((period * SS_TICKS_SEC) / units)) { break; }