Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[Epic-ID: ODUHIGH-462][Task-ID: ODUHIGH-472] Implementation of onduration timer
[o-du/l2.git]
/
src
/
5gnrsch
/
rg_sch_uhm.c
diff --git
a/src/5gnrsch/rg_sch_uhm.c
b/src/5gnrsch/rg_sch_uhm.c
index
91141d9
..
770b4ad
100755
(executable)
--- a/
src/5gnrsch/rg_sch_uhm.c
+++ b/
src/5gnrsch/rg_sch_uhm.c
@@
-63,23
+63,23
@@
/* forward references */
#ifdef EMTC_ENABLE
/* forward references */
#ifdef EMTC_ENABLE
-
U32
gUlRetxPassCntr = 0;
- /*
EXTERN U32
gUlRetxFailCntr;
-
EXTERN U32
gUlCrcPassCounter;
-
EXTERN U32
gUlCrcFailCounter;*/
+
uint32_t
gUlRetxPassCntr = 0;
+ /*
uint32_t
gUlRetxFailCntr;
+
uint32_t
gUlCrcPassCounter;
+
uint32_t
gUlCrcFailCounter;*/
#endif
#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 */
+
uint8_t
rgRvIdxTable[] = {0, 3, 1, 2}; /* This gives rvIdx for a given rv */
+
uint8_t
rgRvTable[] = {0, 2, 3 ,1}; /* This gives rv for a given rvIdx */
#ifdef EMTC_ENABLE
#ifdef EMTC_ENABLE
-
PUBLIC
Void rgSCHCmnEmtcHdlHarqProcFail
+Void rgSCHCmnEmtcHdlHarqProcFail
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgSchUlHqProcCb *hqProc,
CmLteTimingInfo frm
);
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgSchUlHqProcCb *hqProc,
CmLteTimingInfo frm
);
-
PUBLIC
Void rgSCHEmtcInitUlUeHqEnt
+Void rgSCHEmtcInitUlUeHqEnt
(
RgSchCellCb *cell,
RgrUeCfg *ueCfg,
(
RgSchCellCb *cell,
RgrUeCfg *ueCfg,
@@
-106,53
+106,25
@@
RgSchUeCb *ueCb
* @return Void
**/
#ifndef MAC_SCH_STATS
* @return Void
**/
#ifndef MAC_SCH_STATS
-#ifdef ANSI
-PUBLIC Void rgSCHUhmProcDatInd
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue,
-CmLteTimingInfo frm
-)
-#else
-PUBLIC Void rgSCHUhmProcDatInd(cell, ue, frm)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-CmLteTimingInfo frm;
-#endif
+Void rgSCHUhmProcDatInd(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo frm)
#else /* MAC_SCH_STATS */
#else /* MAC_SCH_STATS */
-#ifdef ANSI
-PUBLIC Void rgSCHUhmProcDatInd
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue,
-CmLteTimingInfo frm,
-U8 cqi
-)
-#else
-PUBLIC Void rgSCHUhmProcDatInd(cell, ue, frm, cqi)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-CmLteTimingInfo frm;
-U8 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;
#endif /* MAC_SCH_STATS */
{
RgSchUlHqProcCb *hqProc;
#ifdef UL_LA
RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
S32 iTbs;
-
U8
maxiTbs = rgSchCmnUlCqiToTbsTbl[cell->isCpUlExtend]
+
uint8_t
maxiTbs = rgSchCmnUlCqiToTbsTbl[cell->isCpUlExtend]
[ueUl->maxUlCqi];
#endif
[ueUl->maxUlCqi];
#endif
- TRC2(rgSCHUhmProcDatInd);
-
rgSCHUtlUlHqProcForUe(cell, frm, ue, &hqProc);
if (hqProc == NULLP)
{
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);
ue->ueId, frm.sfn, frm.slot);
-
RETVOID
;
+
return
;
}
hqProc->rcvdCrcInd = TRUE;
}
hqProc->rcvdCrcInd = TRUE;
@@
-187,7
+159,7
@@
U8 cqi;
}
#endif
}
#endif
-
RETVOID
;
+
return
;
} /* rgSCHUhmProcDatInd */
/**
} /* rgSCHUhmProcDatInd */
/**
@@
-205,21
+177,12
@@
U8 cqi;
* @param[in,out] *hqProc
* @return Void
**/
* @param[in,out] *hqProc
* @return Void
**/
-#ifdef ANSI
-PUBLIC Void rgSCHUhmProcMsg3DatInd
-(
-RgSchUlHqProcCb *hqProc
-)
-#else
-PUBLIC Void rgSCHUhmProcMsg3DatInd(hqProc)
-RgSchUlHqProcCb *hqProc;
-#endif
+Void rgSCHUhmProcMsg3DatInd(RgSchUlHqProcCb *hqProc)
{
{
- TRC2(rgSCHUhmProcMsg3DatInd);
hqProc->rcvdCrcInd = TRUE;
hqProc->remTx = 0; /*Reseting the value of rem Tx*/
hqProc->rcvdCrcInd = TRUE;
hqProc->remTx = 0; /*Reseting the value of rem Tx*/
-
printf("\n
rgSCHUhmProcMsg3DatInd,id:%u\n",hqProc->procId);
-
RETVOID
;
+
DU_LOG("\nINFO --> SCH :
rgSCHUhmProcMsg3DatInd,id:%u\n",hqProc->procId);
+
return
;
} /* rgSCHUhmProcMsg3DatInd */
/**
} /* rgSCHUhmProcMsg3DatInd */
/**
@@
-237,17
+200,8
@@
RgSchUlHqProcCb *hqProc;
* @param[in,out] *hqProc
* @return Void
**/
* @param[in,out] *hqProc
* @return Void
**/
-#ifdef ANSI
-PUBLIC Void rgSCHUhmProcMsg3Failure
-(
-RgSchUlHqProcCb *hqProc
-)
-#else
-PUBLIC Void rgSCHUhmProcMsg3Failure(hqProc)
-RgSchUlHqProcCb *hqProc;
-#endif
+Void rgSCHUhmProcMsg3Failure(RgSchUlHqProcCb *hqProc)
{
{
- TRC2(rgSCHUhmProcMsg3Failure);
#ifdef EMTC_ENABLE
RG_SCH_EMTC_IS_CRCIND_RCVD_CHK_RACB(hqProc);
#endif
#ifdef EMTC_ENABLE
RG_SCH_EMTC_IS_CRCIND_RCVD_CHK_RACB(hqProc);
#endif
@@
-256,7
+210,7
@@
RgSchUlHqProcCb *hqProc;
hqProc->rcvdCrcInd = FALSE;
}
hqProc->rcvdCrcInd = FALSE;
}
-
RETVOID
;
+
return
;
} /* rgSCHUhmProcMsg3Failure */
/**
} /* rgSCHUhmProcMsg3Failure */
/**
@@
-280,39
+234,9
@@
RgSchUlHqProcCb *hqProc;
* @return Void
**/
#ifndef MAC_SCH_STATS
* @return Void
**/
#ifndef MAC_SCH_STATS
-#ifdef ANSI
-PUBLIC Void rgSCHUhmProcHqFailure
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue,
-CmLteTimingInfo frm,
-TknU8 rv
-)
-#else
-PUBLIC Void rgSCHUhmProcHqFailure(cell, ue, frm, rv)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-CmLteTimingInfo frm;
-TknU8 rv;
-#endif
+Void rgSCHUhmProcHqFailure(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo frm,TknUInt8 rv)
#else /* MAC_SCH_STATS */
#else /* MAC_SCH_STATS */
-#ifdef ANSI
-PUBLIC Void rgSCHUhmProcHqFailure
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue,
-CmLteTimingInfo frm,
-TknU8 rv,
-U8 cqi
-)
-#else
-PUBLIC Void rgSCHUhmProcHqFailure(cell, ue, frm, rv, cqi)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-CmLteTimingInfo frm;
-TknU8 rv;
-U8 cqi;
-#endif
+Void rgSCHUhmProcHqFailure(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo frm,TknUInt8 rv,uint8_t cqi)
#endif /* MAC_SCH_STATS */
{
RgSchUlHqProcCb *hqProc;
#endif /* MAC_SCH_STATS */
{
RgSchUlHqProcCb *hqProc;
@@
-320,14
+244,13
@@
U8 cqi;
RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
S32 iTbs;
#endif
RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue,cell);
S32 iTbs;
#endif
- TRC2(rgSCHUhmProcHqFailure);
rgSCHUtlUlHqProcForUe(cell, frm, ue, &hqProc);
if (hqProc == NULLP)
{
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);
ue->ueId, frm.sfn, frm.slot);
-
RETVOID
;
+
return
;
}
#ifdef UL_LA
{
}
#ifdef UL_LA
{
@@
-344,7
+267,7
@@
U8 cqi;
#ifdef MAC_SCH_STATS
/** Stats update over here */
{
#ifdef MAC_SCH_STATS
/** Stats update over here */
{
- static
U32
retxCnt = 0;
+ static
uint32_t
retxCnt = 0;
++retxCnt;
hqFailStats.ulCqiStat[cqi - 1].numOfNacks++;
}
++retxCnt;
hqFailStats.ulCqiStat[cqi - 1].numOfNacks++;
}
@@
-365,7
+288,7
@@
U8 cqi;
{
hqProc->rvIdxPhy.val = rgRvIdxTable[rv.val];
}
{
hqProc->rvIdxPhy.val = rgRvIdxTable[rv.val];
}
-
RETVOID
;
+
return
;
} /* rgSCHUhmProcHqFailure */
/**
} /* rgSCHUhmProcHqFailure */
/**
@@
-386,22
+309,9
@@
U8 cqi;
* -# Pointer to harq process corresponding to index
* -# NULL
**/
* -# Pointer to harq process corresponding to index
* -# NULL
**/
-#ifdef ANSI
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlHqProc
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue,
-U8 idx
-)
-#else
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(cell, ue, idx)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-U8 idx;
-#endif
+RgSchUlHqProcCb* rgSCHUhmGetUlHqProc(RgSchCellCb *cell,RgSchUeCb *ue, uint8_t idx)
{
RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
{
RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
- TRC2(rgSCHUhmGetUlHqProc);
#if (ERRCLASS & ERRCLS_DEBUG)
if(idx >= ueUl->hqEnt.numHqPrcs)
#if (ERRCLASS & ERRCLS_DEBUG)
if(idx >= ueUl->hqEnt.numHqPrcs)
@@
-429,21
+339,8
@@
U8 idx;
* @param[in] *alloc
* @return Void
**/
* @param[in] *alloc
* @return Void
**/
-#ifdef ANSI
-PUBLIC Void rgSCHUhmNewTx
-(
-RgSchUlHqProcCb *hqProc,
-U8 maxHqRetx,
-RgSchUlAlloc *alloc
-)
-#else
-PUBLIC Void rgSCHUhmNewTx(hqProc, maxHqRetx, alloc)
-RgSchUlHqProcCb *hqProc;
-U8 maxHqRetx;
-RgSchUlAlloc *alloc;
-#endif
+Void rgSCHUhmNewTx(RgSchUlHqProcCb *hqProc,uint8_t maxHqRetx,RgSchUlAlloc *alloc)
{
{
- TRC2(rgSCHUhmNewTx);
hqProc->ndi ^= 1;
hqProc->alloc = alloc;
hqProc->ndi ^= 1;
hqProc->alloc = alloc;
@@
-457,7
+354,7
@@
RgSchUlAlloc *alloc;
((RgUeUlHqCb*)hqProc->hqEnt)->numBusyHqProcs++;
}
#endif
((RgUeUlHqCb*)hqProc->hqEnt)->numBusyHqProcs++;
}
#endif
-
RETVOID
;
+
return
;
} /* rgSCHUhmNewTx */
/**
} /* rgSCHUhmNewTx */
/**
@@
-476,23
+373,12
@@
RgSchUlAlloc *alloc;
* @param[in] RgSchCellCb *cell
* @return Void
**/
* @param[in] RgSchCellCb *cell
* @return Void
**/
-#ifdef ANSI
-PUBLIC Void rgSCHUhmFreeProc
-(
-RgSchUlHqProcCb *hqProc,
-RgSchCellCb *cell
-)
-#else
-PUBLIC Void rgSCHUhmFreeProc(hqProc, cell)
-RgSchUlHqProcCb *hqProc;
-RgSchCellCb *cell;
-#endif
+Void rgSCHUhmFreeProc(RgSchUlHqProcCb *hqProc,RgSchCellCb *cell)
{
#ifdef LTE_L2_MEAS
RgSchUeCb *ueCb;
{
#ifdef LTE_L2_MEAS
RgSchUeCb *ueCb;
-
U8
qci = 1;
+
uint8_t
qci = 1;
#endif
#endif
- TRC2(rgSCHUhmFreeProc);
#ifdef LTE_L2_MEAS
if (hqProc->alloc && hqProc->alloc->ue)
#ifdef LTE_L2_MEAS
if (hqProc->alloc && hqProc->alloc->ue)
@@
-500,7
+386,7
@@
RgSchCellCb *cell;
ueCb = hqProc->alloc->ue;
if (ueCb && cell)
{
ueCb = hqProc->alloc->ue;
if (ueCb && cell)
{
-
U32
nonLcg0ReportedBs = ((RgSchCmnLcg *)(ueCb->ul.lcgArr[1].sch))->reportedBs + \
+
uint32_t
nonLcg0ReportedBs = ((RgSchCmnLcg *)(ueCb->ul.lcgArr[1].sch))->reportedBs + \
((RgSchCmnLcg *)(ueCb->ul.lcgArr[2].sch))->reportedBs + \
((RgSchCmnLcg *)(ueCb->ul.lcgArr[3].sch))->reportedBs;
((RgUeUlHqCb*)hqProc->hqEnt)->numBusyHqProcs--;
((RgSchCmnLcg *)(ueCb->ul.lcgArr[2].sch))->reportedBs + \
((RgSchCmnLcg *)(ueCb->ul.lcgArr[3].sch))->reportedBs;
((RgUeUlHqCb*)hqProc->hqEnt)->numBusyHqProcs--;
@@
-525,7
+411,7
@@
RgSchCellCb *cell;
{
#ifdef UL_ADPT_DBG
{
#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;
#endif
hqProc->alloc = NULLP;
hqProc->ulSfIdx = RGSCH_INVALID_INFO;
@@
-539,16
+425,16
@@
RgSchCellCb *cell;
cmLListAdd2Tail(&((RgUeUlHqCb*)hqProc->hqEnt)->free, &hqProc->lnk);
/*
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
{
(CmLListCp *)(&((RgUeUlHqCb*)hqProc->hqEnt)->inUse)->count,
(CmLListCp *) (&((RgUeUlHqCb*)hqProc->hqEnt)->free)->count);
*/
}
else
{
-
printf("\n
hqEnt is NULL\n");
+
DU_LOG("\nERROR --> SCH :
hqEnt is NULL\n");
}
}
-
RETVOID
;
+
return
;
} /* rgSCHUhmFreeProc */
/**
} /* rgSCHUhmFreeProc */
/**
@@
-568,25
+454,14
@@
RgSchCellCb *cell;
* @param[in,out] *hqProc
* @return Void
**/
* @param[in,out] *hqProc
* @return Void
**/
-#ifdef ANSI
-PUBLIC Void rgSCHUhmRetx
-(
-RgSchUlHqProcCb *hqProc,
-RgSchUlAlloc *alloc
-)
-#else
-PUBLIC Void rgSCHUhmRetx(hqProc, alloc)
-RgSchUlHqProcCb *hqProc;
-RgSchUlAlloc *alloc;
-#endif
+Void rgSCHUhmRetx(RgSchUlHqProcCb *hqProc,RgSchUlAlloc *alloc)
{
{
- TRC2(rgSCHUhmRetx);
hqProc->alloc = alloc;
--hqProc->remTx;
hqProc->rvIdx = (hqProc->rvIdx + 1) % 4;
hqProc->rvIdxPhy.pres = FALSE;
hqProc->alloc = alloc;
--hqProc->remTx;
hqProc->rvIdx = (hqProc->rvIdx + 1) % 4;
hqProc->rvIdxPhy.pres = FALSE;
-
RETVOID
;
+
return
;
} /* rgSCHUhmRetx */
} /* rgSCHUhmRetx */
@@
-608,25
+483,11
@@
RgSchUlAlloc *alloc;
* @param[out] *err
* @return Void
**/
* @param[out] *err
* @return Void
**/
-#ifdef ANSI
-PUBLIC Void rgSCHUhmRgrUeCfg
-(
-RgSchCellCb *cellCb,
-RgSchUeCb *ueCb,
-RgrUeCfg *ueCfg
-)
-#else
-PUBLIC Void rgSCHUhmRgrUeCfg(cellCb, ueCb, ueCfg)
-RgSchCellCb *cellCb;
-RgSchUeCb *ueCb;
-RgrUeCfg *ueCfg;
-#endif
+Void rgSCHUhmRgrUeCfg(RgSchCellCb *cellCb,RgSchUeCb *ueCb,RgrUeCfg *ueCfg)
{
{
-
U8
i;
+
uint8_t
i;
RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
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 */
ueUl->hqEnt.maxHqRetx = ((ueCfg->ueUlHqCfg.maxUlHqTx) - 1);
#ifdef TFU_UPGRADE
/* Storing the delta HARQ offset for HARQ + PUSCH */
@@
-653,7
+514,7
@@
RgrUeCfg *ueCfg;
#ifdef EMTC_ENABLE
rgSCHEmtcInitUlUeHqEnt(cellCb, ueCfg, ueCb);
#endif
#ifdef EMTC_ENABLE
rgSCHEmtcInitUlUeHqEnt(cellCb, ueCfg, ueCb);
#endif
-
RETVOID
;
+
return
;
} /* rgSCHUhmRgrUeCfg */
/**
} /* rgSCHUhmRgrUeCfg */
/**
@@
-674,22
+535,9
@@
RgrUeCfg *ueCfg;
* @param[out] *err
* @return Void
**/
* @param[out] *err
* @return Void
**/
-#ifdef ANSI
-PUBLIC Void rgSCHUhmRgrUeRecfg
-(
-RgSchCellCb *cellCb,
-RgSchUeCb *ueCb,
-RgrUeRecfg *ueRecfg
-)
-#else
-PUBLIC 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);
{
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)
/* [ccpu00123958]-ADD- Check for HARQ Reconfig from the bit mask */
if(RGR_UE_ULHARQ_RECFG & ueRecfg->ueRecfgTypes)
@@
-697,7
+545,7
@@
RgrUeRecfg *ueRecfg;
ueUl->hqEnt.maxHqRetx = (ueRecfg->ueUlHqRecfg.maxUlHqTx - 1);
}
ueUl->hqEnt.maxHqRetx = (ueRecfg->ueUlHqRecfg.maxUlHqTx - 1);
}
-
RETVOID
;
+
return
;
} /* rgSCHUhmRgrUeRecfg */
/**
} /* rgSCHUhmRgrUeRecfg */
/**
@@
-715,19
+563,8
@@
RgrUeRecfg *ueRecfg;
* @param[in,out] *ueCb
* @return Void
**/
* @param[in,out] *ueCb
* @return Void
**/
-#ifdef ANSI
-PUBLIC Void rgSCHUhmFreeUe
-(
-RgSchCellCb *cellCb,
-RgUeUlHqCb *hqEnt
-)
-#else
-PUBLIC Void rgSCHUhmFreeUe(cellCb, hqEnt)
-RgSchCellCb *cellCb;
-RgUeUlHqCb *hqEnt;
-#endif
+Void rgSCHUhmFreeUe(RgSchCellCb *cellCb,RgUeUlHqCb *hqEnt)
{
{
- TRC2(rgSCHUhmFreeUe);
#ifdef LTE_TDD
/* ccpu00117052 - MOD - Passing double pointer
for proper NULLP assignment*/
#ifdef LTE_TDD
/* ccpu00117052 - MOD - Passing double pointer
for proper NULLP assignment*/
@@
-736,7
+573,7
@@
RgUeUlHqCb *hqEnt;
hqEnt->numHqPrcs * sizeof(RgSchUlHqProcCb));
#endif
hqEnt->numHqPrcs * sizeof(RgSchUlHqProcCb));
#endif
-
RETVOID
;
+
return
;
} /* rgSCHUhmFreeUe */
} /* rgSCHUhmFreeUe */
@@
-757,24
+594,12
@@
RgUeUlHqCb *hqEnt;
* @param[in] idx
* @return Void
*/
* @param[in] idx
* @return Void
*/
-#ifdef ANSI
-PUBLIC S16 rgSCHUhmAppendPhich
-(
-RgSchCellCb *cellCb,
-CmLteTimingInfo frm,
-U8 idx
-)
-#else
-PUBLIC S16 rgSCHUhmAppendPhich (cellCb, frm, idx)
-RgSchCellCb *cellCb;
-CmLteTimingInfo frm;
-U8 idx;
-#endif
+S16 rgSCHUhmAppendPhich(RgSchCellCb *cellCb,CmLteTimingInfo frm,uint8_t idx)
{
{
-
U8
nDmrs;
-
U8
rbStart;
+
uint8_t
nDmrs;
+
uint8_t
rbStart;
#ifdef LTE_TDD
#ifdef LTE_TDD
-
U8
iPhich;
+
uint8_t
iPhich;
#endif
RgSchUlAlloc *ulAlloc;
#ifdef LTEMAC_HDFDD
#endif
RgSchUlAlloc *ulAlloc;
#ifdef LTEMAC_HDFDD
@@
-782,8
+607,6
@@
U8 idx;
#endif /* LTEMAC_HDFDD */
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cellCb);
#endif /* LTEMAC_HDFDD */
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cellCb);
- TRC2(rgSCHUhmAppendPhich)
-
#ifdef RG_5GTF
return ROK;
#endif
#ifdef RG_5GTF
return ROK;
#endif
@@
-886,23
+709,12
@@
U8 idx;
* -# RFAILED
*
**/
* -# RFAILED
*
**/
-#ifdef ANSI
-PUBLIC S16 rgSCHUhmHqEntInit
-(
-RgSchCellCb *cellCb,
-RgSchUeCb *ueCb
-)
-#else
-PUBLIC 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
Inst inst = ueCb->cell->instIdx;
#endif
{
RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ueCb, cellCb);
#ifdef LTE_TDD
Inst inst = ueCb->cell->instIdx;
#endif
- TRC2(rgSCHUhmHqEntInit)
#ifndef LTE_TDD
/* Init the HARQ processes */
#ifndef LTE_TDD
/* Init the HARQ processes */
@@
-948,19
+760,7
@@
RgSchUeCb *ueCb;
* -#RFAILED otherwise
*
**/
* -#RFAILED otherwise
*
**/
-#ifdef ANSI
-PUBLIC S16 rgSCHUhmGetAvlHqProc
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue,
-RgSchUlHqProcCb **hqP
-)
-#else
-PUBLIC 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);
{
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
@@
-968,18
+768,15
@@
RgSchUlHqProcCb **hqP;
CmLList *tmp;
RgUeUlHqCb *hqE;
CmLList *tmp;
RgUeUlHqCb *hqE;
- TRC2(rgSCHUhmGetAvlHqProc);
-
hqE = &ueUl->hqEnt;
CM_LLIST_FIRST_NODE(&(hqE->free), tmp);
if (NULLP == tmp)
{
hqE = &ueUl->hqEnt;
CM_LLIST_FIRST_NODE(&(hqE->free), tmp);
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);
// , 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;
//, cell->cellId, hqE->free.count, hqE->inUse.count, ue->ueId);
/* No Harq Process available in the free queue. */
return RFAILED;
@@
-994,7
+791,7
@@
RgSchUlHqProcCb **hqP;
cmLListAdd2Tail(&hqE->inUse, &tmpHqProc->lnk);
#ifdef UL_ADPT_DBG
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;
#endif
tmpHqProc->schdTime = cellUl->schdTime;
@@
-1021,35
+818,23
@@
RgSchUlHqProcCb **hqP;
* -# Pointer to harq process corresponding to index
* -# NULL
**/
* -# Pointer to harq process corresponding to index
* -# NULL
**/
-#ifdef ANSI
-PUBLIC RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue,
-CmLteTimingInfo frm
-)
-#else
-PUBLIC 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;
CmLList *lnk = lst->first;
RgSchUlHqProcCb *proc;
{
RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
CmLListCp *lst = &ueUl->hqEnt.inUse;
CmLList *lnk = lst->first;
RgSchUlHqProcCb *proc;
- TRC2(rgSCHUhmGetUlProcByTime);
-
while (lnk)
{
proc = (RgSchUlHqProcCb *)(lnk->node);
lnk = lnk->next;
while (lnk)
{
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))
{
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);
}
}
return (proc);
}
}