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 */
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++)