static int RLOG_FILE_ID=169;
/* 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"
#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 */
cmInitTimers (&ue->ackNakRepCb.ackNakRepDlInactvTmr, 1);
cmInitTimers (&ue->ackNakRepCb.ackNakRepTmr, 1);
}
- RETVALUE(ROK);
+ return ROK;
}
/**
ackNakRepCb->isAckNackEnabled = FALSE;
} /* repetition disabled in re configuration */
- RETVALUE(ROK);
+ return ROK;
}
/** @brief This function is a utility to add the UE to the correct Measurement
RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
"rgSCHMeasGapANRepUeRecfg() Incorrect GAP Period"
"CRNTI:%d",ue->ueId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* end of rgSCHMeasGapANRepUtlAddUe */
ue->measGapCb.measQLnk.node = NULLP;
break;
}
- RETVALUE(ROK);
+ return ROK;
} /* end of rgSCHMeasGapANRepUtlRmvUe */
/**
}
}
- RETVALUE(ROK);
+ return ROK;
} /* end of */
/* 40ms offset */
/* Introduced timing delta for DL control in FDD */
#ifdef LTE_TDD
- offset = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.subframe + TFU_DELTA) %
+ offset = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + TFU_DELTA) %
RG_MEAS_GAPPRD_40;
#else
- offset = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.subframe + TFU_DLCNTRL_DLDELTA) %
+ offset = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + TFU_DLCNTRL_DLDELTA) %
RG_MEAS_GAPPRD_40;
#endif
queue = &(cell->measGapCb.gapPrd40Q[offset]);
/* 80ms offset */
/* Introduced timing delta for DL control in FDD */
#ifdef LTE_TDD
- offset = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.subframe + TFU_DELTA) %
+ offset = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + TFU_DELTA) %
RG_MEAS_GAPPRD_80;
#else
- offset = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.subframe + TFU_DLCNTRL_DLDELTA) %
+ offset = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + TFU_DLCNTRL_DLDELTA) %
RG_MEAS_GAPPRD_80;
#endif
queue = &(cell->measGapCb.gapPrd80Q[offset]);
/* for ACK NACK repetition starts at offset - however at MAC we are
* concerned with subframe - TFU_DELTA */
- /* offset = ((cell->crntTime.sfn * 10) + cell->crntTime.subframe) %
+ /* offset = ((cell->crntTime.sfn * 10) + cell->crntTime.slot) %
* RG_MAX_NUM_DLSF; */
/* We wish to get the subframe whose HARQ Reception request would go out in
* this subframe. HARQ_RTT - TFU_DELTA
queue = &(dlSf->ueLst);
rgSchAckNackRepUtlHdlTti (cell, queue);
- RETVALUE(ROK);
+ return ROK;
}
/** @brief This function Marks the UE as ackNakRep so that Reception request
TRC2(rgSCHMeasGapANRepGetDlInactvUe);
- schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.subframe + RG_DL_DELTA;
+ schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + RG_DL_DELTA;
#ifdef LTE_TDD
RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, ackNakTime, RG_DL_DELTA);
if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx][ackNakTime.subframe] !=
RG_SCH_TDD_DL_SUBFRAME)
{
- RETVALUE(ROK);
+ return ROK;
}
dlSf = rgSCHUtlSubFrmGet (cell, ackNakTime);
/* Calc offset for ACK NACK repetition */
/*offset = (cell->crntTime.sfn * 10 +
- cell->crntTime.subframe + RG_DL_DELTA + RG_SCH_CMN_HARQ_INTERVAL - 1)
+ cell->crntTime.slot + RG_DL_DELTA + RG_SCH_CMN_HARQ_INTERVAL - 1)
% RG_MAX_NUM_DLSF;*/
/* The ackNakRepQ resides in each dlSf corresponding to the repStart */
/* Must pick up the subframe that was scheduled in the last TTI */
#ifdef LTE_TDD
if(cell->ulDlCfgIdx == 5)
{
- RETVALUE(ROK);
+ return ROK;
}
rgSCHUtlGetPrevDlSfInfo(cell, ackNakTime, &ackNakTime, &repCntr);
dlSf = rgSCHUtlSubFrmGet (cell, ackNakTime);
}
}
}
- RETVALUE(ROK);
+ return ROK;
}
/**
TRC2(rgSCHMeasGapANRepGetUlInactvUe);
/*ccpu00139481- Meas Gap should be monitored in UL with TFU_ULCNTRL_DLDELTA*/
- schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.subframe + \
+ schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + \
TFU_ULCNTRL_DLDELTA;
#ifndef LTE_TDD
pdcchToPuschGap = RGSCH_PDCCH_PUSCH_DELTA;
}
/* Calc offset for ACK NACK repetition */
/*offset = (cell->crntTime.sfn * 10 +
- cell->crntTime.subframe + RG_UL_SCHED_DELTA +
+ cell->crntTime.slot + RG_UL_SCHED_DELTA +
RG_SCH_CMN_HARQ_INTERVAL ) % RG_MAX_NUM_DLSF;*/
/* Must get the DLSF that is scheduled at TFU_DELTA Away */
#ifdef LTE_TDD
if(cell->ulDlCfgIdx == 5)
{
- RETVALUE(ROK);
+ return ROK;
}
RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, ackNakTime, TFU_DELTA);
if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx][ackNakTime.subframe] !=
RG_SCH_TDD_DL_SUBFRAME)
{
- RETVALUE(ROK);
+ return ROK;
}
#else
/* Introduced timing delta for DL control in FDD */
}
}
}
- RETVALUE(ROK);
+ return ROK;
}
/**
}
noSubfrms += rem;
- RETVALUE(noSubfrms);
+ return (noSubfrms);
}
/**