X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_rom.c;h=81bbc4a640cb5631e8bc0db514ef373fac443276;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=06760d2064ce97b59e0358cd8d64ff71ccba0d21;hpb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c
index 06760d206..81bbc4a64 100755
--- a/src/5gnrmac/rg_rom.c
+++ b/src/5gnrmac/rg_rom.c
@@ -66,18 +66,18 @@ static int RLOG_MODULE_ID=4096;
 /* local typedefs */
  
 S16 RgMacSchBrdcmDedBoUpdtReq ARGS((Inst inst, CmLteCellId cellId, CmLteRnti rnti, CmLteLcId lcId, S32 bo ));
-PRIVATE S16 rgROMHndlCcchDatReq     ARGS((RgCellCb *cell,
+static S16 rgROMHndlCcchDatReq     ARGS((RgCellCb *cell,
                                     RgRguCmnDatReq *datReq, RgErrInfo *err));
-PRIVATE S16 rgROMHndlBcchPcchDatReq ARGS((RgCellCb *cell,
+static S16 rgROMHndlBcchPcchDatReq ARGS((RgCellCb *cell,
                                     RgRguCmnDatReq *datReq, RgErrInfo *err));
-PRIVATE S16 rgROMHndlCcchStaRsp     ARGS((RgCellCb *cell, 
+static S16 rgROMHndlCcchStaRsp     ARGS((RgCellCb *cell, 
                                     RgRguCmnStaRsp *staRsp, RgErrInfo *err));
-PRIVATE S16 rgROMHndlBcchPcchStaRsp ARGS((RgCellCb *cell, 
+static S16 rgROMHndlBcchPcchStaRsp ARGS((RgCellCb *cell, 
                                     RgRguCmnStaRsp *staRsp, RgErrInfo *err));
 
 /* ADD Changes for Downlink UE Timing Optimization */
 #ifdef LTEMAC_DLUE_TMGOPTMZ
-PRIVATE S16 rgROMUpdDlSfRemDataCnt ARGS((RgCellCb  *cellCb,
+static S16 rgROMUpdDlSfRemDataCnt ARGS((RgCellCb  *cellCb,
                                     RgDlSf    *dlSf));
 S16 rgTOMUtlProcDlSf ARGS(( RgDlSf     *dlSf,
                                    RgCellCb   *cellCb,
@@ -119,9 +119,9 @@ RgRguDedDatReq *datReq;
 #if 0
    RgCellCb     *cell;
    RgUeCb       *ue;
-   U8           idx1,idx2;
+   uint8_t           idx1,idx2;
    RgDlHqProcCb *hqProc;
-   U8           hqPId;
+   uint8_t           hqPId;
    RgErrInfo    err;
    Pst          schPst;
    RgInfDedBoRpt boRpt;
@@ -134,8 +134,8 @@ RgRguDedDatReq *datReq;
 #ifdef LTEMAC_DLUE_TMGOPTMZ
    S16 ret;
 #endif
-   U32 idx;
-   //U8  datReqFailCnt = 0;
+   uint32_t idx;
+   //uint8_t  datReqFailCnt = 0;
 
 
    if (((cell = rgCb[inst].cell) == NULLP) 
@@ -160,8 +160,8 @@ RgRguDedDatReq *datReq;
    for(idx = 0; idx < datReq->nmbOfUeGrantPerTti; idx++)
    {
 
-      timingInfo.slot = (U8)((datReq->datReq[idx].transId >> 8) & 0XFF);
-      timingInfo.sfn = (U16)((datReq->datReq[idx].transId >> 16) & 0xFFFF);
+      timingInfo.slot = (uint8_t)((datReq->datReq[idx].transId >> 8) & 0XFF);
+      timingInfo.sfn = (uint16_t)((datReq->datReq[idx].transId >> 16) & 0xFFFF);
       sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
 
       if( (sf->txDone == TRUE) ||
@@ -180,7 +180,7 @@ RgRguDedDatReq *datReq;
          rgUpdtRguDedSts(inst,cell->rguDlSap,RG_RGU_SDU_DROP, datReq);
 #ifdef CA_DBG
          {
-            EXTERN U32 dbgDelayedDatReqInMac;
+            uint32_t dbgDelayedDatReqInMac;
             dbgDelayedDatReqInMac++;
          }
 #endif /* CA_DBG */         
@@ -221,7 +221,7 @@ RgRguDedDatReq *datReq;
             continue;
       }
 
-      hqPId = (U8)(datReq->datReq[idx].transId);
+      hqPId = (uint8_t)(datReq->datReq[idx].transId);
       hqPId = hqPId >> 2;
       /* get harq process and invoke DHM */
       rgDHMGetHqProcFrmId(ue, hqPId, &hqProc);
@@ -375,8 +375,8 @@ RgRguCmnDatReq *datReq;
       /*Get the timing Info*/
       /* ADD Changes for Downlink UE Timing Optimization */
 #ifdef LTEMAC_DLUE_TMGOPTMZ
-      timingInfo.slot = (U8)((datReq->transId >> 8) & 0XFF);
-      timingInfo.sfn = (U16)((datReq->transId >> 16) & 0xFFFF);
+      timingInfo.slot = (uint8_t)((datReq->transId >> 8) & 0XFF);
+      timingInfo.sfn = (uint16_t)((datReq->transId >> 16) & 0xFFFF);
 #endif
    } 
    else
@@ -386,8 +386,8 @@ RgRguCmnDatReq *datReq;
       /*Get the timing Info*/
       /* ADD Changes for Downlink UE Timing Optimization */
 #ifdef LTEMAC_DLUE_TMGOPTMZ
-      timingInfo.slot = (U8)(datReq->transId & 0XFF);
-      timingInfo.sfn = (U16)((datReq->transId >> 8) & 0xFFFF);
+      timingInfo.slot = (uint8_t)(datReq->transId & 0XFF);
+      timingInfo.sfn = (uint16_t)((datReq->transId >> 8) & 0xFFFF);
 #endif
    }
 
@@ -433,14 +433,14 @@ RgRguCmnDatReq *datReq;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgROMHndlCcchDatReq
+static S16 rgROMHndlCcchDatReq
 (
 RgCellCb       *cell,
 RgRguCmnDatReq *datReq,
 RgErrInfo      *err
 )
 #else
-PRIVATE S16 rgROMHndlCcchDatReq(cell, datReq, err)
+static S16 rgROMHndlCcchDatReq(cell, datReq, err)
 RgCellCb       *cell;
 RgRguCmnDatReq *datReq;
 RgErrInfo      *err;
@@ -448,7 +448,7 @@ RgErrInfo      *err;
 {
    Inst     inst = cell->macInst - RG_INST_START;
    RgUeCb   *ue;
-   U8       hqPId;
+   uint8_t   hqPId;
    RgDlHqProcCb *hqProc;
    CmLteTimingInfo timingInfo;
    RgDlSf   *sf;
@@ -472,8 +472,8 @@ RgErrInfo      *err;
       }
    }
 
-   timingInfo.slot = (U8)((datReq->transId >> 8) & 0XFF);
-   timingInfo.sfn = (U16)((datReq->transId >> 16) & 0xFFFF);
+   timingInfo.slot = (uint8_t)((datReq->transId >> 8) & 0XFF);
+   timingInfo.sfn = (uint16_t)((datReq->transId >> 16) & 0xFFFF);
    sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
 
    if( (sf->txDone == TRUE) ||
@@ -490,7 +490,7 @@ RgErrInfo      *err;
       return RFAILED;
    }
 
-   hqPId = (U8)(datReq->transId);
+   hqPId = (uint8_t)(datReq->transId);
    hqPId = hqPId >> 2;
 
    /* get harq process and invoke DHM */
@@ -531,14 +531,14 @@ RgErrInfo      *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgROMHndlBcchPcchDatReq
+static S16 rgROMHndlBcchPcchDatReq
 (
 RgCellCb       *cell,
 RgRguCmnDatReq *datReq,
 RgErrInfo      *err
 )
 #else
-PRIVATE S16 rgROMHndlBcchPcchDatReq(cell, datReq, err)
+static S16 rgROMHndlBcchPcchDatReq(cell, datReq, err)
 RgCellCb       *cell;
 RgRguCmnDatReq *datReq;
 RgErrInfo      *err;
@@ -557,8 +557,9 @@ RgErrInfo      *err;
    RgUstaDgn   dgn;      /* Alarm diagnostics structure */
 #endif
 
-   timingInfo.slot = (U8)(datReq->transId & 0XFF);
-   timingInfo.sfn = (U16)((datReq->transId >> 8) & 0xFFFF);
+
+   timingInfo.slot = (uint8_t)(datReq->transId & 0XFF);
+   timingInfo.sfn = (uint16_t)((datReq->transId >> 8) & 0xFFFF);
    sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
 
    if( (sf->txDone == TRUE) ||
@@ -796,8 +797,8 @@ RgRguL2MUlThrpMeasReq *measReq;
 {
    RgCellCb   *cell;
    RgUeCb     *ue;
-   U8         lcgId;
-   U8         loop;
+   uint8_t    lcgId;
+   uint8_t    loop;
 
    if(((cell = rgCb[inst].cell) != NULLP)
       &&(cell->cellId == measReq->cellId))
@@ -846,14 +847,14 @@ RgRguL2MUlThrpMeasReq *measReq;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgROMHndlCcchStaRsp
+static S16 rgROMHndlCcchStaRsp
 (
 RgCellCb       *cell,
 RgRguCmnStaRsp *staRsp,
 RgErrInfo      *err
 )
 #else
-PRIVATE S16 rgROMHndlCcchStaRsp(cell, staRsp, err)
+static S16 rgROMHndlCcchStaRsp(cell, staRsp, err)
 RgCellCb       *cell;
 RgRguCmnStaRsp *staRsp;
 RgErrInfo      *err;
@@ -897,14 +898,14 @@ RgErrInfo      *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgROMHndlBcchPcchStaRsp
+static S16 rgROMHndlBcchPcchStaRsp
 (
 RgCellCb       *cell,
 RgRguCmnStaRsp *staRsp,
 RgErrInfo      *err
 )
 #else
-PRIVATE S16 rgROMHndlBcchPcchStaRsp(cell, staRsp, err)
+static S16 rgROMHndlBcchPcchStaRsp(cell, staRsp, err)
 RgCellCb       *cell;
 RgRguCmnStaRsp *staRsp;
 RgErrInfo      *err;
@@ -927,7 +928,7 @@ RgErrInfo      *err;
          This assumes that BO is not received more than 4 frames in advance from the enodeb application */
    if (cell->bcchBchInfo.lcId == staRsp->lcId)
    {
-      U16 nextBchSfn;
+      uint16_t nextBchSfn;
 
       nextBchSfn = (cell->crntTime.sfn + 4 - (cell->crntTime.sfn%4)) % RG_MAX_SFN;
       if ((staRsp->u.timeToTx.sfn != nextBchSfn) ||
@@ -977,13 +978,13 @@ RgErrInfo      *err;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PRIVATE S16 rgROMUpdDlSfRemDataCnt
+static S16 rgROMUpdDlSfRemDataCnt
 (
 RgCellCb       *cellCb,
 RgDlSf         *dlSf
 )
 #else
-PRIVATE S16 rgROMUpdDlSfRemDataCnt(cellCb, dlSf)
+static S16 rgROMUpdDlSfRemDataCnt(cellCb, dlSf)
 RgCellCb       *cellCb;
 RgDlSf         *dlSf;
 #endif