X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrsch%2Frg_sch_hdfdd.c;h=232428f38fc7d0c26f2b4b7f15a9ba97cfa57ee8;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=df02c21ab1b09a675a6947b37d7a5243731856c3;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_hdfdd.c b/src/5gnrsch/rg_sch_hdfdd.c index df02c21ab..232428f38 100755 --- a/src/5gnrsch/rg_sch_hdfdd.c +++ b/src/5gnrsch/rg_sch_hdfdd.c @@ -39,15 +39,7 @@ static int RLOG_FILE_ID=165; #endif /* header include files -- defines (.h) */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ -#include "gen.h" /* general layer */ -#include "ssi.h" /* system service interface */ -#include "cm_hash.h" /* common hash list */ -#include "cm_llist.h" /* common linked list library */ -#include "cm_err.h" /* common error */ -#include "cm_lte.h" /* common LTE */ +#include "common_def.h" #include "lrg.h" #include "rgr.h" #include "tfu.h" @@ -62,15 +54,6 @@ static int RLOG_FILE_ID=165; #include "rl_common.h" /* header/extern include files (.x) */ -#include "gen.x" /* general layer typedefs */ -#include "ssi.x" /* system services typedefs */ -#include "cm5.x" /* common timers */ -#include "cm_hash.x" /* common hash list */ -#include "cm_lib.x" /* common library */ -#include "cm_llist.x" /* common linked list */ -#include "cm_mblk.x" /* memory management */ -#include "cm_tkns.x" /* common tokens */ -#include "cm_lte.x" /* common tokens */ #include "tfu.x" /* RGU types */ #include "lrg.x" /* layer management typedefs for MAC */ #include "rgr.x" /* layer management typedefs for MAC */ @@ -104,27 +87,26 @@ extern "C" { * @param[in] RgSchUeCb *ue * @param[in] Bool *hdFddEnbl * - * @RETVALUE S16 + * @return S16 * -# ROK * -# RFAILED */ #ifdef ANSI -PUBLIC S16 rgSCHHdFddUeCfg +S16 rgSCHHdFddUeCfg ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, Bool hdFddEnbl ) #else /* ANSI */ -PUBLIC S16 rgSCHHdFddUeCfg (cellCb, ueCb, hdFddEnbl) +S16 rgSCHHdFddUeCfg (cellCb, ueCb, hdFddEnbl) RgSchCellCb *cellCb; RgSchUeCb *ueCb; Bool hdFddEnbl; #endif /* ANSI */ { U8 sfi; - TRC3(rgSCHHdFddUeCfg) RLOG_ARG2(L_DEBUG,DBG_CELLID,cellCb->cellId, "rgSCHHdFddUeCfg(): UeId =%d hdFddEnbl=%d", @@ -145,7 +127,7 @@ Bool hdFddEnbl; "rgSCHHdFddUeCfg(): HD-FDD already enabled for this UE" "CRNTI:%d",ueCb->ueId); } - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS @@ -157,7 +139,7 @@ Bool hdFddEnbl; RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "rgSCHHdFddUeCfg(): Could'nt do HDFDD cfg, SPS already configured" "CRNTI:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -181,10 +163,10 @@ Bool hdFddEnbl; RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, "rgSCHHdFddUeCfg(): Could not allocate memory for hd-fdd ueCb" "CRNTI:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; }/*rgSCHHdFddUeCfg*/ @@ -208,23 +190,22 @@ Bool hdFddEnbl; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * - * @RETVALUE( S16 + * @return ( S16 * -# ROK * */ #ifdef ANSI -PUBLIC S16 rgSCHHdFddUeDel +S16 rgSCHHdFddUeDel ( RgSchCellCb *cellCb, RgSchUeCb *ueCb ) #else /* ANSI */ -PUBLIC S16 rgSCHHdFddUeDel(cellCb, ueCb) +S16 rgSCHHdFddUeDel(cellCb, ueCb) RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif /* ANSI */ { - TRC3(rgSCHHdFddUeDel) RLOG_ARG2(L_DEBUG,DBG_CELLID,cellCb->cellId, " rgSCHHdFddUeDel(): UeId =%d hdFdd=%x", @@ -240,7 +221,7 @@ RgSchUeCb *ueCb; ueCb->hdFddEnbld = FALSE; } - RETVALUE(ROK); + return ROK; } /* rgSCHHdFddUeDel */ @@ -256,16 +237,16 @@ RgSchUeCb *ueCb; * instance updates * for HD FDD UEs * @param[in] RgSchCellCb *cell - * @RETVALUE None + * @return None */ #ifdef ANSI -PUBLIC Void rgSCHCmnHdFddPtUlMrk +Void rgSCHCmnHdFddPtUlMrk ( RgSchCellCb *cellCb ) #else /* ANSI */ -PUBLIC Void rgSCHCmnHdFddPtUlMrk (cellCb) +Void rgSCHCmnHdFddPtUlMrk (cellCb) RgSchCellCb *cellCb; #endif /* ANSI */ { @@ -284,7 +265,6 @@ RgSchCellCb *cellCb; RgSchUePCqiCb *cqiCb = NULLP; RgSchUePCqiCb *riCb = NULLP; - TRC3(rgSCHCmnHdFddPtUlMrk) timeInfo = cellCb->crntTime; @@ -389,18 +369,18 @@ RgSchCellCb *cellCb; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * - * @RETVALUE None + * @return None * */ #ifdef ANSI -PUBLIC Void rgSCHCmnHdFddChkUlAllow +Void rgSCHCmnHdFddChkUlAllow ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, U8 *allow ) #else /* ANSI */ -PUBLIC Void rgSCHCmnHdFddChkUlAllow ( cellCb, ueCb, allow) +Void rgSCHCmnHdFddChkUlAllow ( cellCb, ueCb, allow) RgSchCellCb *cellCb; RgSchUeCb *ueCb; U8 *allow; @@ -412,8 +392,6 @@ U8 *allow; RgSchDlSf *sf = NULLP; /* Dl subframe info */ U8 ulOffset - TRC3(rgSCHCmnHdFddChkUlAllow) - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, " rgSCHCmnHdFddChkUlAllow: ueId=%d ", ueCb->ueId); @@ -563,14 +541,14 @@ U8 *allow; * */ #ifdef ANSI -PUBLIC Void rgSCHCmnHdFddChkDlAllow +Void rgSCHCmnHdFddChkDlAllow ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, Bool *allow /* Valdity of this pointer is not done in this function */ ) #else /* ANSI */ -PUBLIC Void rgSCHCmnHdFddChkDlAllow ( cellCb, ueCb, allow) +Void rgSCHCmnHdFddChkDlAllow ( cellCb, ueCb, allow) RgSchCellCb *cellCb; RgSchUeCb *ueCb; Bool *allow; /* Valdity of this pointer is not done in this function */ @@ -582,8 +560,6 @@ Bool *allow; /* Valdity of this pointer is not done in this function */ CmLteTimingInfo timeInfo; CmLteTimingInfo tempTimeInfo; - TRC3(rgSCHCmnHdFddChkDlAllow) - *allow = FALSE; timeInfo = cellCb->crntTime; @@ -718,12 +694,12 @@ Bool *allow; /* Valdity of this pointer is not done in this function */ * * @param[in] RgSchUeCb *ue * - * @RETVALUE None + * @return None * */ #ifdef ANSI -PUBLIC Void rgSCHCmnHdFddChkNackAllow +Void rgSCHCmnHdFddChkNackAllow ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, @@ -731,7 +707,7 @@ CmLteTimingInfo timeInfo, Bool *sndNACK ) #else /* ANSI */ -PUBLIC Void rgSCHCmnHdFddChkNackAllow(cellCb, ueCb, timeInfo, sndNACK) +Void rgSCHCmnHdFddChkNackAllow(cellCb, ueCb, timeInfo, sndNACK) RgSchCellCb *cellCb; RgSchUeCb *ueCb; CmLteTimingInfo timeInfo; @@ -741,8 +717,6 @@ Bool *sndNACK; RgSchDlSf *sf; CmLteTimingInfo tempTimeInfo; - TRC3(rgSCHCmnHdFddChkNackAllow) - /* Information in timeInfo contains (n+DL_DELTA) th subframe info*/ *sndNACK = FALSE; @@ -797,16 +771,16 @@ Bool *sndNACK; * @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowedi. * Valdity of this pointer is not done in this function. * - * @RETVALUE None + * @return None */ #ifdef ANSI -PUBLIC Void rgSCHCmnHdFddUpdULMark +Void rgSCHCmnHdFddUpdULMark ( RgSchCellCb *cellCb, RgSchUeCb *ueCb ) #else /* ANSI */ -PUBLIC Void rgSCHCmnHdFddUpdULMark ( cellCb, ueCb) +Void rgSCHCmnHdFddUpdULMark ( cellCb, ueCb) RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif /* ANSI */ @@ -817,9 +791,6 @@ RgSchUeCb *ueCb; CmLteTimingInfo timeInfo; U8 ulOffset; - TRC3(rgSCHCmnHdFddUpdULMark) - - ulOffset = RGSCH_PDCCH_PUSCH_DELTA - TFU_CRCIND_ULDELTA + RGSCH_PDCCH_PUSCH_DELTA; RG_SCH_ADD_TO_CRNT_TIME(cellCb->crntTime, timeInfo, ulOffset) @@ -879,17 +850,17 @@ RgSchUeCb *ueCb; * @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowed. * Valdity of this pointer is not done in this function * - * @RETVALUE None + * @return None */ #ifdef ANSI -PUBLIC Void rgSCHCmnHdFddUpdDLMark +Void rgSCHCmnHdFddUpdDLMark ( RgSchCellCb *cellCb, RgSchUeCb *ueCb ) #else /* ANSI */ -PUBLIC Void rgSCHCmnHdFddUpdDLMark (cellCb, ueCb) +Void rgSCHCmnHdFddUpdDLMark (cellCb, ueCb) RgSchCellCb *cellCb; RgSchUeCb *ueCb; #endif /* ANSI */ @@ -899,8 +870,6 @@ RgSchUeCb *ueCb; U16 sfi; CmLteTimingInfo timeInfo; - TRC3(rgSCHCmnHdFddUpdDLMark) - timeInfo = cellCb->crntTime; RGSCH_INCR_SUB_FRAME(timeInfo, RG_SCH_CMN_DL_DELTA); @@ -950,18 +919,18 @@ RgSchUeCb *ueCb; * @param[in] timeInfo timing information subframe of interest * @param[in] offsest Offest with w.r.t which SFN has to be determined * - * @RETVALUE None + * @return None */ #ifdef ANSI -PUBLIC Void rgSCHHdFddGetSfn +Void rgSCHHdFddGetSfn ( U16 *sfn, CmLteTimingInfo timeInfo, S16 offset ) #else /* ANSI */ -PUBLIC Void rgSCHHdFddGetSfn (sfn, timeInfo, offset) +Void rgSCHHdFddGetSfn (sfn, timeInfo, offset) U16 *sfn; CmLteTimingInfo timeInfo; S16 offset; @@ -970,7 +939,6 @@ PUBLIC Void rgSCHHdFddGetSfn (sfn, timeInfo, offset) U16 tempSfn; S16 tempSfCount; - TRC3(rgSCHHdFddGetSfn) if(((S16)(timeInfo.subframe) + offset) >= RGSCH_NUM_SUB_FRAMES) { /* Increament to number of times of SFNs that can be possible