X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_bdy5.c;h=d2cf7e73630b168aae5f0a5a8f66c34cf16dc54f;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=cab21f7c9b522921cca01866fa5123ab41da5cce;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git diff --git a/src/cm/cm_bdy5.c b/src/cm/cm_bdy5.c index cab21f7c9..d2cf7e736 100644 --- a/src/cm/cm_bdy5.c +++ b/src/cm/cm_bdy5.c @@ -86,7 +86,7 @@ * * Desc: Handle a timer entry * -* Ret: RETVOID +* Ret: void * * Notes: * @@ -96,28 +96,27 @@ #ifdef SS_FAP #ifdef ANSI -PUBLIC Void cmPrcTmr +Void cmPrcTmr ( CmTqCp *tqCp, /* timing que control point */ CmTqType *tq, /* timing queue */ PFV func /* function */ ) #else -PUBLIC Void cmPrcTmr(tqCp, tq, func) +Void cmPrcTmr(tqCp, tq, func) CmTqCp *tqCp; /* connection control block */ CmTqType *tq; /* message buffer */ PFV func; /* function */ #endif { /**/ - U32 expire; - U32 entry; + uint32_t expire; + uint32_t entry; S16 event; PTR cb; CmTimer *tmp1; CmTimer **tmp2; - TRC2(cmPrcTmr) #ifdef CMDBG { @@ -140,7 +139,7 @@ PFV func; /* function */ ++tqCp->nxtEnt; expire = tqCp->nxtEnt; /* cm_bdy5_c_002.113 - Modification for SRegCfgTmr support */ - entry = (U32) (expire % (U32)(tqCp->tmrLen)); + entry = (uint32_t) (expire % (uint32_t)(tqCp->tmrLen)); tmp2 = &tq[entry].first; while ((tmp1 = *tmp2) != NULLP) @@ -160,35 +159,34 @@ PFV func; /* function */ else tmp2 = &tmp1->next; } - RETVOID; + return; } /* end of cmPrcTmr */ #else /* not defined SS_FAP */ #ifdef ANSI -PUBLIC Void cmPrcTmr +Void cmPrcTmr ( CmTqCp *tqCp, /* timing que control point */ CmTqType *tq, /* timing queue */ PFV func /* function */ ) #else -PUBLIC Void cmPrcTmr(tqCp, tq, func) +Void cmPrcTmr(tqCp, tq, func) CmTqCp *tqCp; /* connection control block */ CmTqType *tq; /* message buffer */ PFV func; /* function */ #endif { /**/ - U32 expire; - U32 entry, entry1; + uint32_t expire; + uint32_t entry, entry1; S16 event; CmTqType *tqEnt, *tqEnt1; PTR cb; CmTimer *tmp1; - VOLATILE U32 startTime = 0; + VOLATILE uint32_t startTime = 0; - TRC2(cmPrcTmr) /*starting Task*/ SStartTask(&startTime, PID_CM_PRC_TMR); @@ -214,7 +212,7 @@ PFV func; /* function */ ++tqCp->nxtEnt; expire = tqCp->nxtEnt; tqCp->tmrLen = 1; - entry = (U32) (expire % (U32)(tqCp->tmrLen)); + entry = (uint32_t) (expire % (uint32_t)(tqCp->tmrLen)); tqCp->tmp = (tqEnt = &tq[entry])->first; while ((tmp1 = tqCp->tmp) != NULLP) @@ -238,7 +236,7 @@ PFV func; /* function */ } else { - entry1 = (U32) (tmp1->tqExpire % (U32)(tqCp->tmrLen)); + entry1 = (uint32_t) (tmp1->tqExpire % (uint32_t)(tqCp->tmrLen)); tqEnt1 = &tq[entry1]; CM_RMV_TQCP(tqEnt, tmp1); tmp1->entIdx = entry1; @@ -249,7 +247,7 @@ PFV func; /* function */ /*stoping Task*/ SStopTask(startTime, PID_CM_PRC_TMR); - RETVOID; + return; } /* end of cmPrcTmr */ #endif /* SS_FAP */ @@ -261,7 +259,7 @@ PFV func; /* function */ * * Desc: initialize timers * -* Ret: RETVOID +* Ret: void * * Notes: Connection Oriented Control * @@ -269,21 +267,20 @@ PFV func; /* function */ * */ #ifdef ANSI -PUBLIC Void cmInitTimers +Void cmInitTimers ( CmTimer *timers, /* timer list */ -U8 max /* maximum tmrs */ +uint8_t max /* maximum tmrs */ ) #else -PUBLIC Void cmInitTimers(timers, max) +Void cmInitTimers(timers, max) CmTimer *timers; /* timer list */ -U8 max; /* maximum tmrs */ +uint8_t max; /* maximum tmrs */ #endif { CmTimer *tPtr; - REG1 U8 i; + REG1 uint8_t i; - TRC2(cmInitTimers) for (i = 0, tPtr = timers; i < max; i++, tPtr++) { @@ -294,7 +291,7 @@ U8 max; /* maximum tmrs */ tPtr->prev = (struct cmTimer *)NULLP; tPtr->ent2bUpd = FALSE; } - RETVOID; + return; } /* end of cmInitTimers */ /* @@ -303,7 +300,7 @@ U8 max; /* maximum tmrs */ * * Desc: Places Control Block on Timing Queue * -* Ret: RETVOID +* Ret: void * * Notes: None * @@ -312,28 +309,27 @@ U8 max; /* maximum tmrs */ */ #ifdef ANSI -PUBLIC Void cmPlcCbTq +Void cmPlcCbTq ( CmTmrArg *arg ) #else -PUBLIC Void cmPlcCbTq(arg) +Void cmPlcCbTq(arg) CmTmrArg *arg; #endif { /*added FAP modifications*/ #ifdef SS_FAP - REG1 U8 tmrNum; + REG1 uint8_t tmrNum; /* cm_bdy5_c_001.main_20 - Modification for SRegCfgTmr support */ - U32 ent; - U32 expire; + uint32_t ent; + uint32_t expire; CmTimer **tmp; - TRC2(cmPlcCbTq) expire = (arg->tqCp->nxtEnt + arg->wait); /* cm_bdy5_c_002.113 - Modification for SRegCfgTmr support */ - ent = (U32)(expire % (U32)(arg->tqCp->tmrLen)); + ent = (uint32_t)(expire % (uint32_t)(arg->tqCp->tmrLen)); for (tmrNum = 0; tmrNum < arg->max; tmrNum++) { @@ -349,20 +345,19 @@ CmTmrArg *arg; tmp = &((*tmp)->next); *tmp = &arg->timers[tmrNum]; - RETVOID; + return; } } - RETVOID; + return; #else - REG1 U8 tmrNum; - U32 ent; + REG1 uint8_t tmrNum; + uint32_t ent; CmTqType *tq; CmTimer *target; - U32 expire; - TRC2(cmPlcCbTq) + uint32_t expire; expire = (arg->tqCp->nxtEnt + arg->wait); - ent = (U32)(expire % (U32)(arg->tqCp->tmrLen)); + ent = (uint32_t)(expire % (uint32_t)(arg->tqCp->tmrLen)); for (tmrNum = 0; tmrNum < arg->max; tmrNum++) { @@ -380,10 +375,10 @@ CmTmrArg *arg; /* Place the timer block in the timer list */ CM_PLC_TQCP(tq, target); - RETVOID; + return; } } - RETVOID; + return; #endif } /* end of cmPlcCbTq */ @@ -393,7 +388,7 @@ CmTmrArg *arg; * * Desc: Places Control Block on Timing Queue * -* Ret: RETVOID +* Ret: void * * Notes: None * @@ -402,21 +397,20 @@ CmTmrArg *arg; */ #ifdef ANSI -PUBLIC Void cmRstCbTq +Void cmRstCbTq ( CmTmrArg *arg ) #else -PUBLIC Void cmRstCbTq(arg) +Void cmRstCbTq(arg) CmTmrArg *arg; #endif { - TRC2(cmRstCbTq) arg->timers[arg->tNum].tqExpire = arg->tqCp->nxtEnt + arg->wait; arg->timers[arg->tNum].ent2bUpd = TRUE; - RETVOID; + return; } /* end of cmRstCbTq */ /* @@ -425,7 +419,7 @@ CmTmrArg *arg; * * Desc: Removes control block from Timing Queue * -* Ret: RETVOID +* Ret: void * * Notes: None * @@ -434,30 +428,29 @@ CmTmrArg *arg; */ #ifdef ANSI -PUBLIC Void cmRmvCbTq +Void cmRmvCbTq ( CmTmrArg *arg ) #else -PUBLIC Void cmRmvCbTq(arg) +Void cmRmvCbTq(arg) CmTmrArg *arg; #endif { /*Added FAP modifications*/ #ifdef SS_FAP /* cm_bdy5_c_002.113 - Modification for SRegCfgTmr support */ - U32 ent; + uint32_t ent; CmTimer *target; CmTimer *tmp1; CmTimer **tmp2; - TRC2(cmRmvCbTq) target = &arg->timers[arg->tNum]; if (target->tmrEvnt != TMR_NONE) { /* cm_bdy5_c_002.113 - Modification for SRegCfgTmr support */ - ent = (U32) (target->tqExpire % (U32)(arg->tqCp->tmrLen)); + ent = (uint32_t) (target->tqExpire % (uint32_t)(arg->tqCp->tmrLen)); tmp2 = &arg->tq[ent].first; while ((tmp1 = *tmp2) != NULLP) @@ -477,19 +470,16 @@ CmTmrArg *arg; tmp2 = &tmp1->next; } } - RETVOID; + return; #else - U32 ent; + uint32_t ent; CmTimer *target; CmTqType *tq; - - TRC2(cmRmvCbTq) - target = &arg->timers[arg->tNum]; if (target->tmrEvnt != TMR_NONE) { - ent = (U32) (target->entIdx); + ent = (uint32_t) (target->entIdx); tq = &arg->tq[ent]; /* @@ -506,7 +496,7 @@ CmTmrArg *arg; target->cb = NULLP; } - RETVOID; + return; #endif } /* end of cmRmvCbTq */