Merge "Documentation fixes"

[o-du/l2.git] / src / 5gnrmac / rg_com.c

diff --git a/src/5gnrmac/rg_com.c b/src/5gnrmac/rg_com.c
index 170f69e..4c8686b 100755 (executable)
--- a/src/5gnrmac/rg_com.c
+++ b/src/5gnrmac/rg_com.c
@@ -61,11 +61,11 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_pom_scell.x"
 #endif
 /* local defines */
-PRIVATE S16 rgCOMHndlCfgReq ARGS((Inst inst,CrgCfg  *cfg, RgErrInfo *errInfo,Bool *isCfmRqrd,CrgCfgTransId transId));
-PRIVATE S16 rgCOMHndlRecfgReq ARGS((Inst inst,CrgRecfg *recfg, RgErrInfo *errInfo, \
+static S16 rgCOMHndlCfgReq ARGS((Inst inst,CrgCfg  *cfg, RgErrInfo *errInfo,Bool *isCfmRqrd,CrgCfgTransId transId));
+static S16 rgCOMHndlRecfgReq ARGS((Inst inst,CrgRecfg *recfg, RgErrInfo *errInfo, \
          CrgCfgTransId transId,Bool *isCfmRqrd));
-PRIVATE S16 rgCOMHndlDelReq ARGS((Inst inst,CrgDel *del, RgErrInfo *errInfo, Bool *isCfmRqrd, CrgCfgTransId transId));
-PRIVATE S16 rgCOMHndlResetReq ARGS((Inst inst,CrgRst *reset,RgErrInfo *errInfo));
+static S16 rgCOMHndlDelReq ARGS((Inst inst,CrgDel *del, RgErrInfo *errInfo, Bool *isCfmRqrd, CrgCfgTransId transId));
+static S16 rgCOMHndlResetReq ARGS((Inst inst,CrgRst *reset,RgErrInfo *errInfo));
 /* local typedefs */
  
 /* local externs */
@@ -98,26 +98,24 @@ PRIVATE S16 rgCOMHndlResetReq ARGS((Inst inst,CrgRst *reset,RgErrInfo *errInfo))
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgCOMCfgReq
+S16 rgCOMCfgReq
 (
 Inst          inst,
 CrgCfgTransId transId,
 CrgCfgReqInfo *crgCfgReq
 )
 #else
-PUBLIC S16 rgCOMCfgReq(inst,transId, crgCfgReq)
+S16 rgCOMCfgReq(inst,transId, crgCfgReq)
 Inst          inst;
 CrgCfgTransId transId;
 CrgCfgReqInfo *crgCfgReq;
 #endif
 {
    S16             ret;
-   U8              cfmStatus = CRG_CFG_CFM_OK;
+   uint8_t         cfmStatus = CRG_CFG_CFM_OK;
    RgErrInfo       errInfo;
    Bool            isCfmRqrd = TRUE;
 
-   TRC2(rgCOMCfgReq);
-
    /* Process Config/Reconfig/Delete request from RRC */
    switch (crgCfgReq->action)
    {
@@ -198,7 +196,7 @@ if(TRUE == isCfmRqrd)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgCOMHndlCfgReq
+static S16 rgCOMHndlCfgReq
 (
 Inst             inst,
 CrgCfg           *cfg,
@@ -207,7 +205,7 @@ Bool             *isCfmRqrd,
 CrgCfgTransId    transId
 )
 #else
-PRIVATE S16 rgCOMHndlCfgReq(inst,cfg, errInfo,isCfmRqrd,transId)
+static S16 rgCOMHndlCfgReq(inst,cfg, errInfo,isCfmRqrd,transId)
 Inst            inst;
 CrgCfg          *cfg;
 RgErrInfo       *errInfo;
@@ -219,8 +217,6 @@ CrgCfgTransId   transId;
    RgCellCb  *cell = NULLP;
    RgUeCb    *ue   = NULLP;
 
-   TRC2(rgCOMHndlCfgReq);
-
    errInfo->errType = RGERR_COM_CFG_REQ;
 
    /* Validate and process the configuration request */ 
@@ -301,7 +297,7 @@ CrgCfgTransId   transId;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgCOMHndlRecfgReq
+static S16 rgCOMHndlRecfgReq
 (
 Inst             inst,
 CrgRecfg         *recfg,
@@ -310,7 +306,7 @@ CrgCfgTransId    transId,
 Bool             *isCfmRqrd
 )
 #else
-PRIVATE S16 rgCOMHndlRecfgReq(inst,recfg, errInfo, transId, isCfmRqrd)
+static S16 rgCOMHndlRecfgReq(inst,recfg, errInfo, transId, isCfmRqrd)
 Inst            inst;
 CrgRecfg        *recfg;
 RgErrInfo       *errInfo;
@@ -323,8 +319,6 @@ Bool            *isCfmRqrd;
    RgUeCb    *ue   = NULLP;
    RgUlLcCb  *ulLc = NULLP;
 
-   TRC2(rgCOMHndlRecfgReq);
-
    errInfo->errType = RGERR_COM_RECFG_REQ;
    
    /* Validate and process the re-configuration request */ 
@@ -398,7 +392,7 @@ Bool            *isCfmRqrd;
 
 #ifdef LTE_ADV
          /*ERAB- multicell fix*/
-         cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId,
+         memcpy( &(ue->cfgCfmInfo.transId), &transId,
                sizeof(CrgCfgTransId));
 #endif
          ret = rgCFGCrgLcRecfg(inst,cell, ue, ulLc,
@@ -440,21 +434,19 @@ Bool            *isCfmRqrd;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgCOMHndlResetReq
+static S16 rgCOMHndlResetReq
 (
 Inst       inst,
 CrgRst     *reset,
 RgErrInfo  *errInfo
 )
 #else
-PRIVATE S16 rgCOMHndlResetReq(inst,reset, errInfo)
+static S16 rgCOMHndlResetReq(inst,reset, errInfo)
 Inst       inst;
 CrgRst     *reset;
 RgErrInfo  *errInfo;
 #endif
 {
-   TRC2(rgCOMHndlResetReq);
-
    /* Fix : ccpu00126865: ignore CRG reset. Let SCH trigger it. */
    
    errInfo->errCause = RGERR_NONE;
@@ -486,7 +478,7 @@ RgErrInfo  *errInfo;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgCOMHndlDelReq
+static S16 rgCOMHndlDelReq
 (
 Inst        inst,
 CrgDel      *del,
@@ -495,7 +487,7 @@ Bool        *isCfmRqrd,
 CrgCfgTransId transId
 )
 #else
-PRIVATE S16 rgCOMHndlDelReq(inst,del, errInfo,isCfmRqrd,transId)
+static S16 rgCOMHndlDelReq(inst,del, errInfo,isCfmRqrd,transId)
 Inst        inst;
 CrgDel      *del;
 RgErrInfo   *errInfo;
@@ -504,11 +496,9 @@ CrgCfgTransId transId;
 #endif
 {
 
-   S16            ret;
-   VOLATILE U32   startTime=0;
+   S16      ret;
+   volatile uint32_t   startTime=0;
 
-   TRC2(rgCOMHndlDelReq);
-   
    errInfo->errType = RGERR_COM_DEL_REQ;
    
    /* Process the delete request */ 
@@ -571,13 +561,13 @@ CrgCfgTransId transId;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellCfgReq
+S16 RgPrgPMacSMacUeSCellCfgReq
 (
 Pst         *pst,    
 RgPrgUeSCellCfgInfo *ueSCellCb
 )
 #else
-PUBLIC S16 RgPrgPMacSMacUeSCellCfgReq(pst, ueSCellCb)
+S16 RgPrgPMacSMacUeSCellCfgReq(pst, ueSCellCb)
 Pst         *pst;    
 RgPrgUeSCellCfgInfo *ueSCellCb;
 #endif
@@ -588,7 +578,6 @@ RgPrgUeSCellCfgInfo *ueSCellCb;
    S16              ret;
    Pst              cfmPst;    
 
-   TRC2(RgPrgPMacSMacUeSCellCfgReq);
    
    RGDBGPRM(inst,(rgPBuf(inst),
             "APPLYING CRG UE SCELL CONFIG: cellId %d ueId %d\n",
@@ -653,13 +642,13 @@ RgPrgUeSCellCfgInfo *ueSCellCb;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgPrgSMacPMacCfgCfm
+S16 RgPrgSMacPMacCfgCfm
 (
 Pst             *pst,    
 RgPrgCfgCfmInfo *cfgCfm
 )
 #else
-PUBLIC S16 RgPrgSMacPMacCfgCfm(pst, cfgCfm)
+S16 RgPrgSMacPMacCfgCfm(pst, cfgCfm)
 Pst             *pst;    
 RgPrgCfgCfmInfo *cfgCfm;
 #endif
@@ -667,8 +656,6 @@ RgPrgCfgCfmInfo *cfgCfm;
    Inst      inst = pst->dstInst;
    RgCellCb *cell;
    RgUeCb   *ue;
-   TRC2(RgPrgSMacPMacCfgCfm);
-
 
    RG_IS_INST_VALID(inst);
 
@@ -753,13 +740,13 @@ RgPrgCfgCfmInfo *cfgCfm;
  *  @return  ROK is SUCCESS 
  **/
 #ifdef ANSI
-PUBLIC S16 RgPrgPMacSMacUeSCellDelReq
+S16 RgPrgPMacSMacUeSCellDelReq
 (
 Pst                 *pst,
 RgPrgUeSCellDelInfo *ueSCellDelInfo
 )
 #else
-PUBLIC S16 RgPrgPMacSMacUeSCellDelReq(pst, ueSCellDelInfo)
+S16 RgPrgPMacSMacUeSCellDelReq(pst, ueSCellDelInfo)
 Pst                 *pst;
 RgPrgUeSCellDelInfo *ueSCellDelInfo;
 #endif
@@ -768,8 +755,6 @@ RgPrgUeSCellDelInfo *ueSCellDelInfo;
    RgCellCb    *sCell   = rgCb[inst].cell;
    RgUeCb      *sCellUe = NULLP;
 
-   TRC2(RgPrgPMacSMacUeSCellDelReq)
-
    /* Checking for cell Cb because in case of shutdownReq it is possible that
     * cell is already deleted for this cell*/
    if(sCell == NULLP)