X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_hdfdd.c;h=09d1c487dfc4b5ae41170a7972fa841d4327b842;hb=a5f35b2204dd87ebe347f11282000852b55810ad;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..09d1c487d 100755 --- a/src/5gnrsch/rg_sch_hdfdd.c +++ b/src/5gnrsch/rg_sch_hdfdd.c @@ -32,22 +32,9 @@ @brief This module handles the Periodic CQI/PMI/RI, SRS, SR and Half Duplex functionality */ -#ifdef LTEMAC_HDFDD -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -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" @@ -58,19 +45,8 @@ static int RLOG_FILE_ID=165; #include "rgm.h" #include "rg_sch.h" #include "rg_sch_cmn.h" -#include "rl_interface.h" -#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,48 +80,32 @@ extern "C" { * @param[in] RgSchUeCb *ue * @param[in] Bool *hdFddEnbl * - * @RETVALUE S16 + * @return S16 * -# ROK * -# RFAILED */ -#ifdef ANSI -PUBLIC S16 rgSCHHdFddUeCfg -( -RgSchCellCb *cellCb, -RgSchUeCb *ueCb, -Bool hdFddEnbl -) -#else /* ANSI */ -PUBLIC S16 rgSCHHdFddUeCfg (cellCb, ueCb, hdFddEnbl) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -Bool hdFddEnbl; -#endif /* ANSI */ +S16 rgSCHHdFddUeCfg(RgSchCellCb *cellCb,RgSchUeCb *ueCb,Bool hdFddEnbl) { - U8 sfi; - TRC3(rgSCHHdFddUeCfg) + uint8_t sfi; - RLOG_ARG2(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHHdFddUeCfg(): UeId =%d hdFddEnbl=%d", + DU_LOG("\nDEBUG --> SCH : rgSCHHdFddUeCfg(): UeId =%d hdFddEnbl=%d", ueCb->ueId, hdFddEnbl); if(ueCb->hdFddEnbld == TRUE) { if (hdFddEnbl == FALSE) { /* Do not allow switch from HD-FDD to FD-FDD configuration */ - RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, - "rgSCHHdFddUeCfg(): HD-FDD to FD-FDD Configuration is not allowed" + DU_LOG("\nERROR --> SCH : rgSCHHdFddUeCfg(): HD-FDD to FD-FDD Configuration is not allowed" "CRNTI:%d",ueCb->ueId); } else { /* If already enabled then it can be second reconfiguration */ - RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, - "rgSCHHdFddUeCfg(): HD-FDD already enabled for this UE" + DU_LOG("\nERROR --> SCH : rgSCHHdFddUeCfg(): HD-FDD already enabled for this UE" "CRNTI:%d",ueCb->ueId); } - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTEMAC_SPS @@ -154,10 +114,9 @@ Bool hdFddEnbl; (ueCb->ul.ulSpsCfg.isUlSpsEnabled == TRUE || ueCb->dl.dlSpsCfg.isDlSpsEnabled == TRUE)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, - "rgSCHHdFddUeCfg(): Could'nt do HDFDD cfg, SPS already configured" + DU_LOG("\nERROR --> SCH : rgSCHHdFddUeCfg(): Could'nt do HDFDD cfg, SPS already configured" "CRNTI:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -178,13 +137,12 @@ Bool hdFddEnbl; } else { - RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId, - "rgSCHHdFddUeCfg(): Could not allocate memory for hd-fdd ueCb" + DU_LOG("\nERROR --> SCH : rgSCHHdFddUeCfg(): Could not allocate memory for hd-fdd ueCb" "CRNTI:%d",ueCb->ueId); - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; }/*rgSCHHdFddUeCfg*/ @@ -208,26 +166,14 @@ Bool hdFddEnbl; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * - * @RETVALUE( S16 + * @return ( S16 * -# ROK * */ -#ifdef ANSI -PUBLIC S16 rgSCHHdFddUeDel -( -RgSchCellCb *cellCb, -RgSchUeCb *ueCb -) -#else /* ANSI */ -PUBLIC S16 rgSCHHdFddUeDel(cellCb, ueCb) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -#endif /* ANSI */ +S16 rgSCHHdFddUeDel(RgSchCellCb *cellCb,RgSchUeCb *ueCb) { - TRC3(rgSCHHdFddUeDel) - RLOG_ARG2(L_DEBUG,DBG_CELLID,cellCb->cellId, - " rgSCHHdFddUeDel(): UeId =%d hdFdd=%x", + DU_LOG("\nDEBUG --> SCH : rgSCHHdFddUeDel(): UeId =%d hdFdd=%x", ueCb->ueId, ueCb->hdFddEnbld); @@ -240,7 +186,7 @@ RgSchUeCb *ueCb; ueCb->hdFddEnbld = FALSE; } - RETVALUE(ROK); + return ROK; } /* rgSCHHdFddUeDel */ @@ -256,35 +202,26 @@ RgSchUeCb *ueCb; * instance updates * for HD FDD UEs * @param[in] RgSchCellCb *cell - * @RETVALUE None + * @return None */ -#ifdef ANSI -PUBLIC Void rgSCHCmnHdFddPtUlMrk -( -RgSchCellCb *cellCb -) -#else /* ANSI */ -PUBLIC Void rgSCHCmnHdFddPtUlMrk (cellCb) -RgSchCellCb *cellCb; -#endif /* ANSI */ +Void rgSCHCmnHdFddPtUlMrk(RgSchCellCb *cellCb) { - U16 sfn; /* System Frame Number */ - U32 pti; /* Index into Periodic table */ - U16 sfi; /* Index into HDFDD state table */ - CmLListCp *cqiLst; - CmLListCp *srsLst; - CmLListCp *srLst; - CmLListCp *riLst; - CmLList *cqiNode; - CmLList *srsNode; - CmLList *srNode; - CmLList *riNode; - CmLteTimingInfo timeInfo; - RgSchUePCqiCb *cqiCb = NULLP; - RgSchUePCqiCb *riCb = NULLP; - - TRC3(rgSCHCmnHdFddPtUlMrk) + uint16_t sfn; /* System Frame Number */ + uint32_t pti; /* Index into Periodic table */ + uint16_t sfi; /* Index into HDFDD state table */ + CmLListCp *cqiLst; + CmLListCp *srsLst; + CmLListCp *srLst; + CmLListCp *riLst; + CmLList *cqiNode; + CmLList *srsNode; + CmLList *srNode; + CmLList *riNode; + CmLteTimingInfo timeInfo; + RgSchUePCqiCb *cqiCb = NULLP; + RgSchUePCqiCb *riCb = NULLP; + timeInfo = cellCb->crntTime; @@ -363,7 +300,7 @@ RgSchCellCb *cellCb; CM_LLIST_NEXT_NODE(riLst, riNode); } - RETVOID; + return; } /* rgSCHCmnHdFddPtUlMrk */ #endif /* ifdef TFU_UPGRADE */ @@ -389,33 +326,18 @@ RgSchCellCb *cellCb; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * - * @RETVALUE None + * @return None * */ -#ifdef ANSI -PUBLIC Void rgSCHCmnHdFddChkUlAllow -( - RgSchCellCb *cellCb, - RgSchUeCb *ueCb, - U8 *allow -) -#else /* ANSI */ -PUBLIC Void rgSCHCmnHdFddChkUlAllow ( cellCb, ueCb, allow) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -U8 *allow; -#endif /* ANSI */ +Void rgSCHCmnHdFddChkUlAllow(RgSchCellCb *cellCb,RgSchUeCb *ueCb,uint8_t *allow) { - U16 sfn; - U16 sfi; + uint16_t sfn; + uint16_t sfi; CmLteTimingInfo timeInfo; RgSchDlSf *sf = NULLP; /* Dl subframe info */ - U8 ulOffset + uint8_t ulOffset - TRC3(rgSCHCmnHdFddChkUlAllow) - - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - " rgSCHCmnHdFddChkUlAllow: ueId=%d ", ueCb->ueId); + DU_LOG("\nDEBUG --> SCH : rgSCHCmnHdFddChkUlAllow: ueId=%d ", ueCb->ueId); *allow = FALSE; @@ -443,8 +365,7 @@ U8 *allow; /* Common channel scheduled */ /* Mark the BCCH/PCCH occasion */ RG_SCH_HDFDD_MARKSTATE(ueCb, RG_SCH_HDFDD_DLDATA, sfn, sfi); - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddChkUlAllow: Already marked for Cmn DL, ueId = %d ", + DU_LOG("\nDEBUG --> SCH : rgSCHCmnHdFddChkUlAllow: Already marked for Cmn DL, ueId = %d ", ueCb->ueId); } if ((ueCb->hdFddCb->subfrm[sfi].sfn == sfn) && @@ -453,10 +374,9 @@ U8 *allow; { /* Downlink scheduled */ *allow = FALSE; - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddChkUlAllow: Already marked for DL, ueId = %d ", + DU_LOG("\nERROR --> SCH : rgSCHCmnHdFddChkUlAllow: Already marked for DL, ueId = %d ", ueCb->ueId); - RETVOID; + return; } /* Validate condition 3 */ @@ -469,10 +389,9 @@ U8 *allow; { /* No place for HARQ feedback */ *allow = FALSE; - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddChkUlAllow: No Place for HARQ, ueId = %d ", + DU_LOG("\nERROR --> SCH : rgSCHCmnHdFddChkUlAllow: No Place for HARQ, ueId = %d ", ueCb->ueId); - RETVOID; + return; } /* Validate condition 4 */ @@ -484,10 +403,9 @@ U8 *allow; ueCb->hdFddCb->subfrm[sfi].subFrmDir == RG_SCH_HDFDD_UL) { *allow = FALSE; - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - " rgSCHCmnHdFddChkUlAllow: No Place for UL grant, ueId = %d ", + DU_LOG("\nERROR --> SCH : rgSCHCmnHdFddChkUlAllow: No Place for UL grant, ueId = %d ", ueCb->ueId); - RETVOID; + return; } /* Validate condition 5 */ @@ -499,10 +417,9 @@ U8 *allow; { /* This subframe may be a switching gaurd time */ *allow = FALSE; - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - " rgSCHCmnHdFddChkUlAllow: No Place for Guard time, ueId = %d ", + DU_LOG("\nERROR --> SCH : rgSCHCmnHdFddChkUlAllow: No Place for Guard time, ueId = %d ", ueCb->ueId); - RETVOID; + return; } /* Adition guard time rule check: Above check is only for PDSCH, lets check @@ -517,16 +434,15 @@ U8 *allow; /* Mark the BCCH/PCCH occasion */ RG_SCH_HDFDD_MARKSTATE(ueCb, RG_SCH_HDFDD_DLDATA, timeInfo.sfn, sfi); *allow = FALSE; - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddChkUlAllow: Already marked for Cmn DL, ueId = %d ", + DU_LOG("\nERROR --> SCH : rgSCHCmnHdFddChkUlAllow: Already marked for Cmn DL, ueId = %d ", ueCb->ueId); - RETVOID; + return; } /* All validation done. Safe to for UL */ *allow = TRUE; - RETVOID; + return; } /* rgSCHCmnHdFddChkUlAllow */ @@ -558,39 +474,29 @@ U8 *allow; * @param[in] RgSchCellCb *cellCb * @param[in] RgSchUeCb *ueCb * @param[in] CmLteTimingInfo *timeInfo - * @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowedi. + * @param[out] uint8_t *allow -- TRUE is allowed or FALSE if no allowedi. * Valdity of this pointer is not done in this function * */ -#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) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -Bool *allow; /* Valdity of this pointer is not done in this function */ -#endif /* ANSI */ { - U16 sfn; - U16 sfi; + uint16_t sfn; + uint16_t sfi; RgSchDlSf *sf = NULLP; /* Dl subframe info */ CmLteTimingInfo timeInfo; CmLteTimingInfo tempTimeInfo; - TRC3(rgSCHCmnHdFddChkDlAllow) - *allow = FALSE; timeInfo = cellCb->crntTime; RGSCH_INCR_SUB_FRAME(timeInfo, RG_SCH_CMN_DL_DELTA); - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddDlSchAll (): ueId=%d ", ueCb->ueId); + DU_LOG("\nDEBUG --> SCH : rgSCHCmnHdFddDlSchAll (): ueId=%d ", ueCb->ueId); /* Also get subframe pointer to fetch Common Ch allocation */ sf = rgSCHUtlSubFrmGet(cellCb, timeInfo); @@ -604,10 +510,9 @@ Bool *allow; /* Valdity of this pointer is not done in this function */ (ueCb->hdFddCb->subfrm[sfi].subFrmDir == RG_SCH_HDFDD_UL)) { /* Uplink scheduled */ - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddChkDlAllow: sf is UL, ueId=%d ", ueCb->ueId); + DU_LOG("\nERROR --> SCH : rgSCHCmnHdFddChkDlAllow: sf is UL, ueId=%d ", ueCb->ueId); *allow = FALSE; - RETVOID; + return; } /* It is not validation, but BCCH/PCCH marking is done here */ @@ -625,11 +530,10 @@ Bool *allow; /* Valdity of this pointer is not done in this function */ (ueCb->hdFddCb->subfrm[sfi].subFrmDir == RG_SCH_HDFDD_UL)) { /* This subframe may be a switching guard time */ - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - " rgSCHCmnHdFddChkDlAllow: Guard time rule not met, ueId=%d ", + DU_LOG("\nERROR --> SCH : rgSCHCmnHdFddChkDlAllow: Guard time rule not met, ueId=%d ", ueCb->ueId); *allow = FALSE; - RETVOID; + return; } /* Validate condition 3 */ @@ -648,8 +552,7 @@ Bool *allow; /* Valdity of this pointer is not done in this function */ /* Common channel scheduled */ /* Do the marking for this subframe */ RG_SCH_HDFDD_MARKSTATE(ueCb, RG_SCH_HDFDD_DLDATA, tempTimeInfo.sfn, sfi); - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddChkDlAllow: Possible systemInfo, ueId=%d ", + DU_LOG("\nDEBUG --> SCH : rgSCHCmnHdFddChkDlAllow: Possible systemInfo, ueId=%d ", ueCb->ueId); } @@ -658,14 +561,13 @@ Bool *allow; /* Valdity of this pointer is not done in this function */ ueCb->hdFddCb->subfrm[sfi].subFrmDir != RG_SCH_HDFDD_UL) { /* No place for HARQ feedback */ - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddChkDlAllow: No place for HARQ feedback, ueId=%d ", + DU_LOG("\nERROR --> SCH : rgSCHCmnHdFddChkDlAllow: No place for HARQ feedback, ueId=%d ", ueCb->ueId); *allow = FALSE; /* Mark this sf as DLCNTRL */ ueCb->hdFddCb->subfrm[sfi].subFrmDir =RG_SCH_HDFDD_DLCNTRL; - RETVOID; + return; } @@ -682,8 +584,7 @@ Bool *allow; /* Valdity of this pointer is not done in this function */ /* Common channel scheduled */ /* Do the marking for this subframe */ RG_SCH_HDFDD_MARKSTATE(ueCb, RG_SCH_HDFDD_DLDATA, tempTimeInfo.sfn, sfi); - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddChkDlAllow: (GT) Possible systemInfo, ueId=%d ", + DU_LOG("\nDEBUG --> SCH : rgSCHCmnHdFddChkDlAllow: (GT) Possible systemInfo, ueId=%d ", ueCb->ueId); } @@ -691,18 +592,17 @@ Bool *allow; /* Valdity of this pointer is not done in this function */ ueCb->hdFddCb->subfrm[sfi].subFrmDir == RG_SCH_HDFDD_DLDATA) { /* No place for HARQ feedback */ - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddChkDlAllow: (GT) No place for HARQ feedback," + DU_LOG("\nERROR --> SCH : rgSCHCmnHdFddChkDlAllow: (GT) No place for HARQ feedback," "ueId=%d ",ueCb->ueId); *allow = FALSE; - RETVOID; + return; } /* First check for any Common channel info is scheduled */ *allow = TRUE; /* All validation done. Safe to for DL */ - RETVOID; + return; } /* rgSCHCmnHdFddChkDlAllow */ @@ -718,31 +618,15 @@ 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 -( -RgSchCellCb *cellCb, -RgSchUeCb *ueCb, -CmLteTimingInfo timeInfo, -Bool *sndNACK -) -#else /* ANSI */ -PUBLIC Void rgSCHCmnHdFddChkNackAllow(cellCb, ueCb, timeInfo, sndNACK) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -CmLteTimingInfo timeInfo; -Bool *sndNACK; -#endif /* ANSI */ +Void rgSCHCmnHdFddChkNackAllow(RgSchCellCb *cellCb,RgSchUeCb *ueCb,CmLteTimingInfo timeInfo,Bool *sndNACK) { RgSchDlSf *sf; CmLteTimingInfo tempTimeInfo; - TRC3(rgSCHCmnHdFddChkNackAllow) - /* Information in timeInfo contains (n+DL_DELTA) th subframe info*/ *sndNACK = FALSE; @@ -759,21 +643,19 @@ Bool *sndNACK; if(RG_SCH_HDFDD_ISCMN_SCHED(sf)) { /* Yes, Cannot send NACK */ - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddChkNackAllow: Cannot send NACK, ueId = %d ", + DU_LOG("\nERROR --> SCH : rgSCHCmnHdFddChkNackAllow: Cannot send NACK, ueId = %d ", ueCb->ueId); *sndNACK = FALSE; } else { /* safe, Send NACK */ - RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId, - "rgSCHCmnHdFddChkNackAllow: NACk can be sent, ueId = %d ", + DU_LOG("\nDEBUG --> SCH : rgSCHCmnHdFddChkNackAllow: NACk can be sent, ueId = %d ", ueCb->ueId); *sndNACK = TRUE; } - RETVOID; + return; } /* rgSCHCmnHdFddChkNackAllow */ @@ -794,31 +676,18 @@ Bool *sndNACK; * @param[in] RgSchCellCb *cellCb * @param[in] RgSchUeCb *ueCb * @param[in] CmLteTimingInfo *timeInfo - * @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowedi. + * @param[out] uint8_t *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 -( -RgSchCellCb *cellCb, -RgSchUeCb *ueCb -) -#else /* ANSI */ -PUBLIC Void rgSCHCmnHdFddUpdULMark ( cellCb, ueCb) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -#endif /* ANSI */ +Void rgSCHCmnHdFddUpdULMark(RgSchCellCb *cellCb,RgSchUeCb *ueCb) { - U16 sfn; - U16 sfi; + uint16_t sfn; + uint16_t sfi; CmLteTimingInfo timeInfo; - U8 ulOffset; - - TRC3(rgSCHCmnHdFddUpdULMark) - + uint8_t ulOffset; ulOffset = RGSCH_PDCCH_PUSCH_DELTA - TFU_CRCIND_ULDELTA + RGSCH_PDCCH_PUSCH_DELTA; @@ -855,7 +724,7 @@ RgSchUeCb *ueCb; RG_SCH_HDFDD_GETSFI(sfi, timeInfo, (ulOffset * -1)); RG_SCH_HDFDD_MARKSTATE(ueCb, RG_SCH_HDFDD_NOSCHD, RG_SCH_HDFDD_INVSFN, sfi); - RETVOID; + return; } /* rgSCHCmnHdFddUpdULMark */ @@ -876,31 +745,19 @@ RgSchUeCb *ueCb; * @param[in] RgSchCellCb *cellCb * @param[in] RgSchUeCb *ueCb * @param[in] CmLteTimingInfo *timeInfo - * @param[out] U8 *allow -- TRUE is allowed or FALSE if no allowed. + * @param[out] uint8_t *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 -( -RgSchCellCb *cellCb, -RgSchUeCb *ueCb -) -#else /* ANSI */ -PUBLIC Void rgSCHCmnHdFddUpdDLMark (cellCb, ueCb) -RgSchCellCb *cellCb; -RgSchUeCb *ueCb; -#endif /* ANSI */ +Void rgSCHCmnHdFddUpdDLMark(RgSchCellCb *cellCb,RgSchUeCb *ueCb) { - U16 sfn; - U16 sfi; + uint16_t sfn; + uint16_t sfi; CmLteTimingInfo timeInfo; - TRC3(rgSCHCmnHdFddUpdDLMark) - timeInfo = cellCb->crntTime; RGSCH_INCR_SUB_FRAME(timeInfo, RG_SCH_CMN_DL_DELTA); @@ -931,7 +788,7 @@ RgSchUeCb *ueCb; RG_SCH_HDFDD_MARKSTATE(ueCb, RG_SCH_HDFDD_DLCNTRL, sfn, sfi); } - RETVOID; + return; } /* rgSCHCmnHdFddUpdDLMark */ @@ -946,31 +803,18 @@ RgSchUeCb *ueCb; * * Processing Steps: * - * @param[out] *sfn U32 + * @param[out] *sfn uint32_t * @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 -( - U16 *sfn, - CmLteTimingInfo timeInfo, - S16 offset -) -#else /* ANSI */ -PUBLIC Void rgSCHHdFddGetSfn (sfn, timeInfo, offset) - U16 *sfn; - CmLteTimingInfo timeInfo; - S16 offset; -#endif /* ANSI */ +Void rgSCHHdFddGetSfn(uint16_t *sfn,CmLteTimingInfo timeInfo,S16 offset) { - U16 tempSfn; + uint16_t 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 @@ -998,7 +842,7 @@ PUBLIC Void rgSCHHdFddGetSfn (sfn, timeInfo, offset) } *sfn = tempSfn; - RETVOID; + return; } /* End of rgSCHHdFddGetSfn */