X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_uhm.c;h=770b4ada411b23dd21889be3c16c452132619555;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=0689961c89fe79038d776efeffe38917ae13407e;hpb=65443172dd60a6ea312bd3a15959dbf54ad7f045;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_uhm.c b/src/5gnrsch/rg_sch_uhm.c
index 0689961c8..770b4ada4 100755
--- a/src/5gnrsch/rg_sch_uhm.c
+++ b/src/5gnrsch/rg_sch_uhm.c
@@ -106,49 +106,23 @@ RgSchUeCb        *ueCb
  *  @return  Void
  **/
 #ifndef MAC_SCH_STATS
-#ifdef ANSI
-Void rgSCHUhmProcDatInd
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-CmLteTimingInfo      frm
-)
-#else
-Void rgSCHUhmProcDatInd(cell, ue, frm)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-CmLteTimingInfo      frm;
-#endif
+Void rgSCHUhmProcDatInd(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo frm)
 #else  /* MAC_SCH_STATS */
-#ifdef ANSI
-Void rgSCHUhmProcDatInd
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-CmLteTimingInfo      frm,
-uint8_t                   cqi
-)
-#else
-Void rgSCHUhmProcDatInd(cell, ue, frm, cqi)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-CmLteTimingInfo      frm;
-uint8_t                   cqi;
-#endif
+Void rgSCHUhmProcDatInd(RgSchCellCb *cell,RgSchUeCb  *ue,CmLteTimingInfo frm,uint8_t  cqi)
 #endif /* MAC_SCH_STATS */
 {
    RgSchUlHqProcCb   *hqProc;
 #ifdef UL_LA
    RgSchCmnUlUe   *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
    S32            iTbs;
-   uint8_t             maxiTbs = rgSchCmnUlCqiToTbsTbl[cell->isCpUlExtend]
+   uint8_t        maxiTbs = rgSchCmnUlCqiToTbsTbl[cell->isCpUlExtend]
                                                  [ueUl->maxUlCqi];
 #endif
 
    rgSCHUtlUlHqProcForUe(cell, frm, ue, &hqProc);
    if (hqProc == NULLP)
    {
-      printf("UE[%d] failed to find UL HqProc for [%d:%d]\n",
+      DU_LOG("\nERROR  -->  SCH : UE[%d] failed to find UL HqProc for [%d:%d]\n",
 		      ue->ueId, frm.sfn, frm.slot);
       return;
    }
@@ -203,19 +177,11 @@ uint8_t                   cqi;
  *  @param[in,out] *hqProc
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmProcMsg3DatInd
-(
-RgSchUlHqProcCb *hqProc
-)
-#else
-Void rgSCHUhmProcMsg3DatInd(hqProc)
-RgSchUlHqProcCb *hqProc;
-#endif
+Void rgSCHUhmProcMsg3DatInd(RgSchUlHqProcCb *hqProc)
 {
    hqProc->rcvdCrcInd = TRUE;
    hqProc->remTx = 0;        /*Reseting the value of rem Tx*/
-   printf("\nrgSCHUhmProcMsg3DatInd,id:%u\n",hqProc->procId);
+   DU_LOG("\nINFO  -->  SCH : rgSCHUhmProcMsg3DatInd,id:%u\n",hqProc->procId);
    return;
 }  /* rgSCHUhmProcMsg3DatInd */
 
@@ -234,15 +200,7 @@ RgSchUlHqProcCb *hqProc;
  *  @param[in,out] *hqProc
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmProcMsg3Failure
-(
-RgSchUlHqProcCb *hqProc
-)
-#else
-Void rgSCHUhmProcMsg3Failure(hqProc)
-RgSchUlHqProcCb *hqProc;
-#endif
+Void rgSCHUhmProcMsg3Failure(RgSchUlHqProcCb *hqProc)
 {
 #ifdef EMTC_ENABLE
    RG_SCH_EMTC_IS_CRCIND_RCVD_CHK_RACB(hqProc);
@@ -276,39 +234,9 @@ RgSchUlHqProcCb *hqProc;
  *  @return  Void
  **/
 #ifndef MAC_SCH_STATS
-#ifdef ANSI
-Void rgSCHUhmProcHqFailure
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-CmLteTimingInfo      frm,
-TknUInt8                rv
-)
-#else
-Void rgSCHUhmProcHqFailure(cell, ue, frm, rv)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-CmLteTimingInfo      frm;
-TknUInt8                rv;
-#endif
+Void rgSCHUhmProcHqFailure(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo  frm,TknUInt8  rv)
 #else /* MAC_SCH_STATS */
-#ifdef ANSI
-Void rgSCHUhmProcHqFailure
-(
-RgSchCellCb          *cell,
-RgSchUeCb            *ue,
-CmLteTimingInfo      frm,
-TknUInt8                rv,
-uint8_t                   cqi
-)
-#else
-Void rgSCHUhmProcHqFailure(cell, ue, frm, rv, cqi)
-RgSchCellCb          *cell;
-RgSchUeCb            *ue;
-CmLteTimingInfo      frm;
-TknUInt8                rv;
-uint8_t                   cqi;
-#endif
+Void rgSCHUhmProcHqFailure(RgSchCellCb  *cell,RgSchUeCb  *ue,CmLteTimingInfo  frm,TknUInt8  rv,uint8_t cqi)
 #endif /* MAC_SCH_STATS */
 {
    RgSchUlHqProcCb   *hqProc;
@@ -320,7 +248,7 @@ uint8_t                   cqi;
    rgSCHUtlUlHqProcForUe(cell, frm, ue, &hqProc);
    if (hqProc == NULLP)
    {
-      printf("UE[%d] failed to find UL HqProc for [%d:%d]\n",
+      DU_LOG("\nERROR  -->  SCH : UE[%d] failed to find UL HqProc for [%d:%d]\n",
 		      ue->ueId, frm.sfn, frm.slot);
       return;
    }
@@ -381,19 +309,7 @@ uint8_t                   cqi;
  *      -# Pointer to harq process corresponding to index
  *      -# NULL
  **/
-#ifdef ANSI
-RgSchUlHqProcCb* rgSCHUhmGetUlHqProc
-(
-RgSchCellCb      *cell,
-RgSchUeCb        *ue, 
-uint8_t               idx
-)
-#else
-RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(cell, ue, idx)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue; 
-uint8_t               idx;
-#endif
+RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(RgSchCellCb *cell,RgSchUeCb  *ue, uint8_t idx)
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
 
@@ -423,19 +339,7 @@ uint8_t               idx;
  *  @param[in]      *alloc
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmNewTx
-(
-RgSchUlHqProcCb *hqProc,
-uint8_t              maxHqRetx,
-RgSchUlAlloc    *alloc
-)
-#else
-Void rgSCHUhmNewTx(hqProc, maxHqRetx, alloc)
-RgSchUlHqProcCb *hqProc;
-uint8_t              maxHqRetx;
-RgSchUlAlloc    *alloc;
-#endif
+Void rgSCHUhmNewTx(RgSchUlHqProcCb *hqProc,uint8_t maxHqRetx,RgSchUlAlloc *alloc)
 {
 
    hqProc->ndi ^= 1;
@@ -469,17 +373,7 @@ RgSchUlAlloc    *alloc;
  *  @param[in]  RgSchCellCb      *cell
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmFreeProc
-(
-RgSchUlHqProcCb *hqProc,
-RgSchCellCb      *cell
-)
-#else
-Void rgSCHUhmFreeProc(hqProc, cell)
-RgSchUlHqProcCb *hqProc;
-RgSchCellCb      *cell;
-#endif
+Void rgSCHUhmFreeProc(RgSchUlHqProcCb *hqProc,RgSchCellCb *cell)
 {
 #ifdef LTE_L2_MEAS
    RgSchUeCb         *ueCb;
@@ -517,7 +411,7 @@ RgSchCellCb      *cell;
  {
 
 #ifdef UL_ADPT_DBG 
-    printf("\n\n########HARQ FREED HARQPROC ID (%d )after rgSCHUhmFreeProc inuse %ld free %ld \n",hqProc->alloc->grnt.hqProcId, (CmLListCp *)(&((RgUeUlHqCb*)hqProc->hqEnt)->inUse)->count,(CmLListCp *) (&((RgUeUlHqCb*)hqProc->hqEnt)->free)->count);
+    DU_LOG("\nDEBUG  -->  SCH : ########HARQ FREED HARQPROC ID (%d )after rgSCHUhmFreeProc inuse %ld free %ld \n",hqProc->alloc->grnt.hqProcId, (CmLListCp *)(&((RgUeUlHqCb*)hqProc->hqEnt)->inUse)->count,(CmLListCp *) (&((RgUeUlHqCb*)hqProc->hqEnt)->free)->count);
 #endif
    hqProc->alloc = NULLP;
    hqProc->ulSfIdx = RGSCH_INVALID_INFO;
@@ -531,14 +425,14 @@ RgSchCellCb      *cell;
    cmLListAdd2Tail(&((RgUeUlHqCb*)hqProc->hqEnt)->free, &hqProc->lnk);
 
    /*
-   printf("after rgSCHUhmFreeProc inuse %ld free %ld \n", 
+   DU_LOG("\nINFO  -->  SCH : after rgSCHUhmFreeProc inuse %ld free %ld \n", 
         (CmLListCp *)(&((RgUeUlHqCb*)hqProc->hqEnt)->inUse)->count,
          (CmLListCp *) (&((RgUeUlHqCb*)hqProc->hqEnt)->free)->count);
    */
  }
  else
  {
-     printf("\nhqEnt is NULL\n");
+     DU_LOG("\nERROR  -->  SCH : hqEnt is NULL\n");
  }
    return;
 }  /* rgSCHUhmFreeProc */
@@ -560,17 +454,7 @@ RgSchCellCb      *cell;
  *  @param[in,out]  *hqProc
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmRetx
-(
-RgSchUlHqProcCb *hqProc,
-RgSchUlAlloc    *alloc
-)
-#else
-Void rgSCHUhmRetx(hqProc, alloc) 
-RgSchUlHqProcCb *hqProc;
-RgSchUlAlloc    *alloc;
-#endif
+Void rgSCHUhmRetx(RgSchUlHqProcCb *hqProc,RgSchUlAlloc    *alloc)
 {
 
    hqProc->alloc = alloc;
@@ -599,19 +483,7 @@ RgSchUlAlloc    *alloc;
  *  @param[out]     *err
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmRgrUeCfg
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb         *ueCb,
-RgrUeCfg          *ueCfg
-)
-#else
-Void rgSCHUhmRgrUeCfg(cellCb, ueCb, ueCfg) 
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-RgrUeCfg          *ueCfg;
-#endif
+Void rgSCHUhmRgrUeCfg(RgSchCellCb *cellCb,RgSchUeCb *ueCb,RgrUeCfg *ueCfg)
 {
    uint8_t i;
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
@@ -663,19 +535,7 @@ RgrUeCfg          *ueCfg;
  *  @param[out]     *err
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmRgrUeRecfg
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb         *ueCb,
-RgrUeRecfg        *ueRecfg
-)
-#else
-Void rgSCHUhmRgrUeRecfg(cellCb, ueCb, ueRecfg) 
-RgSchCellCb       *cellCb;
-RgSchUeCb         *ueCb;
-RgrUeRecfg        *ueRecfg;
-#endif
+Void rgSCHUhmRgrUeRecfg(RgSchCellCb *cellCb,RgSchUeCb *ueCb,RgrUeRecfg  *ueRecfg)
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
 
@@ -703,17 +563,7 @@ RgrUeRecfg        *ueRecfg;
  *  @param[in,out]  *ueCb
  *  @return  Void
  **/
-#ifdef ANSI
-Void rgSCHUhmFreeUe
-(
-RgSchCellCb       *cellCb,
-RgUeUlHqCb        *hqEnt
-)
-#else
-Void rgSCHUhmFreeUe(cellCb, hqEnt) 
-RgSchCellCb       *cellCb;
-RgUeUlHqCb       *hqEnt;
-#endif
+Void rgSCHUhmFreeUe(RgSchCellCb *cellCb,RgUeUlHqCb *hqEnt)
 {
 #ifdef LTE_TDD
    /* ccpu00117052 - MOD - Passing double pointer
@@ -744,24 +594,12 @@ RgUeUlHqCb       *hqEnt;
 *  @param[in] idx
 *  @return  Void
 */
-#ifdef ANSI
-S16 rgSCHUhmAppendPhich
-(
-RgSchCellCb            *cellCb,
-CmLteTimingInfo        frm,
-uint8_t                     idx
-)
-#else
-S16 rgSCHUhmAppendPhich (cellCb, frm, idx)
-RgSchCellCb            *cellCb;
-CmLteTimingInfo        frm;
-uint8_t                     idx;
-#endif
+S16 rgSCHUhmAppendPhich(RgSchCellCb *cellCb,CmLteTimingInfo frm,uint8_t idx)
 {
-   uint8_t              nDmrs;
-   uint8_t              rbStart;
+   uint8_t         nDmrs;
+   uint8_t         rbStart;
 #ifdef LTE_TDD
-   uint8_t              iPhich;
+   uint8_t         iPhich;
 #endif
    RgSchUlAlloc    *ulAlloc;
 #ifdef LTEMAC_HDFDD
@@ -871,17 +709,7 @@ uint8_t                     idx;
  *           -# RFAILED
  *
  **/
-#ifdef ANSI
-S16 rgSCHUhmHqEntInit
-(
-RgSchCellCb       *cellCb,
-RgSchUeCb           *ueCb
-)
-#else
-S16 rgSCHUhmHqEntInit(cellCb, ueCb)
-RgSchCellCb       *cellCb;
-RgSchUeCb           *ueCb;
-#endif
+S16 rgSCHUhmHqEntInit(RgSchCellCb *cellCb,RgSchUeCb *ueCb)
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
 #ifdef LTE_TDD   
@@ -932,19 +760,7 @@ RgSchUeCb           *ueCb;
  *         -#RFAILED otherwise
  *
  **/
-#ifdef ANSI
-S16 rgSCHUhmGetAvlHqProc
-(
-RgSchCellCb           *cell,
-RgSchUeCb               *ue,
-RgSchUlHqProcCb         **hqP
-)
-#else
-S16 rgSCHUhmGetAvlHqProc (cell, ue, hqP)
-RgSchCellCb           *cell;
-RgSchUeCb             *ue;
-RgSchUlHqProcCb       **hqP;
-#endif
+S16 rgSCHUhmGetAvlHqProc(RgSchCellCb *cell,RgSchUeCb  *ue,RgSchUlHqProcCb  **hqP)
 {
    RgSchCmnUlCell    *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
    RgSchCmnUlUe      *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
@@ -958,10 +774,9 @@ RgSchUlHqProcCb       **hqP;
 
    if (NULLP == tmp)
    {
-      //RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId,
-       //                "rgSCHUhmGetAvlHqProc free %ld inUse %ld ue %d"
+       //DU_LOG("rgSCHUhmGetAvlHqProc free %ld inUse %ld ue %d"
         //                                   , hqE->free.count, hqE->inUse.count, ue->ueId);
-      //printf("5GTF_ERROR rgSCHUhmGetAvlHqProc cellId %d  %ld inUse %ld ue %d"
+      //DU_LOG("5GTF_ERROR rgSCHUhmGetAvlHqProc cellId %d  %ld inUse %ld ue %d"
                               //, cell->cellId, hqE->free.count, hqE->inUse.count, ue->ueId);
       /* No Harq Process available in the free queue. */
       return RFAILED;
@@ -976,7 +791,7 @@ RgSchUlHqProcCb       **hqP;
    cmLListAdd2Tail(&hqE->inUse, &tmpHqProc->lnk);
 
 #ifdef UL_ADPT_DBG 
-         printf("rgSCHUhmGetAvlHqProc cellId %d  free %ld inUse %ld ue %d time (%d %d)\n",cell->cellId, hqE->free.count, hqE->inUse.count, ue->ueId,cellUl->schdTime.sfn,cellUl->schdTime.slot);
+         DU_LOG("\nDEBUG  -->  SCH : rgSCHUhmGetAvlHqProc cellId %d  free %ld inUse %ld UE %d time (%d %d)\n",cell->cellId, hqE->free.count, hqE->inUse.count, ue->ueId,cellUl->schdTime.sfn,cellUl->schdTime.slot);
 #endif         
    tmpHqProc->schdTime = cellUl->schdTime;
 
@@ -1003,19 +818,7 @@ RgSchUlHqProcCb       **hqP;
  *      -# Pointer to harq process corresponding to index
  *      -# NULL
  **/
-#ifdef ANSI
-RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime 
-(
-RgSchCellCb      *cell,
-RgSchUeCb        *ue, 
-CmLteTimingInfo  frm
-)
-#else
-RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime(cell, ue, frm)
-RgSchCellCb      *cell;
-RgSchUeCb        *ue; 
-CmLteTimingInfo  frm;
-#endif
+RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime(RgSchCellCb *cell,RgSchUeCb *ue, CmLteTimingInfo  frm)
 {
    RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
    CmLListCp    *lst = &ueUl->hqEnt.inUse;
@@ -1026,10 +829,12 @@ CmLteTimingInfo  frm;
    {
       proc = (RgSchUlHqProcCb *)(lnk->node);
       lnk = lnk->next;
-      //   printf("compare rgSCHUhmGetUlProcByTime time (%d %d) CRC time (%d %d) proc->procId %d \n",proc->schdTime.sfn,proc->schdTime.slot,frm.sfn,frm.slot ,proc->procId);
+      //   DU_LOG("\nINFO  -->  SCH : compare rgSCHUhmGetUlProcByTime time (%d %d) CRC time (%d %d) proc->procId %d
+      //   \n",\proc->schdTime.sfn,proc->schdTime.slot,frm.sfn,frm.slot ,proc->procId);
       if (RGSCH_TIMEINFO_SAME(proc->schdTime, frm))
       {
-        // printf("Harq timing Matched rgSCHUhmGetUlProcByTime time (%d %d) proc->procId %d \n",proc->schdTime.sfn,proc->schdTime.slot, proc->procId);
+        // DU_LOG("\nINFO  -->  SCH : Harq timing Matched rgSCHUhmGetUlProcByTime time (%d %d) proc->procId %d \n",\
+	proc->schdTime.sfn,proc->schdTime.slot, proc->procId);
          return (proc);
       }
    }