U8, U16, U32 data type changes

[o-du/l2.git] / src / 5gnrsch / rg_sch_ram.c

diff --git a/src/5gnrsch/rg_sch_ram.c b/src/5gnrsch/rg_sch_ram.c
index a92fdc3..703b4e8 100755 (executable)
--- a/src/5gnrsch/rg_sch_ram.c
+++ b/src/5gnrsch/rg_sch_ram.c
@@ -132,18 +132,17 @@ EXTERN Void rgSCHChkEmtcContResTmrExp ARGS((RgSchCellCb        *cell));
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamVldtUeCfg 
+S16 rgSCHRamVldtUeCfg 
 (
 RgSchCellCb  *cell,
 RgrUeCfg     *ueCfg
 )
 #else
-PUBLIC S16 rgSCHRamVldtUeCfg(cell, ueCfg)
+S16 rgSCHRamVldtUeCfg(cell, ueCfg)
 RgSchCellCb  *cell;
 RgrUeCfg     *ueCfg;
 #endif
 {
-   TRC2(rgSCHRamVldtUeCfg);
    if (ueCfg->dedPreambleId.pres == PRSNT_NODEF)
    {
       if ((ueCfg->dedPreambleId.val < cell->rachCfg.numRaPreamble) ||
@@ -185,9 +184,9 @@ RgrUeCfg     *ueCfg;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamProcRaReq
+S16 rgSCHRamProcRaReq
 (
-U8                raReqCnt,
+uint8_t                raReqCnt,
 RgSchCellCb       *cell,
 CmLteRnti         raRnti,
 TfuRachInfo       *raReqInd,
@@ -196,8 +195,8 @@ RgSchUeCb         *ue,
 RgSchErrInfo      *err
 )
 #else
-PUBLIC S16 rgSCHRamProcRaReq(raReqCnt, cell, raRnti, raReqInd, timingInfo, ue, err)
-U8                raReqCnt;
+S16 rgSCHRamProcRaReq(raReqCnt, cell, raRnti, raReqInd, timingInfo, ue, err)
+uint8_t                raReqCnt;
 RgSchCellCb       *cell;
 CmLteRnti         raRnti;
 TfuRachInfo       *raReqInd;
@@ -207,13 +206,12 @@ RgSchErrInfo      *err;
 #endif
 {
    RgSchRaReqInfo *raReqInfo;
-   U16            raIndex;
+   uint16_t            raIndex;
 #ifdef LTE_TDD
-   U8             fid;
-   U8             tid;
+   uint8_t             fid;
+   uint8_t             tid;
 #endif
 
-   TRC2(rgSCHRamProcRaReq)
 
 
       /* SR_RACH_STATS : RACH REQ */
@@ -322,14 +320,14 @@ RgSchErrInfo      *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamCreateRaCb
+S16 rgSCHRamCreateRaCb
 (
 RgSchCellCb       *cell,
 RgSchRaCb         **raCb,
 RgSchErrInfo      *err
 )
 #else
-PUBLIC S16 rgSCHRamCreateRaCb(cell, raCb, err)
+S16 rgSCHRamCreateRaCb(cell, raCb, err)
 RgSchCellCb       *cell;
 RgSchRaCb         **raCb;
 RgSchErrInfo      *err;
@@ -338,7 +336,6 @@ RgSchErrInfo      *err;
    RgSchRntiLnk *rntiLnk;
    Inst         inst = cell->instIdx;
 
-   TRC2(rgSCHRamCreateRaCb)
 
    if((rgSCHUtlAllocSBuf(inst, (Data **)(raCb),
                       sizeof(RgSchRaCb))) == RFAILED)
@@ -425,7 +422,7 @@ RgSchErrInfo      *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamRgrUeCfg
+S16 rgSCHRamRgrUeCfg
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
@@ -433,7 +430,7 @@ RgSchRaCb      *raCb,
 RgSchErrInfo   *err
 )
 #else
-PUBLIC S16 rgSCHRamRgrUeCfg(cell, ue, raCb, err)
+S16 rgSCHRamRgrUeCfg(cell, ue, raCb, err)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 RgSchRaCb      *raCb;
@@ -442,10 +439,9 @@ RgSchErrInfo   *err;
 {
    /* Releasing HARQ processes of old UE when ue
     *           reconfig with new crnti */
-  /* U32 cnt; */
+  /* uint32_t cnt; */
    RgSchDlHqEnt          **hqEnt = &(RG_SCH_CMN_GET_UE_HQE(ue, cell));
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
-   TRC2(rgSCHRamRgrUeCfg)
 
 
    /* Fix : set UE inactive in DL until UE is reinitialization completed */
@@ -517,7 +513,6 @@ RgSchErrInfo *err;
 {
    TfuUlCqiRpt   ulCqiRpt;
    RgSchCmnCell  *cellSch= (RgSchCmnCell *)(cell->sc.sch);
-   TRC2(rgSCHRamContResCrnti)
 
 
    /* Fix: syed It is incorrect to copy over msg3HqProc to ueCb's 
@@ -582,7 +577,6 @@ RgSchRaCb *raCb;
    CmLteTimingInfo expTime = {0}; 
    RgSchCmnCell  *cellSch  = RG_SCH_CMN_GET_CELL(cell);
 #endif
-   TRC2(rgSCHRamContResCcchsdu)
    if(raCb->raState != RGSCH_RA_MSG3_PENDING)
    {
       RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId,
@@ -633,7 +627,7 @@ RgSchRaCb *raCb;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamProcMsg3
+S16 rgSCHRamProcMsg3
 (
 RgSchCellCb     *cell,
 RgSchUeCb       *ue,
@@ -642,7 +636,7 @@ RgInfUeDatInd   *pdu,
 RgSchErrInfo    *err
 )
 #else
-PUBLIC S16 rgSCHRamProcMsg3(cell, ue, raCb, pdu, err)
+S16 rgSCHRamProcMsg3(cell, ue, raCb, pdu, err)
 RgSchCellCb     *cell;
 RgSchUeCb       *ue;
 RgSchRaCb       *raCb;
@@ -650,7 +644,6 @@ RgInfUeDatInd   *pdu;
 RgSchErrInfo    *err;
 #endif
 {
-   TRC2(rgSCHRamProcMsg3)
 
 
    /* Update raCb with PHR if received along with Msg3 */ 
@@ -699,23 +692,22 @@ RgSchErrInfo    *err;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamUpdtBo
+S16 rgSCHRamUpdtBo
 (
 RgSchCellCb       *cell,
 RgSchRaCb         *raCb,
 RgInfCmnBoRpt     *staRsp
 )
 #else
-PUBLIC S16 rgSCHRamUpdtBo(cell, raCb, staRsp)
+S16 rgSCHRamUpdtBo(cell, raCb, staRsp)
 RgSchCellCb       *cell;
 RgSchRaCb         *raCb;
 RgInfCmnBoRpt     *staRsp;
 #endif
 {
-   TRC2(rgSCHRamUpdtBo)
 
    /* Update Bo in RaCb */
-   raCb->dlCcchInfo.bo = (U32)(staRsp->bo);
+   raCb->dlCcchInfo.bo = (uint32_t)(staRsp->bo);
    /* SR_RACH_STATS : MSG4 WITH CCCH SDU */
    rgNumMsg4WithCCCHSdu++;
 
@@ -743,16 +735,15 @@ RgInfCmnBoRpt     *staRsp;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamMsg3DatInd
+S16 rgSCHRamMsg3DatInd
 (
 RgSchRaCb      *raCb
 )
 #else
-PUBLIC S16 rgSCHRamMsg3DatInd(raCb)
+S16 rgSCHRamMsg3DatInd(raCb)
 RgSchRaCb      *raCb;
 #endif
 {
-   TRC2(rgSCHRamMsg3DatInd)
 
    /* SR_RACH_STATS : MSG3 ACK*/
    rgNumMsg3CrcPassed++;
@@ -778,16 +769,15 @@ RgSchRaCb      *raCb;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamMsg3FailureInd
+S16 rgSCHRamMsg3FailureInd
 (
 RgSchRaCb      *raCb
 )
 #else
-PUBLIC S16 rgSCHRamMsg3FailureInd(raCb)
+S16 rgSCHRamMsg3FailureInd(raCb)
 RgSchRaCb      *raCb;
 #endif
 {
-   TRC2(rgSCHRamMsg3FailureInd)
 
    /*ccpu00128820 - MOD - Msg3 alloc double delete issue*/
    rgSCHUhmProcMsg3Failure(&(raCb->msg3HqProc));
@@ -811,16 +801,15 @@ RgSchRaCb      *raCb;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamMsg4FdbkInd
+S16 rgSCHRamMsg4FdbkInd
 (
 RgSchRaCb      *raCb
 )
 #else
-PUBLIC S16 rgSCHRamMsg4FdbkInd(raCb)
+S16 rgSCHRamMsg4FdbkInd(raCb)
 RgSchRaCb      *raCb;
 #endif
 {
-   TRC2(rgSCHRamMsg4FdbkInd)
 
    return ROK;
 }  /* rgSCHRamMsg4FdbkInd */
@@ -844,18 +833,17 @@ RgSchRaCb      *raCb;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamMsg4Done
+S16 rgSCHRamMsg4Done
 (
 RgSchCellCb    *cell,
 RgSchRaCb      *raCb
 )
 #else
-PUBLIC S16 rgSCHRamMsg4Done(cell, raCb)
+S16 rgSCHRamMsg4Done(cell, raCb)
 RgSchCellCb    *cell;
 RgSchRaCb      *raCb;
 #endif
 {
-   TRC2(rgSCHRamMsg4Done)
 
    RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,
             "rgSCHRamMsg4Done(): tmpCRNTI = %u",
@@ -938,14 +926,14 @@ RgSchRaCb      *raCb;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamDelRaCb
+S16 rgSCHRamDelRaCb
 (
 RgSchCellCb *cell,
 RgSchRaCb   *raCb,
 Bool        rlsRnti
 )
 #else
-PUBLIC S16 rgSCHRamDelRaCb(cell, raCb, rlsRnti)
+S16 rgSCHRamDelRaCb(cell, raCb, rlsRnti)
 RgSchCellCb *cell;
 RgSchRaCb   *raCb;
 Bool        rlsRnti;
@@ -953,7 +941,6 @@ Bool        rlsRnti;
 {
    Inst         inst = cell->instIdx;
    Bool         isEmtc = FALSE;
-   TRC2(rgSCHRamDelRaCb)
  
     /* Delete from all the lists it is enqueued */
     cmLListDelFrm(&(cell->raInfo.raCbLst),&(raCb->raCbLnk));
@@ -1066,32 +1053,31 @@ Bool        rlsRnti;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamTtiHndlr
+S16 rgSCHRamTtiHndlr
 (
 RgSchCellCb  *cell
 )
 #else
-PUBLIC S16 rgSCHRamTtiHndlr(cell)
+S16 rgSCHRamTtiHndlr(cell)
 RgSchCellCb  *cell;
 #endif
 {
    RgSchRaCb   *raCb;
-   U16         raSfn;
-   U16         crntSfn;
-   U16         dist;       /* Number of frames between raCb's creation and crnt
+   uint16_t         raSfn;
+   uint16_t         crntSfn;
+   uint16_t         dist;       /* Number of frames between raCb's creation and crnt
                               frame */
-   U8          idx;
-   U32         maxCnt;
+   uint8_t          idx;
+   uint32_t         maxCnt;
 #ifndef LTE_TDD
-   U8          winGap;        
-   U8          raIdx;
+   uint8_t          winGap;        
+   uint8_t          raIdx;
    RgSchRaReqInfo *raReqInfo;
 #else
    CmLteTimingInfo      frm;
-   U8                   raIdx;
+   uint8_t                   raIdx;
 #endif
 
-   TRC2(rgSCHRamTtiHndlr)
 
    crntSfn = cell->crntTime.sfn;
   
@@ -1196,28 +1182,27 @@ RgSchCellCb  *cell;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamFreeCell
+S16 rgSCHRamFreeCell
 (
 RgSchCellCb    *cell
 )
 #else
-PUBLIC S16 rgSCHRamFreeCell(cell)
+S16 rgSCHRamFreeCell(cell)
 RgSchCellCb    *cell;
 #endif
 {
    RgSchRaReqInfo  *raReqInfo;
    RgSchRaCb       *raCb;
-   U8              idx;
-   U8              raCbCnt;
+   uint8_t              idx;
+   uint8_t              raCbCnt;
    Inst            inst = cell->instIdx;
-   U8              lstSz;
+   uint8_t              lstSz;
 #ifdef LTE_TDD
-   U8              maxUlSubframes;
-   U8              maxDlSubframes;
+   uint8_t              maxUlSubframes;
+   uint8_t              maxDlSubframes;
 #endif
 
 
-   TRC2(rgSCHRamFreeCell)
 
 
 #ifdef LTE_TDD
@@ -1297,7 +1282,6 @@ RgSchCellCb *cell;
 RgSchRaCb  *raCb;
 #endif
 {
-   TRC2(rgSCHRamProcContResExp);
    raCb->expiryTime.sfn = RGSCH_CONTRES_EXP;
    /*MSG4 Fix*/
    if (raCb->ue)
@@ -1312,7 +1296,7 @@ RgSchRaCb  *raCb;
       /* Delete RACB and release RNTI */
       rgSCHRamDelRaCb(cell, raCb, TRUE);
    }
-   RETVOID;
+   return;
 }
 
 #ifdef ANSI
@@ -1327,7 +1311,6 @@ RgSchCellCb  *cell;
 RgSchRaCb  *raCb;
 #endif
 {
-   TRC2(rgSCHRamProcContResGrdExp)
 
 
 /*Guard timer has expired, schedule only the contention REsolution CE with 
@@ -1348,7 +1331,7 @@ RgSchRaCb  *raCb;
             raCb->rntiLnk->rnti);   
    rgSCHRamAddToRaInfoSchdLst(cell, raCb);
    /* MSG4 Fix End */    
-   RETVOID;
+   return;
    
 }
 /**
@@ -1378,7 +1361,6 @@ RgSchCellCb        *cell;
    CmLList         *chkLnk    = NULLP;
    RgSchRaCb       *raCb = NULLP;
    
-   TRC2(rgSCHChkContResTmrExp)
       
    chkLnk = cmLListFirst(&(cell->contResTmrLst));
    
@@ -1425,7 +1407,6 @@ RgSchCellCb        *cell;
    CmLList         *chkLnk    = NULLP;
    RgSchRaCb       *raCb = NULLP;
    
-   TRC2(rgSCHChkContResGrdTmrExp)
       
    chkLnk = cmLListFirst(&(cell->contResGrdTmrLst));
    
@@ -1460,36 +1441,35 @@ RgSchCellCb        *cell;
  *
  *  @param[in,out] RgSchCellCb      *cell
  *  @param[in]     CmLteTimingInfo  timingInfo
- *  @param[in]     U8               raIdx
+ *  @param[in]     uint8_t               raIdx
  *  @return  S16
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHRamDelRaReq
+S16 rgSCHRamDelRaReq
 (
 RgSchCellCb          *cell,
 CmLteTimingInfo      timingInfo,
-U8                   raIdx
+uint8_t                   raIdx
 )
 #else
-PUBLIC S16 rgSCHRamDelRaReq(cell, timingInfo, raIdx)
+S16 rgSCHRamDelRaReq(cell, timingInfo, raIdx)
 RgSchCellCb          *cell;
 CmLteTimingInfo      timingInfo;
-U8                   raIdx;
+uint8_t                   raIdx;
 #endif
 {
-   U8                   subfrmIdx;
+   uint8_t                   subfrmIdx;
    RgSchTddRachRspLst   *rachRsp;
-   U16                   sfnIdx;
+   uint16_t                   sfnIdx;
    S16                  calcSfn;
-   U8                   subfrm;
+   uint8_t                   subfrm;
    RgSchRaReqInfo       *raReqInfo;
-   U8                   idx;
-   U8                   i;
-   U8                   raRntiIdx;
+   uint8_t                   idx;
+   uint8_t                   i;
+   uint8_t                   raRntiIdx;
    CmLteRnti            raRnti;
 
-   TRC2(rgSCHRamDelRaReq)
 
 
    rachRsp = &cell->rachRspLst[raIdx];
@@ -1540,13 +1520,13 @@ U8                   raIdx;
 
 /*MSG4 Fix Start */
 #ifdef ANSI
-PUBLIC S16 rgSCHRamAddToRaInfoSchdLst
+S16 rgSCHRamAddToRaInfoSchdLst
 (
 RgSchCellCb       *cell,
 RgSchRaCb         *raCb
 )
 #else
-PUBLIC S16 rgSCHRamAddToRaInfoSchdLst(cell, raCb)
+S16 rgSCHRamAddToRaInfoSchdLst(cell, raCb)
 RgSchCellCb       *cell;
 RgSchRaCb         *raCb;
 #endif
@@ -1554,7 +1534,6 @@ RgSchRaCb         *raCb;
    CmLteTimingInfo expTime ={0};
    RgSchCmnCell    *cellSch =  RG_SCH_CMN_GET_CELL(cell);
 
-   TRC2(rgSCHRamAddToRaInfoSchdLst)
 
    /*Fix: This can be called even when guard timer is not expired. 
        * In this case CR timer expiry should be guard timer expiry time + Guard timer time*/
@@ -1570,18 +1549,17 @@ RgSchRaCb         *raCb;
 
 
 #ifdef ANSI
-PUBLIC S16 rgSCHRamRmvFrmRaInfoSchdLst
+S16 rgSCHRamRmvFrmRaInfoSchdLst
 (
 RgSchCellCb       *cell,
 RgSchRaCb         *raCb
 )
 #else
-PUBLIC S16 rgSCHRamRmvFrmRaInfoSchdLst(cell, raCb)
+S16 rgSCHRamRmvFrmRaInfoSchdLst(cell, raCb)
 RgSchCellCb       *cell;
 RgSchRaCb         *raCb;
 #endif
 {
-   TRC2(rgSCHRamRmvFrmRaInfoSchdLst)
 
    cmLListDelFrm(&(cell->raInfo.toBeSchdLst), &(raCb->schdLnk));
    raCb->schdLnk.node = NULLP;   
@@ -1623,14 +1601,13 @@ RgSchCellCb     *cell;
 Bool            isEmtc;
 #endif
 {
-   TRC2(rgSCHRamUlFreeAllocation);
 
    rgSCHUhmFreeProc(alloc->hqProc, cell);
    if(!isEmtc)
    {
       rgSCHUtlUlAllocRls(sf, alloc);
    }
-   RETVOID;
+   return;
 }
 
 /**********************************************************************