/* ADD Changes for Downlink UE Timing Optimization */
#ifndef LTEMAC_DLUE_TMGOPTMZ
-PRIVATE S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb *cellCb,
+static S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb *cellCb,
RgErrInfo *err));
#else
-PUBLIC S16 rgTOMUtlProcDlSf ARGS((RgDlSf *dlSf, RgCellCb *cellCb,
+S16 rgTOMUtlProcDlSf ARGS((RgDlSf *dlSf, RgCellCb *cellCb,
RgErrInfo *err));
#endif
-PRIVATE S16 rgTOMProcCrntiCEInDatInd ARGS((
+static S16 rgTOMProcCrntiCEInDatInd ARGS((
RgMacPdu *pdu,
RgUeCb *prevUeCb,
RgCellCb *cellCb,
TfuDatInfo *datInfo,
RgInfCeInfo *ceInfo,
-U16 slot
+uint16_t slot
));
-PRIVATE S16 rgTOMProcCCCHSduInDatInd ARGS((
+static S16 rgTOMProcCCCHSduInDatInd ARGS((
RgMacPdu *pdu,
RgUeCb *prevUeCb,
RgCellCb *cellCb,
TfuDatInfo *datInfo,
RgInfCeInfo *ceInfo,
-U16 slot
+uint16_t slot
));
-PUBLIC S16 rgHndlFlowCntrl
+S16 rgHndlFlowCntrl
(
RgCellCb *cell,
RgInfSfAlloc *sfInfo
);
-EXTERN S16 RgUiRguFlowCntrlInd(Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd);
+S16 RgUiRguFlowCntrlInd(Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd);
#ifdef EMTC_ENABLE
-EXTERN S16 rgEmtcHndl(RgCellCb *cell,RgInfSfAlloc *sfInfo);
-EXTERN S16 rgTOMEmtcUtlFillDatReqPdus(TfuDatReqInfo *datInfo, RgDlSf *dlSf, RgCellCb *cell, RgErrInfo *err);
-EXTERN Void rgTOMEmtcRlsSf(RgDlSf *dlSf);
+S16 rgEmtcHndl(RgCellCb *cell,RgInfSfAlloc *sfInfo);
+S16 rgTOMEmtcUtlFillDatReqPdus(TfuDatReqInfo *datInfo, RgDlSf *dlSf, RgCellCb *cell, RgErrInfo *err);
+Void rgTOMEmtcRlsSf(RgDlSf *dlSf);
#endif
#ifdef LTE_L2_MEAS
-PRIVATE Void rgTOML2MCompileActiveLCs ARGS
+static Void rgTOML2MCompileActiveLCs ARGS
((
RgCellCb *cellCb,
RgUeCb *ueCb,
RgMacPdu *pdu,
RgInfCeInfo *ceInfo
));
-PRIVATE S16 rgTOMUtlL2MStoreBufSz ARGS
+static S16 rgTOMUtlL2MStoreBufSz ARGS
((
RgUeCb *ueCb,
RgInfCeInfo *ceInfo
));
-PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo ARGS
+static S16 rgTomUtlPrepareL2MUlThrpInfo ARGS
((
RgCellCb *cellCb,
RgUeCb *ueCb,
TB, which is not guaranteed if higher Range values are used */
/* Note: taking value 10 for BSR index 1 */
#ifndef MAC_5GTF_UPDATE
-PRIVATE U32 rgLwrBsrTbl[64] = {
+static uint32_t rgLwrBsrTbl[64] = {
0, 10, 10, 12, 14, 17, 19, 22, 26,
31, 36, 42, 49, 57, 67, 78, 91,
107, 125, 146, 171, 200, 234, 274, 321,
};
#else
-PRIVATE U32 rgLwrBsrTbl[64] = {
+static uint32_t rgLwrBsrTbl[64] = {
0,10,13,16,19,23,29,35,43,53,65,80,98,120,147,181,223,274,337,414,
509,625,769,945,1162,1429,1757,2161,2657,3267,4017,4940,6074,7469,
9185,11294,13888,17077,20999,25822,31752,39045,48012,59039,72598,
}
/* global variables */
-PUBLIC U32 rgUlrate_tfu;
+uint32_t rgUlrate_tfu;
#ifdef EMTC_ENABLE
-EXTERN U32 grgUlrate_tfu;
+uint32_t grgUlrate_tfu;
#endif
/** @brief This function fills the PDSCH data of a downlink subframe
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PRIVATE S16 rgTOMUtlFillDatReqPdus
-(
- TfuDatReqInfo *datInfo,
- RgDlSf *dlSf,
- RgCellCb *cellCb,
- RgErrInfo *err
- )
-#else
-PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err)
- TfuDatReqInfo *datInfo;
- RgDlSf *dlSf;
- RgCellCb *cellCb;
- RgErrInfo *err;
-#endif
+static S16 rgTOMUtlFillDatReqPdus (TfuDatReqInfo *datInfo,RgDlSf *dlSf,RgCellCb *cellCb, RgErrInfo *err)
{
S16 ret;
TfuDatReqPduInfo *datReq=NULLP;
/* Moving node declaration to limited scope for optimization */
RgDlHqProcCb *hqCb;
- U8 idx;
+ uint8_t idx;
Inst inst = cellCb->macInst - RG_INST_START;
- TRC2(rgTOMUtlFillDatReqPdus)
/* first lets send the BCCH data down to PHY */
if (dlSf->bcch.tb != NULLP)
*/
/* ADD Changes for Downlink UE Timing Optimization */
#ifndef LTEMAC_DLUE_TMGOPTMZ
-#ifdef ANSI
-PRIVATE S16 rgTOMUtlProcDlSf
-(
- RgDlSf *dlSf,
- RgCellCb *cellCb,
- RgErrInfo *err
- )
-#else
-PRIVATE S16 rgTOMUtlProcDlSf (dlSf, cellCb, err)
- RgDlSf *dlSf;
- RgCellCb *cellCb;
- RgErrInfo *err;
-#endif
+static S16 rgTOMUtlProcDlSf(RgDlSf *dlSf,RgCellCb *cellCb,RgErrInfo *err)
#else
-#ifdef ANSI
-PUBLIC S16 rgTOMUtlProcDlSf
-(
- RgDlSf *dlSf,
- RgCellCb *cellCb,
- RgErrInfo *err
- )
-#else
-PUBLIC S16 rgTOMUtlProcDlSf (dlSf, cellCb, err)
- RgDlSf *dlSf;
- RgCellCb *cellCb;
- RgErrInfo *err;
-#endif
+S16 rgTOMUtlProcDlSf(RgDlSf *dlSf,RgCellCb *cellCb,RgErrInfo *err)
#endif
{
S16 ret;
TfuDatReqInfo *datInfo;
Inst inst = cellCb->macInst - RG_INST_START;
- TRC2(rgTOMUtlProcDlSf);
/* Fill Data Request Info from scheduler to PHY */
if ((ret = rgAllocEventMem(inst,(Ptr *)&datInfo,
if((datInfo->pdus.count) || (datInfo->bchDat.pres == TRUE))
{
/* sending the data to Phy */
- if (rgLIMTfuDatReq(inst,datInfo) != ROK)
+ //if (rgLIMTfuDatReq(inst,datInfo) != ROK)
{
RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to send data info for cell");
}
return ROK;
} /* end of */
-U32 rgMacGT;
+uint32_t rgMacGT;
/** @brief This function allocates the RgMacPdu that will be populated by DEMUX
* with the SubHeaders list and the values of the Control elements.
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PRIVATE S16 rgTOMUtlAllocPduEvnt
-(
-Inst inst,
- RgMacPdu **pdu
- )
-#else
-PRIVATE S16 rgTOMUtlAllocPduEvnt (inst,pdu)
-Inst inst;
- RgMacPdu **pdu;
-#endif
+static S16 rgTOMUtlAllocPduEvnt (Inst inst,RgMacPdu **pdu)
{
Mem evntMem;
RgUstaDgn dgn; /* Alarm diagnostics structure */
- VOLATILE U32 startTime=0;
+ volatile uint32_t startTime=0;
- TRC2(rgTOMUtlAllocPduEvnt);
evntMem.region = rgCb[inst].rgInit.region;
evntMem.pool = rgCb[inst].rgInit.pool;
* @param [in] Bool *error
* @return
*/
-#ifdef ANSI
-PRIVATE Void rgTOMUtlFreePduEvnt
-(
- RgMacPdu *pdu,
- Bool error
- )
-#else
-PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error)
- RgMacPdu *pdu;
- Bool error;
-#endif
+static Void rgTOMUtlFreePduEvnt( RgMacPdu *pdu,Bool error)
{
RgMacSdu *sdu;
CmLList *node;
- TRC2(rgTOMUtlFreePduEvnt);
/* Steps of freeing up the PDU.
* 1. loop through the subHdrLst and free up all the buffers.
* 2. free up the whole event
}
}
RG_FREE_MEM(pdu);
- RETVOID;
+ return;
} /* end of rgTOMUtlFreePduEvnt */
/** @brief This function allocates the RgMacPdu that will be populated by DEMUX
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PRIVATE S16 rgTOMInfAllocPduEvnt
-(
-Inst inst,
-RgInfSfDatInd **sfInfo
- )
-#else
-PRIVATE S16 rgTOMInfAllocPduEvnt (inst,sfInfo)
-Inst inst;
-RgInfSfDatInd **sfInfo;
-#endif
+static S16 rgTOMInfAllocPduEvnt (Inst inst,RgInfSfDatInd **sfInfo)
{
Mem evntMem;
RgUstaDgn dgn; /* Alarm diagnostics structure */
- VOLATILE U32 startTime=0;
+ volatile uint32_t startTime=0;
- TRC2(rgTOMInfAllocPduEvnt);
evntMem.region = rgCb[inst].rgInit.region;
evntMem.pool = rgCb[inst].rgInit.pool;
* @param [in] Bool *error
* @return
*/
-#ifdef ANSI
-PRIVATE Void rgTOMInfFreePduEvnt
-(
-RgInfSfDatInd *sfInfo
- )
-#else
-PRIVATE Void rgTOMInfFreePduEvnt (sfInfo)
-RgInfSfDatInd *sfInfo;
-#endif
+static Void rgTOMInfFreePduEvnt(RgInfSfDatInd *sfInfo)
{
- TRC2(rgTOMInfFreePduEvnt);
RG_FREE_MEM(sfInfo);
- RETVOID;
+ return;
} /* end of rgTOMUtlFreePduEvnt */
#ifdef LTE_L2_MEAS
* @param [out] RgRguDedDatInd *dDatInd
* @return
*/
-#ifdef ANSI
-PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo
-(
- RgCellCb *cellCb,
- RgUeCb *ueCb,
- RgRguDedDatInd *dDatInd
- )
-#else
-PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd)
- RgCellCb *cellCb;
- RgUeCb *ueCb;
- RgRguDedDatInd *dDatInd;
-#endif
+static S16 rgTomUtlPrepareL2MUlThrpInfo(RgCellCb *cellCb,RgUeCb *ueCb,RgRguDedDatInd *dDatInd)
{
- U8 lcId;
- U8 lcgId;
- U8 loop;
- TRC2(rgTomUtlPrepareL2MUlThrpInfo);
+ uint8_t lcId;
+ uint8_t lcgId;
+ uint8_t loop;
dDatInd->burstInd = RGU_L2M_UL_BURST_END;
for(loop=0;loop<dDatInd->numLch;loop++)
* @param [in] RgUeCb *ueCb
* @param [in] CmLteRnti rnti
* @param [in] RgMacPdu *pdu
- * @param [out] U32 *lcgBytes
+ * @param [out] uint32_t *lcgBytes
*
* @return S16
* -# ROK
RgUeCb *glblueCb5;
#ifdef LTEMAC_SPS
-#ifdef ANSI
-PRIVATE S16 rgTOMUtlProcMsg
+static S16 rgTOMUtlProcMsg
(
- RgCellCb *cellCb,
- RgUeCb *ueCb,
- RgMacPdu *pdu,
- Bool isSpsRnti,
- Bool *spsToBeActvtd,
- U16 *sduSize,
- U16 slot,
- U32 *lcgBytes
- )
-#else
-PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,spsToBeActvtd,sduSize, slot, lcgBytes)
- RgCellCb *cellCb;
- RgUeCb *ueCb;
- RgMacPdu *pdu;
- Bool isSpsRnti;
- Bool *spsToBeActvtd;
- U16 *sduSize;
- U16 slot;
- U32 *lcgBytes;
-#endif
+RgCellCb *cellCb,
+RgUeCb *ueCb,
+RgMacPdu *pdu,
+Bool isSpsRnti,
+Bool *spsToBeActvtd,
+uint16_t *sduSize,
+uint16_t slot,
+uint32_t *lcgBytes
+)
#else /* LTEMAC_SPS */
-#ifdef ANSI
-PRIVATE S16 rgTOMUtlProcMsg
+static S16 rgTOMUtlProcMsg
(
- RgCellCb *cellCb,
- RgUeCb *ueCb,
- RgMacPdu *pdu,
- U16 slot,
- U32 *lcgBytes
- )
-#else
-PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes)
- RgCellCb *cellCb;
- RgUeCb *ueCb;
- RgMacPdu *pdu;
- U16 slot;
- U32 *lcgByes;
-#endif
+RgCellCb *cellCb,
+RgUeCb *ueCb,
+RgMacPdu *pdu,
+uint16_t slot,
+uint32_t *lcgBytes
+)
#endif
{
Inst inst = cellCb->macInst - RG_INST_START;
#endif
#ifdef LTE_L2_MEAS
- U8 idx1;
- U8 idx2;
- RgUlSf *ulSf;
- U16 totalBytesRcvd = 0;
- U16 sduLen[RGU_MAX_LC] = {0};
- U8 qciVal[RGU_MAX_LC] = {0};
- U8 numPrb = 0;
+ uint8_t idx1;
+ uint8_t idx2;
+ RgUlSf *ulSf;
+ uint16_t totalBytesRcvd = 0;
+ uint16_t sduLen[RGU_MAX_LC] = {0};
+ uint8_t qciVal[RGU_MAX_LC] = {0};
+ uint8_t numPrb = 0;
#endif
- U8 lcgId;
- MsgLen bufSz;
+ uint8_t lcgId;
+ MsgLen bufSz;
/* Moved outside of LTE_L2_MEAS
* scope as this pointer will now be used to
ulLcCb = NULLP;
- TRC2(rgTOMUtlProcMsg)
#ifndef LTE_L2_MEAS
UNUSED(slot);
return RFAILED;
}
dDatInd = (RgRguDedDatInd *)elem;
- cmMemset((U8 *)dDatInd, 0x00, sizeof(RgRguDedDatInd));
+ memset(dDatInd, 0x00, sizeof(RgRguDedDatInd));
#endif
dDatInd->cellId = cellCb->cellId;
dDatInd->rnti = ueCb->ueId;
}
#ifdef RLC_STA_PROC_IN_MAC/* RLC Status PDU Processing */
{
- extern S16 kwProcDlStatusPdu(Pst *udxPst,SuId suId,
+ S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId,
CmLteCellId cellId,CmLteRnti rnti,CmLteLcId lcId,Buffer *rlcSdu);
- if(ROK == kwProcDlStatusPdu(&(cellCb->rguDlSap->sapCfg.sapPst),
+ if(ROK == rlcProcDlStatusPdu(&(cellCb->rguDlSap->sapCfg.sapPst),
cellCb->rguDlSap->sapCfg.suId,
cellCb->cellId,ueCb->ueId,sdu->lcId,sdu->mBuf))
{
return RFAILED;
}
dDatInd = (RgRguDedDatInd *)elem;
- cmMemset((U8 *)dDatInd, 0x00, sizeof(RgRguDedDatInd));
+ memset(dDatInd, 0x00, sizeof(RgRguDedDatInd));
#endif
dDatInd->cellId = cellCb->cellId;
dDatInd->rnti = ueCb->ueId;
{
ueCb->ul.explRelCntr = 0;
/* Indicate scheduler for explicit release */
- cmMemset((U8*)&schPst1, (U8)0, sizeof(Pst));
+ memset(&schPst1, 0, sizeof(Pst));
rgGetPstToInst(&schPst1,inst, cellCb->schInstMap.schInst);
//TODO: commented for compilation without SCH
#if 0
* @return
*/
#ifdef LTEMAC_SPS
-#ifdef ANSI
-PRIVATE S16 rgTOMUtlInsSchInfo
+static S16 rgTOMUtlInsSchInfo
(
RgMacPdu *pdu,
RgInfSfDatInd *sfInfo,
-RgInfCeInfo *ceInfo,
-CmLteRnti rnti,
-Bool spsToBeActvtd,
-U16 sduSize,
-U32 *lcgBytes
+RgInfCeInfo *ceInfo,
+CmLteRnti rnti,
+Bool spsToBeActvtd,
+uint16_t sduSize,
+uint32_t *lcgBytes
)
#else
-PRIVATE S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti,spsToBeActvtd,sduSize, lcgBytes)
-RgMacPdu *pdu;
-RgInfSfDatInd *sfInfo;
-RgInfCeInfo *ceInfo;
-CmLteRnti rnti;
-Bool spsToBeActvtd;
-U16 sduSize;
-U32 *lcgBytes;
-#endif
-
-#else
-#ifdef ANSI
-PRIVATE S16 rgTOMUtlInsSchInfo
+static S16 rgTOMUtlInsSchInfo
(
RgMacPdu *pdu,
RgInfSfDatInd *sfInfo,
RgInfCeInfo *ceInfo,
CmLteRnti rnti,
-U32 *lcgBytes
+uint32_t *lcgBytes
)
-#else
-PRIVATE S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti, lcgBytes)
-RgMacPdu *pdu;
-RgInfSfDatInd *sfInfo;
-RgInfCeInfo *ceInfo;
-CmLteRnti rnti;
-U32 *lcgBytes;
-#endif
#endif
{
S16 ret;
RgInfUeDatInd *ueInfo;
- U32 lcgId = 0;
- U32 idx = 0;
+ uint32_t lcgId = 0;
+ uint32_t idx = 0;
- TRC2(rgTOMUtlInsSchInfo);
RG_TOM_INF_ALLOC(sfInfo, sizeof(RgInfUeDatInd), ueInfo, ret);
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PUBLIC S16 rgTOMDatInd
-(
-Inst inst,
- TfuDatIndInfo *datInd
- )
-#else
-PUBLIC S16 rgTOMDatInd(inst,datInd)
-Inst inst;
- TfuDatIndInfo *datInd;
-#endif
+S16 rgTOMDatInd(Inst inst, TfuDatIndInfo *datInd)
{
S16 ret = ROK;
RgErrInfo err;
CmLList *node;
TfuDatInfo *datInfo;
RgLowSapCb *tfuSap;
- U16 slot;
+ uint16_t slot;
#ifdef LTEMAC_SPS
Bool isSpsRnti=FALSE;
Pst schPst1;
// RgInfSpsRelInfo relInfo;
- Bool spsToBeActvtd = FALSE;
- U16 sduSize = 0;
+ Bool spsToBeActvtd = FALSE;
+ uint16_t sduSize = 0;
#endif
- U32 lcgBytes[RGINF_MAX_LCG_PER_UE];
+ uint32_t lcgBytes[RGINF_MAX_LCG_PER_UE];
- TRC2(rgTOMDatInd);
#ifdef STUB_TTI_HANDLING_5GTF
node = datInd->datIndLst.first;
for (;node; node=node->next)
return(RFAILED);
#endif
- cmMemset((U8 *)&lcgBytes, 0, sizeof(lcgBytes));
+ memset(&lcgBytes, 0, sizeof(lcgBytes));
tfuSap = &(rgCb[inst].tfuSap);
ueCb = NULLP;
{
datInfo = (TfuDatInfo*)node->node;
{
- //extern U32 ulrate_tfu;
+ //uint32_t ulrate_tfu;
MsgLen len;
SFndLenMsg(datInfo->mBuf, &len);
#ifdef STUB_TTI_HANDLING_5GTF
if (ueCb->ul.implRelCntr == ueCb->ul.implRelCnt)
{
/* Indicate scheduler for implicit release */
- cmMemset((U8*)&schPst1, (U8)0, sizeof(Pst));
+ memset(&schPst1, 0, sizeof(Pst));
rgGetPstToInst(&schPst1,inst, cellCb->schInstMap.schInst);
ueCb->ul.implRelCntr = 0;
rgTOML2MCompileActiveLCs (cellCb, ueCb, pdu, &ceInfo);
#endif
#ifdef LTEMAC_SPS
- if ((ret = rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,&spsToBeActvtd,&sduSize, slot, (U32 *)&lcgBytes)) != ROK)
+ if ((ret = rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,&spsToBeActvtd,&sduSize, slot, (uint32_t *)&lcgBytes)) != ROK)
#else
- if ((ret = rgTOMUtlProcMsg (cellCb, ueCb, pdu, slot, (U32 *)&lcgBytes)) != ROK)
+ if ((ret = rgTOMUtlProcMsg (cellCb, ueCb, pdu, slot, (uint32_t *)&lcgBytes)) != ROK)
#endif /* LTEMAC_SPS */
{
rgTOMUtlFreePduEvnt (pdu, TRUE);
#ifdef LTEMAC_SPS
- if(rgTOMUtlInsSchInfo(pdu, sfInfo, &ceInfo, datInfo->rnti,spsToBeActvtd,sduSize, (U32 *)&lcgBytes) != ROK)
+ if(rgTOMUtlInsSchInfo(pdu, sfInfo, &ceInfo, datInfo->rnti,spsToBeActvtd,sduSize, (uint32_t *)&lcgBytes) != ROK)
#else
- if(rgTOMUtlInsSchInfo(pdu, sfInfo, &ceInfo, datInfo->rnti, (U32 *)&lcgBytes) != ROK)
+ if(rgTOMUtlInsSchInfo(pdu, sfInfo, &ceInfo, datInfo->rnti, (uint32_t *)&lcgBytes) != ROK)
#endif
{
#endif
/* RRM_RBC_X */
/* Update PRB used for all GBR QCIs to scheduler */
- cmMemcpy((U8*) &sfInfo->qcisUlPrbCnt[0],
- (U8*) &cellCb->qcisUlPrbCnt[0],
- (RGM_MAX_QCI_REPORTS * sizeof(U32)));
+ memcpy( &sfInfo->qcisUlPrbCnt[0],
+ &cellCb->qcisUlPrbCnt[0],
+ (RGM_MAX_QCI_REPORTS * sizeof(uint32_t)));
/* clear the cellCb ul prb value */
- cmMemset((U8*)&cellCb->qcisUlPrbCnt[0], 0,
- (RGM_MAX_QCI_REPORTS * sizeof(U32)));
+ memset(&cellCb->qcisUlPrbCnt[0], 0,
+ (RGM_MAX_QCI_REPORTS * sizeof(uint32_t)));
/* RRM_RBC_Y */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgHndlCmnChnl
+static S16 rgHndlCmnChnl
(
RgCellCb *cell,
CmLteTimingInfo timingInfo,
RgInfCmnLcInfo *cmnLcInfo,
RgErrInfo *err
)
-#else
-PRIVATE S16 rgHndlCmnChnl(cell, timingInfo, cmnLcInfo, err)
-RgCellCb *cell;
-CmLteTimingInfo timingInfo;
-RgInfCmnLcInfo *cmnLcInfo;
-RgErrInfo *err;
-#endif
{
#if (ERRCLASS & ERRCLS_DEBUG)
RgPcchLcCb *pcch;
RgDlSf *dlSf;
Inst inst = cell->macInst - RG_INST_START;
- TRC2(rgHndlCmnChnl)
dlSf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgHndlSchdUe
+static S16 rgHndlSchdUe
(
RgCellCb *cell,
CmLteTimingInfo timingInfo,
RgInfUeInfo *ueInfo,
RgErrInfo *err
)
-#else
-PRIVATE S16 rgHndlSchdUe(cell, timingInfo, ueInfo, err) /* laa_ut_fix */
-RgCellCb *cell;
-CmLteTimingInfo timingInfo;
-RgInfUeInfo *ueInfo;
-RgErrInfo *err;
-#endif
{
- TRC2(rgHndlSchdUe);
if(NULLP == ueInfo->allocInfo)
{
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgHndlUlUeInfo
+static S16 rgHndlUlUeInfo
(
RgCellCb *cell,
CmLteTimingInfo timingInfo,
RgInfUlUeInfo *ueInfo
)
-#else
-PRIVATE S16 rgHndlUlUeInfo(cell, timingInfo, ueInfo)
-RgCellCb *cell;
-CmLteTimingInfo timingInfo;
-RgInfUlUeInfo *ueInfo;
-#endif
{
Inst inst = cell->macInst - RG_INST_START;
- U8 idx;
+ uint8_t idx;
RgUlSf *ulSf;
S16 ret;
- TRC2(rgHndlUlUeInfo)
ulSf = &cell->ulSf[(timingInfo.slot % RGSCH_NUM_SUB_FRAMES)];
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC Void rgTOMRlsSf
-(
-Inst inst,
-RgDlSf *dlSf
-)
-#else
-PUBLIC Void rgTOMRlsSf(dlSf)
-Inst inst;
-RgDlSf *dlSf;
-#endif
+Void rgTOMRlsSf(Inst inst,RgDlSf *dlSf)
{
- U8 idx;
+ uint8_t idx;
- TRC2(rgTOMRlsSf)
if(dlSf->txDone == FALSE)
{
RLC-MAC */
dlSf->statIndDone = FALSE;
#endif
- if (dlSf->tbs.count)
- {
- U8 i;
+ if (dlSf->tbs.count)
+ {
+ uint8_t i;
CmLList *node;
RgDlHqProcCb *hqP;
- RGDBGERRNEW(inst, (rgPBuf(inst),
+ RGDBGERRNEW(inst, (rgPBuf(inst),
"Error Stale TBs in Subframes TBS list\n"));
node = dlSf->tbs.first;
- while(node)
- {
- hqP = (RgDlHqProcCb*)node->node;
- node = node->next;
+ while(node)
+ {
+ hqP = (RgDlHqProcCb*)node->node;
+ node = node->next;
if (hqP)
{
for(i=0;i< RG_MAX_TB_PER_UE;i++)
cmLListInit(&dlSf->tbs);
dlSf->txDone = FALSE;
dlSf->numRaRsp = 0;
- RETVOID;
+ return;
}
/**
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 rgHndlFlowCntrl
-(
-RgCellCb *cell,
-RgInfSfAlloc *sfInfo
-)
-#else
-PUBLIC S16 rgHndlFlowCntrl(cell, sfInfo)
-RgCellCb *cell;
-RgInfSfAlloc *sfInfo;
-#endif
+S16 rgHndlFlowCntrl(RgCellCb *cell,RgInfSfAlloc *sfInfo)
{
RguFlowCntrlInd *flowCntrlInd;
Pst *pst;
- U32 ueIdx;
- U32 lcIdx;
- TRC3(rgHndlFlowCntrl);
+ uint32_t ueIdx;
+ uint32_t lcIdx;
pst = &cell->rguDlSap->sapCfg.sapPst;
/* flowCntrlInd is alloced in cell init time and will be re-used throughout */
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PUBLIC S16 RgSchMacSfAllocReq
-(
-Pst *pst,
-RgInfSfAlloc *sfInfo
-)
-#else
-PUBLIC S16 RgSchMacSfAllocReq(pst, sfInfo)
-Pst *pst;
-RgInfSfAlloc *sfInfo;
-#endif
+S16 RgSchMacSfAllocReq(Pst *pst,RgInfSfAlloc *sfInfo)
{
RgCellCb *cell;
RgDlSf *dlSf;
RgErrInfo err;
- VOLATILE U32 startTime=0;
+ volatile uint32_t startTime=0;
Inst inst;
- TRC2(RgSchMacSfAllocReq)
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgTOMProcCrntiCEInDatInd
+static S16 rgTOMProcCrntiCEInDatInd
(
RgMacPdu *pdu,
RgUeCb *prevUeCb,
RgCellCb *cellCb,
TfuDatInfo *datInfo,
RgInfCeInfo *ceInfo,
-U16 slot
+uint16_t slot
)
-#else
-PRIVATE S16 rgTOMProcCrntiCEInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot)
-RgMacPdu *pdu;
-RgUeCb *prevUeCb;
-RgCellCb *cellCb;
-TfuDatInfo *datInfo;
-RgInfCeInfo *ceInfo;
-U16 slot;
-#endif
{
RgUeCb *ueCb = NULLP;
Inst inst = cellCb->macInst - RG_INST_START;
#ifdef LTEMAC_SPS
Bool spsToBeActvtd;
- U16 sduSize;
+ uint16_t sduSize;
#endif
- TRC2(rgTOMProcCrntiCEInDatInd)
#ifndef LTE_L2_MEAS
UNUSED(slot);
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgTOMProcCCCHSduInDatInd
+static S16 rgTOMProcCCCHSduInDatInd
(
RgMacPdu *pdu,
RgUeCb *prevUeCb,
RgCellCb *cellCb,
TfuDatInfo *datInfo,
RgInfCeInfo *ceInfo,
-U16 slot
+uint16_t slot
)
-#else
-PRIVATE S16 rgTOMProcCCCHSduInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot)
-RgMacPdu *pdu;
-RgUeCb *prevUeCb;
-RgCellCb *cellCb;
-TfuDatInfo *datInfo;
-RgInfCeInfo *ceInfo;
-U16 slot;
-#endif
{
RgUeCb *ueCb = NULLP;
Inst inst = cellCb->macInst - RG_INST_START;
#ifdef LTEMAC_SPS
Bool spsToBeActvtd;
- U16 sduSize;
+ uint16_t sduSize;
#endif
- TRC2(rgTOMProcCCCHSduInDatInd)
#ifndef LTE_L2_MEAS
UNUSED(slot);
* @return S16
*/
-#ifdef ANSI
-PRIVATE S16 rgTOMUtlL2MStoreBufSz
-(
- RgUeCb *ueCb,
- RgInfCeInfo *ceInfo
- )
-#else
-PRIVATE S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo)
- RgUeCb *ueCb;
- RgInfCeInfo *ceInfo;
-#endif
+static S16 rgTOMUtlL2MStoreBufSz( RgUeCb *ueCb, RgInfCeInfo *ceInfo )
{
- U8 lcgId;
- U8 bsr;
- TRC2(rgTOMUtlL2MStoreBufSz);
+ uint8_t lcgId;
+ uint8_t bsr;
if(ceInfo->bitMask & RG_TRUNC_BSR_CE_PRSNT)
{
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
-PRIVATE Void rgTOML2MCompileActiveLCs
-(
- RgCellCb *cellCb,
- RgUeCb *ueCb,
- RgMacPdu *pdu,
- RgInfCeInfo *ceInfo
- )
-#else
-PRIVATE Void rgTOML2MCompileActiveLCs(cellCb, ueCb, pdu, ceInfo)
- RgCellCb *cellCb;
- RgUeCb *ueCb;
- RgMacPdu *pdu;
- RgInfCeInfo *ceInfo;
-#endif
+static Void rgTOML2MCompileActiveLCs(RgCellCb *cellCb,RgUeCb *ueCb,RgMacPdu *pdu,RgInfCeInfo *ceInfo)
{
CmLList *node;
RgMacSdu *sdu;
RgUlLcCb *ulLcCb;
- TRC2(rgTOML2MCompileActiveLCs)
node = pdu->sduLst.first;
while (node)
Code Review / o-du / l2.git / blobdiff