X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_lmm.c;h=08eae8cbdcc983446493a60cc045917a9851c8e6;hb=528b3d3a09d7486a0c549820bac601db60fde18e;hp=615d6c605a124077aa8d5adf3e4f648ed626cf56;hpb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_lmm.c b/src/5gnrrlc/kw_lmm.c
index 615d6c605..08eae8cbd 100755
--- a/src/5gnrrlc/kw_lmm.c
+++ b/src/5gnrrlc/kw_lmm.c
@@ -79,23 +79,23 @@ RLCStats gRlcStats;
  *             Forward Declaration of LKW Porting Functions
  ********************************************************************/
 RlcCb *rlcCb[MAX_RLC_INSTANCES];
-EXTERN S16 rlcActvTmr ARGS ((Ent ent, Inst inst));
+S16 rlcActvTmr ARGS ((Ent ent, Inst inst));
 
-PRIVATE Void rlcLmmSendCfm ARGS ((RlcCb *gCb,Pst *pst,RlcMngmt *cfm,U8 type,
+static Void rlcLmmSendCfm ARGS ((RlcCb *gCb,Pst *pst,RlcMngmt *cfm,uint8_t type,
                                  Header *hdr));
-PRIVATE S16 rlcLmmGenCfg ARGS ((RlcCb *gCb, RlcGenCfg *cfg));
-PRIVATE S16 rlcLmmCfgKwuSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg));
-PRIVATE S16 rlcLmmCfgUdxSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg));
-PRIVATE S16 rlcLmmCfgCkwSap ARGS ((RlcCb *gCb,RlcSapCfg   *cfg));
-PRIVATE S16 rlcLmmCfgRguSap ARGS ((RlcCb *gCb,RlcSapCfg   *cfg));
-PRIVATE S16 rlcLmmGenCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
-PRIVATE S16 rlcLmmUdxSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
-PRIVATE S16 rlcLmmLSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
-PRIVATE S16 rlcLmmGetKwuSapSta ARGS ((RlcCb *gCb,RlcKwuSapSta *sta));
-PRIVATE S16 rlcLmmGetRguSapSta ARGS ((RlcCb *gCb,RlcRguSapSta *sta));
-PRIVATE S16 rlcLmmGetCkwCntSapSta ARGS ((RlcCb *gCb,RlcCkwCntSapSta *sta));
-PRIVATE S16 rlcLmmGetGenSts ARGS ((RlcCb *gCb,RlcGenSts *sts,Action action));
-PRIVATE S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action 
+static S16 rlcLmmGenCfg ARGS ((RlcCb *gCb, RlcGenCfg *cfg));
+static S16 rlcLmmCfgKwuSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg));
+static S16 rlcLmmCfgUdxSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg));
+static S16 rlcLmmCfgCkwSap ARGS ((RlcCb *gCb,RlcSapCfg   *cfg));
+static S16 rlcLmmCfgRguSap ARGS ((RlcCb *gCb,RlcSapCfg   *cfg));
+static S16 rlcLmmGenCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
+static S16 rlcLmmUdxSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
+static S16 rlcLmmLSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
+static S16 rlcLmmGetKwuSapSta ARGS ((RlcCb *gCb,RlcKwuSapSta *sta));
+static S16 rlcLmmGetRguSapSta ARGS ((RlcCb *gCb,RlcRguSapSta *sta));
+static S16 rlcLmmGetCkwCntSapSta ARGS ((RlcCb *gCb,RlcCkwCntSapSta *sta));
+static S16 rlcLmmGetGenSts ARGS ((RlcCb *gCb,RlcGenSts *sts,Action action));
+static S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action 
                                   action));
 
 
@@ -123,13 +123,13 @@ PRIVATE S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action
  *    LCM_REASON_HASHING_FAILED
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmGenCfg
+static S16 rlcLmmGenCfg
 (
 RlcCb       *gCb,
 RlcGenCfg   *cfg
 )
 #else
-PRIVATE S16 rlcLmmGenCfg(gCB,cfg)
+static S16 rlcLmmGenCfg(gCB,cfg)
 RlcCb       *gCb;
 RlcGenCfg   *cfg;
 #endif
@@ -260,7 +260,7 @@ RlcGenCfg   *cfg;
 #if 0
       /* Register the timer */
 /*Pradeep: changing the SRegTmrMt() to SRegTmr()*/
-      if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (U16)cfg->timeRes,
+      if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (uint16_t)cfg->timeRes,
               rlcActvTmr) != ROK)
       {
          RLC_FREE(gCb,gCb->u.dlCb->udxDlSap, rlcUdxSapSize);
@@ -362,7 +362,7 @@ RlcGenCfg   *cfg;
 
       /* Register the timer */
 #if 0
-      if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (U16)cfg->timeRes,
+      if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (uint16_t)cfg->timeRes,
               rlcActvTmr) != ROK)
       {
          RLC_FREE(gCb,gCb->u.ulCb->udxUlSap, rlcUdxSapSize);
@@ -423,21 +423,21 @@ RlcGenCfg   *cfg;
  *     -# ROK
  */
 #ifdef ANSI
-PRIVATE Void rlcLmmSendCfm
+static Void rlcLmmSendCfm
 (
 RlcCb      *gCb,
-Pst       *pst,                
+Pst        *pst,                
 RlcMngmt   *cfm,               
-U8        type,              
-Header    *hdr              
+uint8_t    type,              
+Header     *hdr              
 )
 #else
-PRIVATE Void rlcLmmSendCfm(gCb,pst, cfm, type, hdr)
+static Void rlcLmmSendCfm(gCb,pst, cfm, type, hdr)
 RlcCb      gCb;
-Pst       *pst;            
+Pst        *pst;            
 RlcMngmt   *cfm;           
-U8        type;          
-Header    *hdr;         
+uint8_t    type;          
+Header     *hdr;         
 #endif
 {
    Pst   rPst;   /* Reply post structure */
@@ -501,7 +501,7 @@ Header    *hdr;
          break;
    }
 
-   RETVOID; 
+   return; 
 } 
 
 
@@ -1082,8 +1082,8 @@ RlcL2MeasReqEvt *measReqEvt;
 #endif
 {
    S16            ret = ROK;
-   U16            cntr;
-   U8             measType;
+   uint16_t       cntr;
+   uint8_t        measType;
    RlcL2MeasCfmEvt measCfmEvt;
 
    RlcCb     *tRlcCb;
@@ -1200,19 +1200,19 @@ After receving this request, RLC stops L2 Measurement
 S16 RlcMiLkwL2MeasStopReq
 (
 Pst            *pst,
-U8             measType
+uint8_t             measType
 )
 #else
 S16 RlcMiLkwL2MeasStopReq (pst, measType)
 Pst            *pst;
-U8             measType;
+uint8_t             measType;
 #endif
 {
    S16 ret = ROK;
    RlcL2MeasEvtCb *measEvtCb = NULLP;
 
-   U16            cntr;
-   U8             status = ROK;
+   uint16_t            cntr;
+   uint8_t             status = ROK;
    RlcCb     *tRlcCb;
 
    tRlcCb =  RLC_GET_RLCCB(pst->dstInst);
@@ -1266,17 +1266,17 @@ After receving this request, RLC sends L2 Measurement
 S16 RlcMiLkwL2MeasSendReq
 (
 Pst            *pst,
-U8             measType
+uint8_t             measType
 )
 #else
 S16 RlcMiLkwL2MeasSendReq (pst, measType)
 Pst            *pst;
-U8             measType;
+uint8_t             measType;
 #endif
 {
    /*S16 ret = ROK;*/
    RlcL2MeasEvtCb *measEvtCb = NULLP;
-   U16            cntr;
+   uint16_t            cntr;
    RlcCb     *tRlcCb;
 
    tRlcCb =  RLC_GET_RLCCB(pst->dstInst);
@@ -1321,13 +1321,13 @@ U8             measType;
  *    -# LCM_REASON_RECONFIG_FAIL 
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmCfgKwuSap
+static S16 rlcLmmCfgKwuSap
 (
 RlcCb       *gCb,
 RlcSapCfg   *cfg                
 )
 #else
-PRIVATE S16 rlcLmmCfgKwuSap(gCb,cfg)
+static S16 rlcLmmCfgKwuSap(gCb,cfg)
 RlcCb       *gCb;
 RlcSapCfg   *cfg;               
 #endif
@@ -1377,13 +1377,13 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_RECONFIG_FAIL 
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmCfgCkwSap 
+static S16 rlcLmmCfgCkwSap 
 (
 RlcCb       *gCb,
 RlcSapCfg   *cfg             
 )
 #else
-PRIVATE S16 rlcLmmCfgCkwSap(gCb,cfg)
+static S16 rlcLmmCfgCkwSap(gCb,cfg)
 RlcCb       *gCb;
 RlcSapCfg   *cfg;             
 #endif
@@ -1435,13 +1435,13 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_RECONFIG_FAIL
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmCfgUdxSap 
+static S16 rlcLmmCfgUdxSap 
 (
 RlcCb       *gCb,
 RlcSapCfg   *cfg         
 )
 #else
-PRIVATE S16 rlcLmmCfgUdxSap(gCb,cfg)
+static S16 rlcLmmCfgUdxSap(gCb,cfg)
 RlcCb       *gCb;
 RlcSapCfg   *cfg;       
 #endif
@@ -1509,13 +1509,13 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_RECONFIG_FAIL
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmCfgRguSap 
+static S16 rlcLmmCfgRguSap 
 (
 RlcCb       *gCb,
 RlcSapCfg   *cfg               
 )
 #else
-PRIVATE S16 rlcLmmCfgRguSap(gCb,cfg)
+static S16 rlcLmmCfgRguSap(gCb,cfg)
 RlcCb       *gCb;
 RlcSapCfg   *cfg;             
 #endif
@@ -1570,17 +1570,17 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_INVALID_ACTION
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmValidateGenCntrl
+static S16 rlcLmmValidateGenCntrl
 (
 RlcMngmt   *cntrl                 
 )
 #else
-PRIVATE S16 rlcLmmValidateGenCntrl(cntrl)
+static S16 rlcLmmValidateGenCntrl(cntrl)
 RlcMngmt   *cntrl;                
 #endif
 {
-   S16   reason;    /* reason for failure */
-   U8    sAction;   /* subaction field */
+   S16     reason;    /* reason for failure */
+   uint8_t sAction;   /* subaction field */
 
    reason = LCM_REASON_NOT_APPL;
    sAction = cntrl->t.cntrl.subAction;
@@ -1615,12 +1615,12 @@ RlcMngmt   *cntrl;
  * @return  Void
  */
 #ifdef ANSI
-PRIVATE Void rlcLmmCleanGblRsrcs
+static Void rlcLmmCleanGblRsrcs
 (
 RlcCb   *gCb
 )
 #else
-PRIVATE Void rlcLmmCleanGblRsrcs(gCb)
+static Void rlcLmmCleanGblRsrcs(gCb)
 RlcCb   *gCb;
 #endif
 {
@@ -1703,7 +1703,7 @@ RlcCb   *gCb;
       gCb->init.usta = FALSE;
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -1722,17 +1722,17 @@ RlcCb   *gCb;
  *    -# LCM_REASON_HASHING_FAILED 
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmShutdown
+static S16 rlcLmmShutdown
 (
 RlcCb   *gCb
 )
 #else
-PRIVATE S16 rlcLmmShutdown(gCb)
+static S16 rlcLmmShutdown(gCb)
 RlcCb   *gCb;
 #endif
 {
    RlcRguSapCb   *rguSap;
-   U32          idx;
+   uint32_t          idx;
 
    if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL)
    {
@@ -1786,13 +1786,13 @@ RlcCb   *gCb;
  *    -# LCM_REASON_INVALID_ACTION
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmGenCntrl
+static S16 rlcLmmGenCntrl
 (
 RlcCb *gCb,
 RlcMngmt *cntrl       
 )
 #else
-PRIVATE S16 rlcLmmGenCntrl(gCb,cntrl)
+static S16 rlcLmmGenCntrl(gCb,cntrl)
 RlcCb    *gCb;
 RlcMngmt *cntrl;     
 #endif
@@ -1891,13 +1891,13 @@ RlcMngmt *cntrl;
  *    -# LCM_REASON_INVALID_ACTION 
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmUdxSapCntrl
+static S16 rlcLmmUdxSapCntrl
 (
 RlcCb      *gCb,
 RlcMngmt   *cntrl               
 )
 #else
-PRIVATE S16 rlcLmmUdxSapCntrl(gCb,cntrl)
+static S16 rlcLmmUdxSapCntrl(gCb,cntrl)
 RlcCb      *gCb;
 RlcMngmt   *cntrl;               
 #endif
@@ -1972,13 +1972,13 @@ RlcMngmt   *cntrl;
  *    -# LCM_REASON_INVALID_ACTION 
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmLSapCntrl
+static S16 rlcLmmLSapCntrl
 (
 RlcCb      *gCb,
 RlcMngmt   *cntrl 
 )
 #else
-PRIVATE S16 rlcLmmLSapCntrl(gCb,cntrl)
+static S16 rlcLmmLSapCntrl(gCb,cntrl)
 RlcCb      *gCb;
 RlcMngmt   *cntrl; 
 #endif
@@ -2055,13 +2055,13 @@ RlcMngmt   *cntrl;
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE)
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmGetKwuSapSta 
+static S16 rlcLmmGetKwuSapSta 
 (
 RlcCb          *gCb,
 RlcKwuSapSta   *sta         
 )
 #else
-PRIVATE S16 rlcLmmGetKwuSapSta(gCb,sta)
+static S16 rlcLmmGetKwuSapSta(gCb,sta)
 RlcCb          *gCb;
 RlcKwuSapSta   *sta;         
 #endif
@@ -2098,13 +2098,13 @@ RlcKwuSapSta   *sta;
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE) 
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmGetRguSapSta 
+static S16 rlcLmmGetRguSapSta 
 (
 RlcCb          *gCb,
 RlcRguSapSta   *sta         
 )
 #else
-PRIVATE S16 rlcLmmGetRguSapSta(gCb,sta)
+static S16 rlcLmmGetRguSapSta(gCb,sta)
 RlcCb          *gCb;
 RlcRguSapSta   *sta;       
 #endif
@@ -2136,13 +2136,13 @@ RlcRguSapSta   *sta;
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE)
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmGetCkwCntSapSta
+static S16 rlcLmmGetCkwCntSapSta
 (
 RlcCb             *gCb,
 RlcCkwCntSapSta   *sta     
 )
 #else
-PRIVATE S16 rlcLmmGetCkwCntSapSta(gCb,sta)
+static S16 rlcLmmGetCkwCntSapSta(gCb,sta)
 rlcCb             *gCb,
 RlcCkwCntSapSta   *sta;   
 #endif
@@ -2175,14 +2175,14 @@ RlcCkwCntSapSta   *sta;
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE)
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmGetGenSts
+static S16 rlcLmmGetGenSts
 (
 RlcCb       *gCb,
 RlcGenSts   *sts,       
 Action     action         
 )
 #else
-PRIVATE S16 rlcLmmGetGenSts(gCb,sts, action)
+static S16 rlcLmmGetGenSts(gCb,sts, action)
 RlcCb       *gCb;
 RlcGenSts   *sts;          
 Action     action;         
@@ -2221,7 +2221,7 @@ Action     action;
  *    -# LCM_REASON_INVALID_PAR_VAL (FAIL)
  */
 #ifdef ANSI
-PRIVATE S16 rlcLmmGetSapSts
+static S16 rlcLmmGetSapSts
 (
 RlcCb      *gCb,
 RlcMngmt   *sts,               
@@ -2229,7 +2229,7 @@ Elmnt     elmnt,
 Action    action             
 )
 #else
-PRIVATE S16 rlcLmmGetSapSts(sts, elmnt, action)
+static S16 rlcLmmGetSapSts(sts, elmnt, action)
 RlcCb      *gCb;
 RlcMngmt   *sts;            
 Elmnt     elmnt;            
@@ -2310,43 +2310,43 @@ Action    action;
 #ifdef ANSI
 Void rlcLmmSendAlarm
 (
-RlcCb   *gCb,
-U16    category,  
-U16    event,    
-U16    cause,   
-SuId   suId,   
-U32    ueId,  
-U8     qci   
+RlcCb      *gCb,
+uint16_t    category,  
+uint16_t    event,    
+uint16_t    cause,   
+SuId        suId,   
+uint32_t    ueId,  
+uint8_t     qci   
 )
 #else
 Void rlcLmmSendAlarm(category, event, cause, suId, ueId, qci)
 RlcCb   *gCb;
-U16    category; 
-U16    event;   
-U16    cause;  
-SuId   suId;  
-U32    ueId; 
-U8     qci;    
+uint16_t    category; 
+uint16_t    event;   
+uint16_t    cause;  
+SuId        suId;  
+uint32_t    ueId; 
+uint8_t     qci;    
 #endif
 #else /* LTE_L2_MEAS */
 #ifdef ANSI
 Void rlcLmmSendAlarm
 (
-RlcCb   *gCb,
-U16    category, 
-U16    event,   
-U16    cause,  
-SuId   suId,  
-U32    ueId  
+RlcCb       *gCb,
+uint16_t    category, 
+uint16_t    event,   
+uint16_t    cause,  
+SuId        suId,  
+uint32_t    ueId  
 )
 #else
 Void rlcLmmSendAlarm(category, event, cause, suId, ueId)
-RlcCb   *gCb;
-U16    category; 
-U16    event;   
-U16    cause;  
-SuId   suId;  
-U32    ueId; 
+RlcCb       *gCb;
+uint16_t    category; 
+uint16_t    event;   
+uint16_t    cause;  
+SuId        suId;  
+uint32_t    ueId; 
 #endif
 #endif /* LTE_L2_MEAS */
 {
@@ -2354,7 +2354,7 @@ U32    ueId;
 
    if(gCb->init.usta == FALSE)
    {
-      RETVOID;
+      return;
    }
 
    usta.hdr.elmId.elmnt = STGEN;
@@ -2381,7 +2381,7 @@ U32    ueId;
 
    RlcMiLkwStaInd(&(gCb->init.lmPst), &usta);
 
-   RETVOID;
+   return;
 
 }