static int RLOG_FILE_ID=171;
/* header include files (.h) */
-#include "envopt.h" /* environment options */
-#include "envdep.h" /* environment dependent */
-#include "envind.h" /* environment independent */
-
-#include "gen.h" /* general */
-#include "ssi.h" /* system services */
-
-#include "cm_tkns.h" /* Common Token Defines */
-#include "cm_llist.h" /* Common Link List Defines */
-#include "cm_hash.h" /* Common Hash List Defines */
-#include "cm_mblk.h" /* common memory link list library */
-#include "cm_lte.h" /* Common LTE */
+#include "common_def.h"
#include "rg_env.h" /* MAC Environment Defines */
#include "rgr.h" /* RGR Interface defines */
#include "rl_common.h"
/* header/extern include files (.x) */
-#include "gen.x" /* general */
-#include "ssi.x" /* system services */
-#include "cm5.x" /* Timer */
-#include "cm_tkns.x" /* Common Token Definitions */
-#include "cm_llist.x" /* Common Link List Definitions */
-#include "cm_lib.x" /* Common Library Definitions */
-#include "cm_hash.x" /* Common Hash List Definitions */
-#include "cm_mblk.x" /* common memory link list library */
-#include "cm_lte.x" /* Common LTE */
#include "rgr.x" /* RGR Interface includes */
#include "rgm.x" /* RGR Interface includes */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamVldtUeCfg
+S16 rgSCHRamVldtUeCfg
(
RgSchCellCb *cell,
RgrUeCfg *ueCfg
)
#else
-PUBLIC S16 rgSCHRamVldtUeCfg(cell, ueCfg)
+S16 rgSCHRamVldtUeCfg(cell, ueCfg)
RgSchCellCb *cell;
RgrUeCfg *ueCfg;
#endif
#endif
)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
- RETVALUE(ROK);
+ return ROK;
}
/**
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamProcRaReq
+S16 rgSCHRamProcRaReq
(
U8 raReqCnt,
RgSchCellCb *cell,
RgSchErrInfo *err
)
#else
-PUBLIC S16 rgSCHRamProcRaReq(raReqCnt, cell, raRnti, raReqInd, timingInfo, ue, err)
+S16 rgSCHRamProcRaReq(raReqCnt, cell, raRnti, raReqInd, timingInfo, ue, err)
U8 raReqCnt;
RgSchCellCb *cell;
CmLteRnti raRnti;
RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
"RARNTI:%d rgSCHTomRaReqInd(): RAM processing failed errType(%d) ",
raReqInd->raRnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* SR_RACH_STATS : DED PREAMB*/
RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamProcRaReq(): Allocation"
" of RaReq failed RARNTI:%d",raRnti);
err->errCause = RGSCHERR_RAM_MEM_EXHAUST;
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Insert the given raReqInfo */
cmLListAdd2Tail(&cell->raInfo.raReqLst[raIndex], &raReqInfo->raReqLstEnt);
}
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamProcRaReq */
/**
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamCreateRaCb
+S16 rgSCHRamCreateRaCb
(
RgSchCellCb *cell,
RgSchRaCb **raCb,
RgSchErrInfo *err
)
#else
-PUBLIC S16 rgSCHRamCreateRaCb(cell, raCb, err)
+S16 rgSCHRamCreateRaCb(cell, raCb, err)
RgSchCellCb *cell;
RgSchRaCb **raCb;
RgSchErrInfo *err;
RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamCreateRaCb(): Allocation of "
"RaCb failed");
err->errCause = RGSCHERR_RAM_MEM_EXHAUST;
- RETVALUE(RFAILED);
+ return RFAILED;
}
rntiLnk = rgSCHDbmGetRnti(cell);
for proper NULLP assignment*/
rgSCHUtlFreeSBuf(inst, (Data **)(raCb), sizeof(RgSchRaCb));
err->errCause = RGSCHERR_RAM_RNTI_EXHAUST;
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Allocate and initialize the DL HARQ portion of the RACB */
for proper NULLP assignment*/
rgSCHUtlFreeSBuf(inst, (Data **)(raCb), sizeof(RgSchRaCb));
err->errCause = RGSCHERR_RAM_MEM_EXHAUST;
- RETVALUE(RFAILED);
+ return RFAILED;
}
#ifdef EMTC_ENABLE
(*raCb)->isEmtcRaCb = FALSE;
(*raCb)->raCbLnk.node = (PTR)(*raCb);
cmLListAdd2Tail(&cell->raInfo.raCbLst, &(*raCb)->raCbLnk);
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamCreateRaCb */
/**
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamRgrUeCfg
+S16 rgSCHRamRgrUeCfg
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgSchErrInfo *err
)
#else
-PUBLIC S16 rgSCHRamRgrUeCfg(cell, ue, raCb, err)
+S16 rgSCHRamRgrUeCfg(cell, ue, raCb, err)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchRaCb *raCb;
err->errCause = RGSCHERR_RAM_NO_MSG3_RCVD;
*hqEnt = NULLP;
raCb->dlHqE->ue = NULLP;
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamRgrUeCfg */
/* No need of raCb any more */
rgSCHRamDelRaCb(cell, raCb, TRUE);
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamContResCrnti */
"RNTI:%d RaCb in wrong State %d Drop Msg 3",
raCb->rntiLnk->rnti,
raCb->raState);
- RETVALUE(ROK);
+ return ROK;
}
raCb->raState = RGSCH_RA_MSG4_PENDING;
raCb->contResTmrLnk.node = (PTR)(raCb);
cmLListAdd2Tail(&(cell->contResGrdTmrLst), &(raCb->contResTmrLnk));
#endif
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamContResCcchsdu */
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamProcMsg3
+S16 rgSCHRamProcMsg3
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgSchErrInfo *err
)
#else
-PUBLIC S16 rgSCHRamProcMsg3(cell, ue, raCb, pdu, err)
+S16 rgSCHRamProcMsg3(cell, ue, raCb, pdu, err)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchRaCb *raCb;
}
}
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamProcMsg3 */
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamUpdtBo
+S16 rgSCHRamUpdtBo
(
RgSchCellCb *cell,
RgSchRaCb *raCb,
RgInfCmnBoRpt *staRsp
)
#else
-PUBLIC S16 rgSCHRamUpdtBo(cell, raCb, staRsp)
+S16 rgSCHRamUpdtBo(cell, raCb, staRsp)
RgSchCellCb *cell;
RgSchRaCb *raCb;
RgInfCmnBoRpt *staRsp;
rgSCHRamAddToRaInfoSchdLst(cell, raCb);
/* MSG4 Fix End */
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamUpdtBo */
/**
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamMsg3DatInd
+S16 rgSCHRamMsg3DatInd
(
RgSchRaCb *raCb
)
#else
-PUBLIC S16 rgSCHRamMsg3DatInd(raCb)
+S16 rgSCHRamMsg3DatInd(raCb)
RgSchRaCb *raCb;
#endif
{
/*ccpu00128820 - MOD - Msg3 alloc double delete issue*/
rgSCHUhmProcMsg3DatInd(&(raCb->msg3HqProc));
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamMsg3DatInd */
/**
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamMsg3FailureInd
+S16 rgSCHRamMsg3FailureInd
(
RgSchRaCb *raCb
)
#else
-PUBLIC S16 rgSCHRamMsg3FailureInd(raCb)
+S16 rgSCHRamMsg3FailureInd(raCb)
RgSchRaCb *raCb;
#endif
{
/*ccpu00128820 - MOD - Msg3 alloc double delete issue*/
rgSCHUhmProcMsg3Failure(&(raCb->msg3HqProc));
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamMsg3FailureInd */
/**
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamMsg4FdbkInd
+S16 rgSCHRamMsg4FdbkInd
(
RgSchRaCb *raCb
)
#else
-PUBLIC S16 rgSCHRamMsg4FdbkInd(raCb)
+S16 rgSCHRamMsg4FdbkInd(raCb)
RgSchRaCb *raCb;
#endif
{
TRC2(rgSCHRamMsg4FdbkInd)
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamMsg4FdbkInd */
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamMsg4Done
+S16 rgSCHRamMsg4Done
(
RgSchCellCb *cell,
RgSchRaCb *raCb
)
#else
-PUBLIC S16 rgSCHRamMsg4Done(cell, raCb)
+S16 rgSCHRamMsg4Done(cell, raCb)
RgSchCellCb *cell;
RgSchRaCb *raCb;
#endif
rgSCHDhmRlsHqpTb(raCb->dlHqE->msg4Proc, 0, TRUE);
}
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamMsg4Done */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamDelRaCb
+S16 rgSCHRamDelRaCb
(
RgSchCellCb *cell,
RgSchRaCb *raCb,
Bool rlsRnti
)
#else
-PUBLIC S16 rgSCHRamDelRaCb(cell, raCb, rlsRnti)
+S16 rgSCHRamDelRaCb(cell, raCb, rlsRnti)
RgSchCellCb *cell;
RgSchRaCb *raCb;
Bool rlsRnti;
#endif
rgSCHUtlFreeSBuf(inst, (Data **)&raCb, sizeof(RgSchRaCb));
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamDelRaCb */
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamTtiHndlr
+S16 rgSCHRamTtiHndlr
(
RgSchCellCb *cell
)
#else
-PUBLIC S16 rgSCHRamTtiHndlr(cell)
+S16 rgSCHRamTtiHndlr(cell)
RgSchCellCb *cell;
#endif
{
winGap = (rgRaPrmblToRaFrmTbl[cell->rachCfg.preambleFormat]-1)+
(cell->rachCfg.raWinSize -1 ) + RGSCH_RARSP_WAIT_PERIOD;
- raIdx = (((crntSfn & 1) * RGSCH_MAX_RA_RNTI+ cell->crntTime.subframe
+ raIdx = (((crntSfn & 1) * RGSCH_MAX_RA_RNTI+ cell->crntTime.slot
+ RG_SCH_CMN_DL_DELTA - winGap)+ RGSCH_RAREQ_ARRAY_SIZE )
% RGSCH_RAREQ_ARRAY_SIZE;
/* Fixes for RACH handling: Added deletion of queued RaReq */
frm = cell->crntTime;
RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA);
- if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx][frm.subframe] !=
+ if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx][frm.slot] !=
RG_SCH_TDD_UL_SUBFRAME)
{
- raIdx = rgSchTddNumDlSubfrmTbl[cell->ulDlCfgIdx][frm.subframe]-1;
+ raIdx = rgSchTddNumDlSubfrmTbl[cell->ulDlCfgIdx][frm.slot]-1;
rgSCHRamDelRaReq(cell, cell->crntTime, raIdx);
}
#endif
/* ccpu00132536:MOD- racb timeout will be verified in each SFN such that
* the RACB whose processing is not completed in RG_MAX_RA_PRC_FRM
* will be deleted*/
- if (cell->crntTime.subframe == 0)
+ if (cell->crntTime.slot == 0)
{
maxCnt = cell->raInfo.raCbLst.count;
for (idx = 0; idx < maxCnt; idx++)
}
}
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamTtiHndlr */
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamFreeCell
+S16 rgSCHRamFreeCell
(
RgSchCellCb *cell
)
#else
-PUBLIC S16 rgSCHRamFreeCell(cell)
+S16 rgSCHRamFreeCell(cell)
RgSchCellCb *cell;
#endif
{
rgSCHRamDelRaCb(cell, raCb, TRUE);
}
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamFreeCell */
#ifdef RGR_V1
#ifdef ANSI
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgSCHRamDelRaReq
+S16 rgSCHRamDelRaReq
(
RgSchCellCb *cell,
CmLteTimingInfo timingInfo,
U8 raIdx
)
#else
-PUBLIC S16 rgSCHRamDelRaReq(cell, timingInfo, raIdx)
+S16 rgSCHRamDelRaReq(cell, timingInfo, raIdx)
RgSchCellCb *cell;
CmLteTimingInfo timingInfo;
U8 raIdx;
}
}
- RETVALUE(ROK);
+ return ROK;
}
#endif
/*MSG4 Fix Start */
#ifdef ANSI
-PUBLIC S16 rgSCHRamAddToRaInfoSchdLst
+S16 rgSCHRamAddToRaInfoSchdLst
(
RgSchCellCb *cell,
RgSchRaCb *raCb
)
#else
-PUBLIC S16 rgSCHRamAddToRaInfoSchdLst(cell, raCb)
+S16 rgSCHRamAddToRaInfoSchdLst(cell, raCb)
RgSchCellCb *cell;
RgSchRaCb *raCb;
#endif
cmLListAdd2Tail(&(cell->raInfo.toBeSchdLst), &(raCb->schdLnk));
raCb->contResTmrLnk.node = (PTR)(raCb);
cmLListAdd2Tail(&(cell->contResTmrLst), &(raCb->contResTmrLnk));
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamAddToRaInfoSchdLst */
#ifdef ANSI
-PUBLIC S16 rgSCHRamRmvFrmRaInfoSchdLst
+S16 rgSCHRamRmvFrmRaInfoSchdLst
(
RgSchCellCb *cell,
RgSchRaCb *raCb
)
#else
-PUBLIC S16 rgSCHRamRmvFrmRaInfoSchdLst(cell, raCb)
+S16 rgSCHRamRmvFrmRaInfoSchdLst(cell, raCb)
RgSchCellCb *cell;
RgSchRaCb *raCb;
#endif
raCb->schdLnk.node = NULLP;
cmLListDelFrm(&(cell->contResTmrLst), &(raCb->contResTmrLnk));
raCb->contResTmrLnk.node = NULLP;
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHRamRmvFrmRaInfoSchdLst */
/*MSG4 Fix End*/