X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_uhm.c;h=e357e8f793a3fbc52f3b2adf8bb7c931184ab069;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=91141d9cc79260e4d37ab31cf422a8e5b2a3d9e6;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_uhm.c b/src/5gnrsch/rg_sch_uhm.c
index 91141d9cc..e357e8f79 100755
--- a/src/5gnrsch/rg_sch_uhm.c
+++ b/src/5gnrsch/rg_sch_uhm.c
@@ -68,18 +68,18 @@
    EXTERN U32 gUlCrcPassCounter;
    EXTERN U32 gUlCrcFailCounter;*/
 #endif
-PUBLIC U8 rgRvIdxTable[] = {0, 3, 1, 2}; /* This gives rvIdx for a given rv */
-PUBLIC U8 rgRvTable[] = {0, 2, 3 ,1};    /* This gives rv for a given rvIdx */
+U8 rgRvIdxTable[] = {0, 3, 1, 2}; /* This gives rvIdx for a given rv */
+U8 rgRvTable[] = {0, 2, 3 ,1};    /* This gives rv for a given rvIdx */
 
 #ifdef EMTC_ENABLE
-PUBLIC Void rgSCHCmnEmtcHdlHarqProcFail
+Void rgSCHCmnEmtcHdlHarqProcFail
 (
 RgSchCellCb       *cell,
 RgSchUeCb         *ue,
 RgSchUlHqProcCb   *hqProc,
 CmLteTimingInfo   frm
 );
-PUBLIC Void rgSCHEmtcInitUlUeHqEnt
+Void rgSCHEmtcInitUlUeHqEnt
 (
 RgSchCellCb      *cell,
 RgrUeCfg         *ueCfg,
@@ -107,21 +107,21 @@ RgSchUeCb        *ueCb
  **/
 #ifndef MAC_SCH_STATS
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcDatInd
+Void rgSCHUhmProcDatInd
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
 CmLteTimingInfo      frm
 )
 #else
-PUBLIC Void rgSCHUhmProcDatInd(cell, ue, frm)
+Void rgSCHUhmProcDatInd(cell, ue, frm)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
 #endif
 #else  /* MAC_SCH_STATS */
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcDatInd
+Void rgSCHUhmProcDatInd
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
@@ -129,7 +129,7 @@ CmLteTimingInfo      frm,
 U8                   cqi
 )
 #else
-PUBLIC Void rgSCHUhmProcDatInd(cell, ue, frm, cqi)
+Void rgSCHUhmProcDatInd(cell, ue, frm, cqi)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
@@ -145,8 +145,6 @@ U8                   cqi;
                                                  [ueUl->maxUlCqi];
 #endif
 
-   TRC2(rgSCHUhmProcDatInd);
-
    rgSCHUtlUlHqProcForUe(cell, frm, ue, &hqProc);
    if (hqProc == NULLP)
    {
@@ -206,16 +204,15 @@ U8                   cqi;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcMsg3DatInd
+Void rgSCHUhmProcMsg3DatInd
 (
 RgSchUlHqProcCb *hqProc
 )
 #else
-PUBLIC Void rgSCHUhmProcMsg3DatInd(hqProc)
+Void rgSCHUhmProcMsg3DatInd(hqProc)
 RgSchUlHqProcCb *hqProc;
 #endif
 {
-   TRC2(rgSCHUhmProcMsg3DatInd);
    hqProc->rcvdCrcInd = TRUE;
    hqProc->remTx = 0;        /*Reseting the value of rem Tx*/
    printf("\nrgSCHUhmProcMsg3DatInd,id:%u\n",hqProc->procId);
@@ -238,16 +235,15 @@ RgSchUlHqProcCb *hqProc;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcMsg3Failure
+Void rgSCHUhmProcMsg3Failure
 (
 RgSchUlHqProcCb *hqProc
 )
 #else
-PUBLIC Void rgSCHUhmProcMsg3Failure(hqProc)
+Void rgSCHUhmProcMsg3Failure(hqProc)
 RgSchUlHqProcCb *hqProc;
 #endif
 {
-   TRC2(rgSCHUhmProcMsg3Failure);
 #ifdef EMTC_ENABLE
    RG_SCH_EMTC_IS_CRCIND_RCVD_CHK_RACB(hqProc);
 #endif  
@@ -281,7 +277,7 @@ RgSchUlHqProcCb *hqProc;
  **/
 #ifndef MAC_SCH_STATS
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcHqFailure
+Void rgSCHUhmProcHqFailure
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
@@ -289,7 +285,7 @@ CmLteTimingInfo      frm,
 TknU8                rv
 )
 #else
-PUBLIC Void rgSCHUhmProcHqFailure(cell, ue, frm, rv)
+Void rgSCHUhmProcHqFailure(cell, ue, frm, rv)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
@@ -297,7 +293,7 @@ TknU8                rv;
 #endif
 #else /* MAC_SCH_STATS */
 #ifdef ANSI
-PUBLIC Void rgSCHUhmProcHqFailure
+Void rgSCHUhmProcHqFailure
 (
 RgSchCellCb          *cell,
 RgSchUeCb            *ue,
@@ -306,7 +302,7 @@ TknU8                rv,
 U8                   cqi
 )
 #else
-PUBLIC Void rgSCHUhmProcHqFailure(cell, ue, frm, rv, cqi)
+Void rgSCHUhmProcHqFailure(cell, ue, frm, rv, cqi)
 RgSchCellCb          *cell;
 RgSchUeCb            *ue;
 CmLteTimingInfo      frm;
@@ -320,7 +316,6 @@ U8                   cqi;
    RgSchCmnUlUe   *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
    S32               iTbs;
 #endif
-   TRC2(rgSCHUhmProcHqFailure);
 
    rgSCHUtlUlHqProcForUe(cell, frm, ue, &hqProc);
    if (hqProc == NULLP)
@@ -387,21 +382,20 @@ U8                   cqi;
  *      -# NULL
  **/
 #ifdef ANSI
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlHqProc
+RgSchUlHqProcCb* rgSCHUhmGetUlHqProc
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue, 
 U8               idx
 )
 #else
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(cell, ue, idx)
+RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(cell, ue, idx)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue; 
 U8               idx;
 #endif
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
-   TRC2(rgSCHUhmGetUlHqProc);
 
 #if (ERRCLASS & ERRCLS_DEBUG)
    if(idx >= ueUl->hqEnt.numHqPrcs)
@@ -430,20 +424,19 @@ U8               idx;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmNewTx
+Void rgSCHUhmNewTx
 (
 RgSchUlHqProcCb *hqProc,
 U8              maxHqRetx,
 RgSchUlAlloc    *alloc
 )
 #else
-PUBLIC Void rgSCHUhmNewTx(hqProc, maxHqRetx, alloc)
+Void rgSCHUhmNewTx(hqProc, maxHqRetx, alloc)
 RgSchUlHqProcCb *hqProc;
 U8              maxHqRetx;
 RgSchUlAlloc    *alloc;
 #endif
 {
-   TRC2(rgSCHUhmNewTx);
 
    hqProc->ndi ^= 1;
    hqProc->alloc = alloc;
@@ -477,13 +470,13 @@ RgSchUlAlloc    *alloc;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmFreeProc
+Void rgSCHUhmFreeProc
 (
 RgSchUlHqProcCb *hqProc,
 RgSchCellCb      *cell
 )
 #else
-PUBLIC Void rgSCHUhmFreeProc(hqProc, cell)
+Void rgSCHUhmFreeProc(hqProc, cell)
 RgSchUlHqProcCb *hqProc;
 RgSchCellCb      *cell;
 #endif
@@ -492,7 +485,6 @@ RgSchCellCb      *cell;
    RgSchUeCb         *ueCb;
    U8 qci = 1;
 #endif
-   TRC2(rgSCHUhmFreeProc);
 
 #ifdef LTE_L2_MEAS
    if (hqProc->alloc && hqProc->alloc->ue)
@@ -569,18 +561,17 @@ RgSchCellCb      *cell;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmRetx
+Void rgSCHUhmRetx
 (
 RgSchUlHqProcCb *hqProc,
 RgSchUlAlloc    *alloc
 )
 #else
-PUBLIC Void rgSCHUhmRetx(hqProc, alloc) 
+Void rgSCHUhmRetx(hqProc, alloc) 
 RgSchUlHqProcCb *hqProc;
 RgSchUlAlloc    *alloc;
 #endif
 {
-   TRC2(rgSCHUhmRetx);
 
    hqProc->alloc = alloc;
    --hqProc->remTx;
@@ -609,14 +600,14 @@ RgSchUlAlloc    *alloc;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmRgrUeCfg
+Void rgSCHUhmRgrUeCfg
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb         *ueCb,
 RgrUeCfg          *ueCfg
 )
 #else
-PUBLIC Void rgSCHUhmRgrUeCfg(cellCb, ueCb, ueCfg) 
+Void rgSCHUhmRgrUeCfg(cellCb, ueCb, ueCfg) 
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 RgrUeCfg          *ueCfg;
@@ -625,8 +616,6 @@ RgrUeCfg          *ueCfg;
    U8 i;
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
    
-   TRC2(rgSCHUhmRgrUeCfg);
-
    ueUl->hqEnt.maxHqRetx = ((ueCfg->ueUlHqCfg.maxUlHqTx) - 1);
 #ifdef TFU_UPGRADE
    /* Storing the delta HARQ offset for HARQ + PUSCH */
@@ -675,21 +664,20 @@ RgrUeCfg          *ueCfg;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmRgrUeRecfg
+Void rgSCHUhmRgrUeRecfg
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb         *ueCb,
 RgrUeRecfg        *ueRecfg
 )
 #else
-PUBLIC Void rgSCHUhmRgrUeRecfg(cellCb, ueCb, ueRecfg) 
+Void rgSCHUhmRgrUeRecfg(cellCb, ueCb, ueRecfg) 
 RgSchCellCb       *cellCb;
 RgSchUeCb         *ueCb;
 RgrUeRecfg        *ueRecfg;
 #endif
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
-   TRC2(rgSCHUhmRgrUeRecfg);
 
    /* [ccpu00123958]-ADD- Check for HARQ Reconfig from the bit mask  */
    if(RGR_UE_ULHARQ_RECFG & ueRecfg->ueRecfgTypes)
@@ -716,18 +704,17 @@ RgrUeRecfg        *ueRecfg;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgSCHUhmFreeUe
+Void rgSCHUhmFreeUe
 (
 RgSchCellCb       *cellCb,
 RgUeUlHqCb        *hqEnt
 )
 #else
-PUBLIC Void rgSCHUhmFreeUe(cellCb, hqEnt) 
+Void rgSCHUhmFreeUe(cellCb, hqEnt) 
 RgSchCellCb       *cellCb;
 RgUeUlHqCb       *hqEnt;
 #endif
 {
-   TRC2(rgSCHUhmFreeUe);
 #ifdef LTE_TDD
    /* ccpu00117052 - MOD - Passing double pointer
    for proper NULLP assignment*/
@@ -758,14 +745,14 @@ RgUeUlHqCb       *hqEnt;
 *  @return  Void
 */
 #ifdef ANSI
-PUBLIC S16 rgSCHUhmAppendPhich
+S16 rgSCHUhmAppendPhich
 (
 RgSchCellCb            *cellCb,
 CmLteTimingInfo        frm,
 U8                     idx
 )
 #else
-PUBLIC S16 rgSCHUhmAppendPhich (cellCb, frm, idx)
+S16 rgSCHUhmAppendPhich (cellCb, frm, idx)
 RgSchCellCb            *cellCb;
 CmLteTimingInfo        frm;
 U8                     idx;
@@ -782,8 +769,6 @@ U8                     idx;
 #endif /* LTEMAC_HDFDD */
    RgSchCmnUlCell  *cellUl = RG_SCH_CMN_GET_UL_CELL(cellCb);
 
-   TRC2(rgSCHUhmAppendPhich)
-
 #ifdef RG_5GTF
    return ROK;
 #endif
@@ -887,13 +872,13 @@ U8                     idx;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHUhmHqEntInit
+S16 rgSCHUhmHqEntInit
 (
 RgSchCellCb       *cellCb,
 RgSchUeCb           *ueCb
 )
 #else
-PUBLIC S16 rgSCHUhmHqEntInit(cellCb, ueCb)
+S16 rgSCHUhmHqEntInit(cellCb, ueCb)
 RgSchCellCb       *cellCb;
 RgSchUeCb           *ueCb;
 #endif
@@ -902,7 +887,6 @@ RgSchUeCb           *ueCb;
 #ifdef LTE_TDD   
    Inst              inst = ueCb->cell->instIdx;
 #endif
-   TRC2(rgSCHUhmHqEntInit)
 
 #ifndef LTE_TDD
    /* Init the HARQ processes */
@@ -949,14 +933,14 @@ RgSchUeCb           *ueCb;
  *
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHUhmGetAvlHqProc
+S16 rgSCHUhmGetAvlHqProc
 (
 RgSchCellCb           *cell,
 RgSchUeCb               *ue,
 RgSchUlHqProcCb         **hqP
 )
 #else
-PUBLIC S16 rgSCHUhmGetAvlHqProc (cell, ue, hqP)
+S16 rgSCHUhmGetAvlHqProc (cell, ue, hqP)
 RgSchCellCb           *cell;
 RgSchUeCb             *ue;
 RgSchUlHqProcCb       **hqP;
@@ -968,8 +952,6 @@ RgSchUlHqProcCb       **hqP;
    CmLList           *tmp;
    RgUeUlHqCb        *hqE;
 
-   TRC2(rgSCHUhmGetAvlHqProc);
-
    hqE = &ueUl->hqEnt;
  
    CM_LLIST_FIRST_NODE(&(hqE->free), tmp);
@@ -1022,14 +1004,14 @@ RgSchUlHqProcCb       **hqP;
  *      -# NULL
  **/
 #ifdef ANSI
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime 
+RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime 
 (
 RgSchCellCb      *cell,
 RgSchUeCb        *ue, 
 CmLteTimingInfo  frm
 )
 #else
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime(cell, ue, frm)
+RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime(cell, ue, frm)
 RgSchCellCb      *cell;
 RgSchUeCb        *ue; 
 CmLteTimingInfo  frm;
@@ -1040,8 +1022,6 @@ CmLteTimingInfo  frm;
    CmLList      *lnk = lst->first;
    RgSchUlHqProcCb   *proc;
 
-   TRC2(rgSCHUhmGetUlProcByTime);
-
    while (lnk)
    {
       proc = (RgSchUlHqProcCb *)(lnk->node);