Merge "Part -7 Classification of log [JIRA-ID ODUHIGH-275]"

[o-du/l2.git] / src / 5gnrrlc / kw_tmr.c

diff --git a/src/5gnrrlc/kw_tmr.c b/src/5gnrrlc/kw_tmr.c
index 1d1db7b..c0f2df3 100755 (executable)
--- a/src/5gnrrlc/kw_tmr.c
+++ b/src/5gnrrlc/kw_tmr.c
@@ -32,10 +32,6 @@
         File:    kw_tmr.c
   
 *********************************************************************21*/
-static const char* RLOG_MODULE_NAME="TMR";
-static int RLOG_MODULE_ID=2048;
-static int RLOG_FILE_ID=202;
-
 
 /* header (.h) include files */
 #include "common_def.h"
@@ -90,7 +86,7 @@ static int RLOG_FILE_ID=202;
 }
 
 /* private function declarations */
-PRIVATE Void rlcBndTmrExpiry(PTR cb);
+static Void rlcBndTmrExpiry(PTR cb);
 
 /**
  * @brief Handler to start timer
@@ -102,19 +98,7 @@ PRIVATE Void rlcBndTmrExpiry(PTR cb);
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcStartTmr
-(
-RlcCb  *gCb,
-PTR   cb,          
-S16   tmrEvnt     
-)
-#else
-Void rlcStartTmr (gCb,cb, tmrEvnt)
-RlcCb  *gCb;
-PTR   cb;        
-S16   tmrEvnt;  
-#endif
+void rlcStartTmr(RlcCb *gCb, PTR cb, int16_t tmrEvnt)
 {
 /* kw005.201 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
@@ -124,22 +108,20 @@ S16   tmrEvnt;
    CmTmrArg arg;
    arg.wait = 0;
 
-   TRC2(rlcStartTmr)
-
    /* kw002.201 Adjusting the wait time as per timeRes configured by layer manager */
    switch (tmrEvnt)
    {
-      case RLC_EVT_UMUL_REORD_TMR:
+      case EVENT_RLC_UMUL_REASSEMBLE_TMR:
       {
          RlcUmUl* umUl = &(((RlcUlRbCb *)cb)->m.umUl);
          /* kw005.201 Changed wait calculation ccpu00117634*/ 
-         RLC_TMR_CALCUATE_WAIT(arg.wait, umUl->reOrdTmrInt, gCb->genCfg.timeRes);
+         RLC_TMR_CALCUATE_WAIT(arg.wait, umUl->reAsmblTmrInt, gCb->genCfg.timeRes);
 
-         arg.timers = &umUl->reOrdTmr;
+         arg.timers = &umUl->reAsmblTmr;
          arg.max = RLC_MAX_UM_TMR;
          break;
       }
-      case RLC_EVT_AMUL_REORD_TMR:
+      case EVENT_RLC_AMUL_REORD_TMR:
       {
          RlcAmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl);
          /* kw005.201 Changed wait calculation ccpu00117634*/ 
@@ -149,7 +131,7 @@ S16   tmrEvnt;
          arg.max = RLC_MAX_AM_TMR;
          break;
       }
-      case RLC_EVT_AMUL_STA_PROH_TMR:
+      case EVENT_RLC_AMUL_STA_PROH_TMR:
       {
          RlcAmUl* amUl = &(((RlcUlRbCb *)cb)->m.amUl);
          /* kw005.201 Changed wait calculation ccpu00117634*/ 
@@ -161,7 +143,7 @@ S16   tmrEvnt;
          arg.max = RLC_MAX_AM_TMR;
          break;
       } 
-      case RLC_EVT_AMDL_POLL_RETX_TMR:
+      case EVENT_RLC_AMDL_POLL_RETX_TMR:
       {
          RlcAmDl* amDl = &(((RlcDlRbCb *)cb)->m.amDl);
          /* kw005.201 Changed wait calculation ccpu00117634*/ 
@@ -173,7 +155,7 @@ S16   tmrEvnt;
          arg.max = RLC_MAX_AM_TMR;
          break;
       } 
-      case RLC_EVT_WAIT_BNDCFM:
+      case EVENT_RLC_WAIT_BNDCFM:
       {
          RlcRguSapCb* rguSap = (RlcRguSapCb *)cb;
          /* kw005.201 Changed wait calculation ccpu00117634*/ 
@@ -185,7 +167,7 @@ S16   tmrEvnt;
       }
 /* kw005.201 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
-      case RLC_EVT_L2_TMR:
+      case EVENT_RLC_L2_TMR:
       {
          measEvtCb = (RlcL2MeasEvtCb *)cb;
          /* kw005.201 Changed wait calculation ccpu00117634*/ 
@@ -200,7 +182,7 @@ S16   tmrEvnt;
 #endif
       default:
       {
-         RLOG0(L_ERROR, "Invalid tmr Evnt");
+         DU_LOG("\nERROR  -->  RLC : rlcStartTmr: Invalid tmr Evnt [%d]", tmrEvnt);
       }
    } 
 
@@ -215,7 +197,7 @@ S16   tmrEvnt;
       cmPlcCbTq(&arg);
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -228,56 +210,43 @@ S16   tmrEvnt;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcStopTmr
-(
-RlcCb   *gCb,
-PTR    cb,
-U8     tmrType
-)
-#else
-Void rlcStopTmr (gCb, cb, tmrType)
-RlcCb   *gCb;
-PTR    cb; 
-U8     tmrType;
-#endif
+void rlcStopTmr(RlcCb *gCb, PTR cb, uint8_t tmrType)
 {
    CmTmrArg   arg;
 /* kw005.201 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
    RlcL2MeasEvtCb *measEvtCb = NULLP;
 #endif
-   TRC2(rlcStopTmr)
 
    arg.timers = NULLP;
 
    switch (tmrType)
    {
-      case RLC_EVT_UMUL_REORD_TMR:
+      case EVENT_RLC_UMUL_REASSEMBLE_TMR:
       {
-         arg.timers  = &((RlcUlRbCb *)cb)->m.umUl.reOrdTmr;
+         arg.timers  = &((RlcUlRbCb *)cb)->m.umUl.reAsmblTmr;
          arg.max = RLC_MAX_UM_TMR;
          break;
       }
-      case RLC_EVT_AMUL_REORD_TMR:
+      case EVENT_RLC_AMUL_REORD_TMR:
       {
          arg.timers = &((RlcUlRbCb *)cb)->m.amUl.reOrdTmr;
          arg.max = RLC_MAX_AM_TMR;
          break;
       }
-      case RLC_EVT_AMUL_STA_PROH_TMR:
+      case EVENT_RLC_AMUL_STA_PROH_TMR:
       {
          arg.timers = &((RlcUlRbCb *)cb)->m.amUl.staProhTmr;
          arg.max = RLC_MAX_AM_TMR;
          break;
       } 
-      case RLC_EVT_AMDL_POLL_RETX_TMR:
+      case EVENT_RLC_AMDL_POLL_RETX_TMR:
       {
          arg.timers = &((RlcDlRbCb *)cb)->m.amDl.pollRetxTmr;
          arg.max = RLC_MAX_AM_TMR;
          break;
       } 
-      case RLC_EVT_WAIT_BNDCFM:
+      case EVENT_RLC_WAIT_BNDCFM:
       {
          arg.timers = &((RlcRguSapCb *)cb)->bndTmr;
          arg.max = RLC_MAX_RGUSAP_TMR;
@@ -285,7 +254,7 @@ U8     tmrType;
       }
 /* kw005.201 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
-      case RLC_EVT_L2_TMR:
+      case EVENT_RLC_L2_TMR:
       {
          measEvtCb = (RlcL2MeasEvtCb *)cb;
          arg.timers   = &measEvtCb->l2Tmr;
@@ -295,7 +264,7 @@ U8     tmrType;
 #endif
       default:
       {
-         RLOG0(L_ERROR, "Invalid tmr Evnt");
+         DU_LOG("\nERROR  -->  RLC : rlcStopTmr: Invalid tmr Evnt[%d]", tmrType);
       }
    } 
    if (tmrType != TMR0)
@@ -309,7 +278,7 @@ U8     tmrType;
       cmRmvCbTq(&arg);
    }
    
-   RETVOID;
+   return;
 }
 
 /**
@@ -325,44 +294,33 @@ U8     tmrType;
  *
  * @return  Void
 */
-#ifdef ANSI
-Void rlcTmrExpiry
-(
-PTR   cb,
-S16   tmrEvnt 
-)
-#else
-Void rlcTmrExpiry (cb, tmrEvnt)
-PTR   cb;
-S16   tmrEvnt;
-#endif
+Void rlcTmrExpiry(PTR cb,S16 tmrEvnt)
 {
 /* kw005.201 added support for L2 Measurement */
-   TRC2(rlcTmrExpiry)
 
    switch (tmrEvnt)
    {
-      case RLC_EVT_UMUL_REORD_TMR:
+      case EVENT_RLC_UMUL_REASSEMBLE_TMR:
       {
          RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
-         rlcUmmReOrdTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
+         rlcUmmReAsmblTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
 
          break;
       }
-      case RLC_EVT_AMUL_REORD_TMR:
+      case EVENT_RLC_AMUL_REORD_TMR:
       {
          RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
          rlcAmmReOrdTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
          break;
       }
-      case RLC_EVT_AMUL_STA_PROH_TMR:
+      case EVENT_RLC_AMUL_STA_PROH_TMR:
       {
          RlcUlRbCb *ulRbCb = (RlcUlRbCb *)cb;
          rlcAmmStaProTmrExp(RLC_GET_RLCCB(ulRbCb->inst), ulRbCb);
 
          break;
       }
-      case RLC_EVT_AMDL_POLL_RETX_TMR:
+      case EVENT_RLC_AMDL_POLL_RETX_TMR:
       {
          RlcDlRbCb *dlRbCb = (RlcDlRbCb *)cb;
          RlcCb *gCb = RLC_GET_RLCCB(dlRbCb->inst);
@@ -372,7 +330,7 @@ S16   tmrEvnt;
          gCb->genSts.protTimeOut++;
          break;
       }
-      case RLC_EVT_WAIT_BNDCFM:
+      case EVENT_RLC_WAIT_BNDCFM:
       {
          rlcBndTmrExpiry(cb);
          break;
@@ -384,7 +342,7 @@ S16   tmrEvnt;
       }
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -399,55 +357,41 @@ S16   tmrEvnt;
  *      -# ROK 
  *      -# RFAILED 
 */
-#ifdef ANSI
-Bool rlcChkTmr
-(
-RlcCb   *gCb,
-PTR    cb,
-S16    tmrEvnt
-)
-#else
-Bool rlcChkTmr(gCb,cb, tmrEvnt)
-RlcCb   *gCb;
-PTR    cb;
-S16    tmrEvnt;
-#endif
+bool rlcChkTmr(RlcCb *gCb, PTR cb, int16_t tmrEvnt)
 {
-   TRC2(rlcChkTmr)
-
    switch (tmrEvnt)
    {
-      case RLC_EVT_UMUL_REORD_TMR:
+      case EVENT_RLC_UMUL_REASSEMBLE_TMR:
       {
-         return (((RlcUlRbCb *)cb)->m.umUl.reOrdTmr.tmrEvnt == 
-                  RLC_EVT_UMUL_REORD_TMR);
+         return (((RlcUlRbCb *)cb)->m.umUl.reAsmblTmr.tmrEvnt == 
+                  EVENT_RLC_UMUL_REASSEMBLE_TMR);
       }
-      case RLC_EVT_AMUL_REORD_TMR:
+      case EVENT_RLC_AMUL_REORD_TMR:
       {
          return (((RlcUlRbCb *)cb)->m.amUl.reOrdTmr.tmrEvnt == 
-                  RLC_EVT_AMUL_REORD_TMR);
+                  EVENT_RLC_AMUL_REORD_TMR);
       }
-      case RLC_EVT_AMUL_STA_PROH_TMR:
+      case EVENT_RLC_AMUL_STA_PROH_TMR:
       {
          return (((RlcUlRbCb *)cb)->m.amUl.staProhTmr.tmrEvnt == 
-                  RLC_EVT_AMUL_STA_PROH_TMR);
+                  EVENT_RLC_AMUL_STA_PROH_TMR);
       } 
-      case RLC_EVT_AMDL_POLL_RETX_TMR:
+      case EVENT_RLC_AMDL_POLL_RETX_TMR:
       {
          return (((RlcDlRbCb *)cb)->m.amDl.pollRetxTmr.tmrEvnt == 
-                  RLC_EVT_AMDL_POLL_RETX_TMR);
+                  EVENT_RLC_AMDL_POLL_RETX_TMR);
       } 
-      case RLC_EVT_WAIT_BNDCFM:
+      case EVENT_RLC_WAIT_BNDCFM:
       {
-         return (((RlcRguSapCb *)cb)->bndTmr.tmrEvnt == RLC_EVT_WAIT_BNDCFM);
+         return (((RlcRguSapCb *)cb)->bndTmr.tmrEvnt == EVENT_RLC_WAIT_BNDCFM);
       }
       default:
       {
-         RLOG0(L_ERROR, "Invalid tmr Evnt");
+         DU_LOG("\nERROR  -->  RLC : rlcChkTmr: Invalid tmr Evnt [%d]", tmrEvnt);
       }
    } 
 
-   return (FALSE);
+   return FALSE;
 }
 
 /**
@@ -462,20 +406,10 @@ S16    tmrEvnt;
  *
  * @return  Void
 */
-#ifdef ANSI
-PRIVATE Void rlcBndTmrExpiry
-(
-PTR cb
-)
-#else
-PRIVATE Void rlcBndTmrExpiry(cb)
-PTR cb;
-#endif
+static Void rlcBndTmrExpiry(PTR cb)
 {
    RlcRguSapCb *rguSapCb; 
 
-   TRC2(rlcBndTmrExpiry)
-
    rguSapCb = (RlcRguSapCb *) cb;
 
    if (rguSapCb->state == RLC_SAP_BINDING)
@@ -485,7 +419,7 @@ PTR cb;
          /* start timer to wait for bind confirm */
          rlcStartTmr(RLC_GET_RLCCB(rguSapCb->pst.srcInst),
                     (PTR)rguSapCb, 
-                    RLC_EVT_WAIT_BNDCFM);
+                    EVENT_RLC_WAIT_BNDCFM);
          
          /* Send bind request */
          rguSapCb->retryCnt++;
@@ -516,7 +450,7 @@ PTR cb;
       }
    }
 
-   RETVOID;
+   return;
 }