Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
L1-L2 Integration fixes.[Issue-ID: ODUHIGH-252]
[o-du/l2.git]
/
src
/
5gnrsch
/
rg_sch_mga.c
diff --git
a/src/5gnrsch/rg_sch_mga.c
b/src/5gnrsch/rg_sch_mga.c
index
bdd694e
..
8b36335
100755
(executable)
--- a/
src/5gnrsch/rg_sch_mga.c
+++ b/
src/5gnrsch/rg_sch_mga.c
@@
-56,36
+56,36
@@
static int RLOG_FILE_ID=169;
#include "rg_sch.x" /* typedefs for Scheduler */
/* local defines */
#include "rg_sch.x" /* typedefs for Scheduler */
/* local defines */
-
PRIVATE
S16 rgSCHMeasGapANRepUtlAddUe ARGS((
+
static
S16 rgSCHMeasGapANRepUtlAddUe ARGS((
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeMeasGapCfg *cfg));
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeMeasGapCfg *cfg));
-
PRIVATE
S16 rgSCHMeasGapANRepUtlRmvUe ARGS((
+
static
S16 rgSCHMeasGapANRepUtlRmvUe ARGS((
RgSchCellCb *cell,
RgSchUeCb *ue));
RgSchCellCb *cell,
RgSchUeCb *ue));
-
PRIVATE
S16 rgSchAckNackRepUtlRmvUe ARGS((
+
static
S16 rgSchAckNackRepUtlRmvUe ARGS((
RgSchCellCb *cell,
RgSchUeCb *ue));
RgSchCellCb *cell,
RgSchUeCb *ue));
-
PRIVATE
Void rgSchAckNackRepUtlHdlTti ARGS((
+
static
Void rgSchAckNackRepUtlHdlTti ARGS((
RgSchCellCb *cell,
CmLListCp *ackNackRepQ));
RgSchCellCb *cell,
CmLListCp *ackNackRepQ));
-
PRIVATE
Void rgSCHMeasGapANRepUtlHdlTti ARGS((
+
static
Void rgSCHMeasGapANRepUtlHdlTti ARGS((
RgSchCellCb *cell,
CmLListCp *measGapQ));
#ifdef LTE_TDD
RgSchCellCb *cell,
CmLListCp *measGapQ));
#ifdef LTE_TDD
-
PRIVATE U8
rgSCHAckNakRepFindUlDuration ARGS((
+
static uint8_t
rgSCHAckNakRepFindUlDuration ARGS((
RgSchCellCb *cell,
RgSchDlSf *dlSf,
CmLteTimingInfo repTime,
RgSchCellCb *cell,
RgSchDlSf *dlSf,
CmLteTimingInfo repTime,
-
U8
repCnt));
-
PRIVATE
Void rgSCHAckNakRepGetUlOffsetFrmDl ARGS((
+
uint8_t
repCnt));
+
static
Void rgSCHAckNakRepGetUlOffsetFrmDl ARGS((
RgSchDlSf *dlSf,
CmLteTimingInfo crntDlTime,
RgSchDlSf *dlSf,
CmLteTimingInfo crntDlTime,
-
U8
*noSubfrms));
+
uint8_t
*noSubfrms));
#endif
/**
#endif
/**
@@
-139,9
+139,6
@@
RgrUeCfg *ueCfg;
#endif
{
#endif
{
- TRC2(rgSCHMeasGapANRepUeCfg);
-
-
ue->measGapCb.isMesGapEnabled = ueCfg->ueMesGapCfg.isMesGapEnabled;
if (ueCfg->ueMesGapCfg.isMesGapEnabled)
ue->measGapCb.isMesGapEnabled = ueCfg->ueMesGapCfg.isMesGapEnabled;
if (ueCfg->ueMesGapCfg.isMesGapEnabled)
@@
-219,9
+216,6
@@
RgrUeRecfg *ueRecfg;
RgrUeAckNackRepCfg *ackNackReCfg = &(ueRecfg->ueAckNackRecfg);
RgSchUeAckNakRepCb *ackNakRepCb = &(ue->ackNakRepCb);
RgrUeAckNackRepCfg *ackNackReCfg = &(ueRecfg->ueAckNackRecfg);
RgSchUeAckNakRepCb *ackNakRepCb = &(ue->ackNakRepCb);
- TRC2(rgSCHMeasGapANRepUeRecfg);
-
-
reCfg = &(ueRecfg->ueMeasGapRecfg);
ueMeasCb = &(ue->measGapCb);
reCfg = &(ueRecfg->ueMeasGapRecfg);
ueMeasCb = &(ue->measGapCb);
@@
-308,22
+302,20
@@
RgrUeRecfg *ueRecfg;
* @return
*/
#ifdef ANSI
* @return
*/
#ifdef ANSI
-
PRIVATE
S16 rgSCHMeasGapANRepUtlAddUe
+
static
S16 rgSCHMeasGapANRepUtlAddUe
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeMeasGapCfg *cfg
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeMeasGapCfg *cfg
)
#else
-
PRIVATE
S16 rgSCHMeasGapANRepUtlAddUe (cell, ue, cfg)
+
static
S16 rgSCHMeasGapANRepUtlAddUe (cell, ue, cfg)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgrUeMeasGapCfg *cfg;
#endif
{
RgSchCellCb *cell;
RgSchUeCb *ue;
RgrUeMeasGapCfg *cfg;
#endif
{
- TRC2(rgSCHMeasGapANRepUtlAddUe);
-
switch (cfg->gapPrd)
{
case RG_MEAS_GAPPRD_40:
switch (cfg->gapPrd)
{
case RG_MEAS_GAPPRD_40:
@@
-362,20
+354,18
@@
RgrUeMeasGapCfg *cfg;
* @return
*/
#ifdef ANSI
* @return
*/
#ifdef ANSI
-
PRIVATE
S16 rgSCHMeasGapANRepUtlRmvUe
+
static
S16 rgSCHMeasGapANRepUtlRmvUe
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-
PRIVATE
S16 rgSCHMeasGapANRepUtlRmvUe (cell, ue)
+
static
S16 rgSCHMeasGapANRepUtlRmvUe (cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
- TRC2(rgSCHMeasGapANRepUtlRmvUe);
-
switch (ue->measGapCb.gapPrd)
{
case RG_MEAS_GAPPRD_40:
switch (ue->measGapCb.gapPrd)
{
case RG_MEAS_GAPPRD_40:
@@
-438,9
+428,6
@@
Bool isUeDel;
#endif
{
#endif
{
-
- TRC2(rgSCHMeasGapANRepUeDel);
-
if (ue->measGapCb.isMesGapEnabled)
{
rgSCHMeasGapANRepUtlRmvUe (cell, ue);
if (ue->measGapCb.isMesGapEnabled)
{
rgSCHMeasGapANRepUtlRmvUe (cell, ue);
@@
-485,7
+472,7
@@
Bool isUeDel;
rgSCHTmrStopTmr (cell, RG_SCH_TMR_ACKNACK_REP, ue);
rgSchAckNackRepUtlRmvUe (cell, ue);
}
rgSCHTmrStopTmr (cell, RG_SCH_TMR_ACKNACK_REP, ue);
rgSchAckNackRepUtlRmvUe (cell, ue);
}
-
RETVOID
;
+
return
;
}
/** @brief This function deletes the UEs information related to ACK NACK
}
/** @brief This function deletes the UEs information related to ACK NACK
@@
-505,28
+492,26
@@
Bool isUeDel;
* @return
*/
#ifdef ANSI
* @return
*/
#ifdef ANSI
-
PRIVATE
S16 rgSchAckNackRepUtlRmvUe
+
static
S16 rgSchAckNackRepUtlRmvUe
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-
PRIVATE
S16 rgSchAckNackRepUtlRmvUe (cell, ue)
+
static
S16 rgSchAckNackRepUtlRmvUe (cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
-
U8
hqIdx;
-
U8
repIdx;
+
uint8_t
hqIdx;
+
uint8_t
repIdx;
RgSchDlHqProcCb *hqP;
RgSchDlHqProcCb *hqP;
-
U8
tbCnt;
+
uint8_t
tbCnt;
RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
- TRC3(rgSchAckNackRepUtlRmvUe);
-
for (hqIdx = 0; hqIdx < hqEnt->numHqPrcs; hqIdx++)
{
hqP = &hqEnt->procs[hqIdx];
for (hqIdx = 0; hqIdx < hqEnt->numHqPrcs; hqIdx++)
{
hqP = &hqEnt->procs[hqIdx];
@@
-627,13
+612,11
@@
S16 rgSCHMeasGapANRepTtiHndl(cell)
RgSchCellCb *cell;
#endif
{
RgSchCellCb *cell;
#endif
{
-
U8
offset;
+
uint8_t
offset;
CmLListCp *queue;
RgSchDlSf *dlSf;
CmLteTimingInfo repTime;
CmLListCp *queue;
RgSchDlSf *dlSf;
CmLteTimingInfo repTime;
- TRC2(rgSCHMeasGapANRepTtiHndl);
-
/* Measurement GAP Starts at offSet - however at MAC we are concerned at
* subframe + TFU_DELTA.
*/
/* Measurement GAP Starts at offSet - however at MAC we are concerned at
* subframe + TFU_DELTA.
*/
@@
-700,13
+683,13
@@
RgSchCellCb *cell;
* @return Void
*/
#ifdef ANSI
* @return Void
*/
#ifdef ANSI
-
PRIVATE
Void rgSchAckNackRepUtlHdlTti
+
static
Void rgSchAckNackRepUtlHdlTti
(
RgSchCellCb *cell,
CmLListCp *ackNackRepQ
)
#else
(
RgSchCellCb *cell,
CmLListCp *ackNackRepQ
)
#else
-
PRIVATE
Void rgSchAckNackRepUtlHdlTti (cell, ackNackRepQ)
+
static
Void rgSchAckNackRepUtlHdlTti (cell, ackNackRepQ)
RgSchCellCb *cell;
CmLListCp *ackNackRepQ;
#endif
RgSchCellCb *cell;
CmLListCp *ackNackRepQ;
#endif
@@
-714,8
+697,6
@@
CmLListCp *ackNackRepQ;
CmLList *node;
RgSchUeCb *ue;
CmLList *node;
RgSchUeCb *ue;
- TRC2(rgSchAckNackRepUtlHdlTti);
-
node = ackNackRepQ->first;
while (node)
{
node = ackNackRepQ->first;
while (node)
{
@@
-728,7
+709,7
@@
CmLListCp *ackNackRepQ;
}
node = node->next;
} /* end of while */
}
node = node->next;
} /* end of while */
-
RETVOID
;
+
return
;
} /* end of */
} /* end of */
@@
-747,13
+728,13
@@
CmLListCp *ackNackRepQ;
* @return
*/
#ifdef ANSI
* @return
*/
#ifdef ANSI
-
PRIVATE
Void rgSCHMeasGapANRepUtlHdlTti
+
static
Void rgSCHMeasGapANRepUtlHdlTti
(
RgSchCellCb *cell,
CmLListCp *measGapQ
)
#else
(
RgSchCellCb *cell,
CmLListCp *measGapQ
)
#else
-
PRIVATE
Void rgSCHMeasGapANRepUtlHdlTti (cell, measGapQ)
+
static
Void rgSCHMeasGapANRepUtlHdlTti (cell, measGapQ)
RgSchCellCb *cell;
CmLListCp *measGapQ;
#endif
RgSchCellCb *cell;
CmLListCp *measGapQ;
#endif
@@
-761,8
+742,6
@@
CmLListCp *measGapQ;
CmLList *node;
RgSchUeCb *ue;
CmLList *node;
RgSchUeCb *ue;
- TRC2(rgSCHMeasGapANRepUtlHdlTti);
-
node = measGapQ->first;
while (node)
{
node = measGapQ->first;
while (node)
{
@@
-771,7
+750,7
@@
CmLListCp *measGapQ;
rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_MEASGAP, RG_SCH_MEAS_GAP_LEN);
node = node->next;
} /* end of while */
rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_MEASGAP, RG_SCH_MEAS_GAP_LEN);
node = node->next;
} /* end of while */
-
RETVOID
;
+
return
;
} /* end of */
} /* end of */
@@
-833,23
+812,21
@@
RgSchCellCb *cell;
CmLListCp *dlInactvUeLst;
#endif
{
CmLListCp *dlInactvUeLst;
#endif
{
-
U8
offset;
+
uint8_t
offset;
CmLList *node;
CmLList *hqNode;
CmLListCp *queue;
RgSchUeCb *ue;
RgSchDlSf *dlSf;
CmLteTimingInfo ackNakTime;
CmLList *node;
CmLList *hqNode;
CmLListCp *queue;
RgSchUeCb *ue;
RgSchDlSf *dlSf;
CmLteTimingInfo ackNakTime;
-
U16
schedTime;
-
U8
harqFdbkOffset;
+
uint16_t
schedTime;
+
uint8_t
harqFdbkOffset;
#ifdef LTE_TDD
#ifdef LTE_TDD
-
U8
repCntr;
+
uint8_t
repCntr;
#endif
RgSchDlHqProcCb *hqP;
RgSchDlHqTbCb *tbCb;
#endif
RgSchDlHqProcCb *hqP;
RgSchDlHqTbCb *tbCb;
- U32 i;
-
- TRC2(rgSCHMeasGapANRepGetDlInactvUe);
+ uint32_t i;
schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + RG_DL_DELTA;
schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + RG_DL_DELTA;
@@
-970,7
+947,7
@@
CmLListCp *dlInactvUeLst;
/* Start timer */
#ifdef LTE_TDD
repCntr = rgSCHAckNakRepFindUlDuration(cell, dlSf, ackNakTime,
/* Start timer */
#ifdef LTE_TDD
repCntr = rgSCHAckNakRepFindUlDuration(cell, dlSf, ackNakTime,
- (
U8
)(ue->ackNakRepCb.repCntr - 1));
+ (
uint8_t
)(ue->ackNakRepCb.repCntr - 1));
rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_DL_ACKNACK, repCntr);
#else
rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_DL_ACKNACK,
rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_DL_ACKNACK, repCntr);
#else
rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_DL_ACKNACK,
@@
-1041,24
+1018,22
@@
CmLListCp *ulInactvUeLst;
#endif
{
#endif
{
-
U8
offset;
+
uint8_t
offset;
CmLList *node;
CmLList *hqNode;
CmLListCp *queue;
RgSchUeCb *ue;
CmLteTimingInfo ackNakTime;
RgSchDlSf *dlSf;
CmLList *node;
CmLList *hqNode;
CmLListCp *queue;
RgSchUeCb *ue;
CmLteTimingInfo ackNakTime;
RgSchDlSf *dlSf;
-
U16
schedTime;
-
U8
pdcchToPuschGap;
-
U8
idx=0;
+
uint16_t
schedTime;
+
uint8_t
pdcchToPuschGap;
+
uint8_t
idx=0;
#ifdef LTE_TDD
#ifdef LTE_TDD
-
U8
repCntr;
+
uint8_t
repCntr;
#endif
RgSchDlHqProcCb *hqP;
RgSchDlHqTbCb *tbCb;
#endif
RgSchDlHqProcCb *hqP;
RgSchDlHqTbCb *tbCb;
- U32 i;
-
- TRC2(rgSCHMeasGapANRepGetUlInactvUe);
+ uint32_t i;
/*ccpu00139481- Meas Gap should be monitored in UL with TFU_ULCNTRL_DLDELTA*/
schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + \
/*ccpu00139481- Meas Gap should be monitored in UL with TFU_ULCNTRL_DLDELTA*/
schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + \
@@
-1211,17
+1186,16
@@
CmLListCp *ulInactvUeLst;
Void rgSCHMeasGapANRepDlInactvTmrExpry
(
RgSchUeCb *ue,
Void rgSCHMeasGapANRepDlInactvTmrExpry
(
RgSchUeCb *ue,
-
U8
tmrEvnt
+
uint8_t
tmrEvnt
)
#else
Void rgSCHMeasGapANRepDlInactvTmrExpry(ue, tmrEvnt)
RgSchUeCb *ue;
)
#else
Void rgSCHMeasGapANRepDlInactvTmrExpry(ue, tmrEvnt)
RgSchUeCb *ue;
-
U8
tmrEvnt;
+
uint8_t
tmrEvnt;
#endif
{
RgSchCellCb *cell = ue->cell;
#endif
{
RgSchCellCb *cell = ue->cell;
- TRC2(rgSCHMeasGapANRepDlInactvTmrExpry);
switch (tmrEvnt)
{
switch (tmrEvnt)
{
@@
-1237,7
+1211,7
@@
U8 tmrEvnt;
cmInitTimers (&ue->measGapCb.measGapDlInactvTmr, 1);
cmInitTimers (&ue->ackNakRepCb.ackNakRepDlInactvTmr, 1);
}
cmInitTimers (&ue->measGapCb.measGapDlInactvTmr, 1);
cmInitTimers (&ue->ackNakRepCb.ackNakRepDlInactvTmr, 1);
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-1271,16
+1245,15
@@
U8 tmrEvnt;
Void rgSCHMeasGapANRepUlInactvTmrExpry
(
RgSchUeCb *ue,
Void rgSCHMeasGapANRepUlInactvTmrExpry
(
RgSchUeCb *ue,
-
U8
tmrEvnt
+
uint8_t
tmrEvnt
)
#else
Void rgSCHMeasGapANRepUlInactvTmrExpry(ue, tmrEvnt)
RgSchUeCb *ue;
)
#else
Void rgSCHMeasGapANRepUlInactvTmrExpry(ue, tmrEvnt)
RgSchUeCb *ue;
-
U8
tmrEvnt;
+
uint8_t
tmrEvnt;
#endif
{
RgSchCellCb *cell = ue->cell;
#endif
{
RgSchCellCb *cell = ue->cell;
- TRC2(rgSCHMeasGapANRepUlInactvTmrExpry);
switch (tmrEvnt)
{
switch (tmrEvnt)
{
@@
-1296,7
+1269,7
@@
U8 tmrEvnt;
cmInitTimers (&ue->measGapCb.measGapUlInactvTmr, 1);
cmInitTimers (&ue->ackNakRepCb.ackNakRepUlInactvTmr, 1);
}
cmInitTimers (&ue->measGapCb.measGapUlInactvTmr, 1);
cmInitTimers (&ue->ackNakRepCb.ackNakRepUlInactvTmr, 1);
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-1332,12
+1305,10
@@
RgSchUeCb *ue;
#endif
{
#endif
{
- TRC2(rgSCHMeasGapANRepTmrExpry);
-
ue->measGapCb.isMeasuring = FALSE;
cmInitTimers (&ue->measGapCb.measGapTmr, 1);
ue->measGapCb.isMeasuring = FALSE;
cmInitTimers (&ue->measGapCb.measGapTmr, 1);
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-1373,12
+1344,10
@@
RgSchUeCb *ue;
#endif
{
#endif
{
- TRC2(rgSCHAckNakRepTmrExpry);
-
ue->ackNakRepCb.isAckNakRep = FALSE;
cmInitTimers (&ue->ackNakRepCb.ackNakRepTmr, 1);
ue->ackNakRepCb.isAckNakRep = FALSE;
cmInitTimers (&ue->ackNakRepCb.ackNakRepTmr, 1);
-
RETVOID
;
+
return
;
}
}
@@
-1430,9
+1399,7
@@
RgSchDlSf *crntDlSf;
CmLList *hqNode;
RgSchDlHqProcCb *hqP;
RgSchDlHqTbCb *tbCb;
CmLList *hqNode;
RgSchDlHqProcCb *hqP;
RgSchDlHqTbCb *tbCb;
- U32 i;
-
- TRC2(rgSCHAckNakRepAddToQ);
+ uint32_t i;
node = crntDlSf->ueLst.first;
while (node)
node = crntDlSf->ueLst.first;
while (node)
@@
-1458,7
+1425,7
@@
RgSchDlSf *crntDlSf;
}
}
}
}
}
}
-
RETVOID
;
+
return
;
}
}
@@
-1476,36
+1443,35
@@
RgSchDlSf *crntDlSf;
* @param[in] RgSchCellCb *cell
* @param[in] RgSchDlSf *dlSf
* @param[in] CmLteTimingInfo repTime
* @param[in] RgSchCellCb *cell
* @param[in] RgSchDlSf *dlSf
* @param[in] CmLteTimingInfo repTime
- * @param[in]
U8
repCnt
+ * @param[in]
uint8_t
repCnt
*
*
- * @return
U8
+ * @return
uint8_t
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PRIVATE U8
rgSCHAckNakRepFindUlDuration
+
static uint8_t
rgSCHAckNakRepFindUlDuration
(
RgSchCellCb *cell,
RgSchDlSf *dlSf,
CmLteTimingInfo repTime,
(
RgSchCellCb *cell,
RgSchDlSf *dlSf,
CmLteTimingInfo repTime,
-
U8
repCnt
+
uint8_t
repCnt
)
#else
)
#else
-
PRIVATE U8
rgSCHAckNakRepFindUlDuration(cell, dlSf, repTime, repCnt)
+
static uint8_t
rgSCHAckNakRepFindUlDuration(cell, dlSf, repTime, repCnt)
RgSchCellCb *cell;
RgSchDlSf *dlSf;
CmLteTimingInfo repTime;
RgSchCellCb *cell;
RgSchDlSf *dlSf;
CmLteTimingInfo repTime;
-
U8
repCnt;
+
uint8_t
repCnt;
#endif
{
CmLteTimingInfo ulfrm;
#endif
{
CmLteTimingInfo ulfrm;
-
U8
noSubfrms = 0;
-
U16
ulDlCfgIdx = cell->ulDlCfgIdx;
+
uint8_t
noSubfrms = 0;
+
uint16_t
ulDlCfgIdx = cell->ulDlCfgIdx;
S16 rem = 0;
S16 idx;
S8 diff;
S16 rem = 0;
S16 idx;
S8 diff;
- TRC2(rgSCHAckNakRepFindUlDuration)
rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, repTime, &noSubfrms);
RG_SCH_ADD_TO_CRNT_TIME(repTime, ulfrm, noSubfrms);
diff = repCnt-1;
rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, repTime, &noSubfrms);
RG_SCH_ADD_TO_CRNT_TIME(repTime, ulfrm, noSubfrms);
diff = repCnt-1;
@@
-1538,27
+1504,26
@@
U8 repCnt;
*
* @param[in] RgSchDlSf *dlSf
* @param[in] CmLteTimingInfo crntDlTime
*
* @param[in] RgSchDlSf *dlSf
* @param[in] CmLteTimingInfo crntDlTime
- * @param[in]
U8
*noSubfrms
+ * @param[in]
uint8_t
*noSubfrms
*
*
- * @return
U8
+ * @return
uint8_t
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PRIVATE
Void rgSCHAckNakRepGetUlOffsetFrmDl
+
static
Void rgSCHAckNakRepGetUlOffsetFrmDl
(
RgSchDlSf *dlSf,
CmLteTimingInfo crntDlTime,
(
RgSchDlSf *dlSf,
CmLteTimingInfo crntDlTime,
-
U8
*noSubfrms
+
uint8_t
*noSubfrms
)
#else
)
#else
-
PRIVATE
Void rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, crntDlTime, noSubfrms)
+
static
Void rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, crntDlTime, noSubfrms)
RgSchDlSf *dlSf;
CmLteTimingInfo crntDlTime;
RgSchDlSf *dlSf;
CmLteTimingInfo crntDlTime;
-
U8
*noSubfrms;
+
uint8_t
*noSubfrms;
#endif
{
#endif
{
- TRC2(rgSCHAckNakRepGetUlOffsetFrmDl)
if(dlSf->dlFdbkInfo.sfnOffset != 0)
{
if(dlSf->dlFdbkInfo.sfnOffset != 0)
{
@@
-1570,7
+1535,7
@@
U8 *noSubfrms;
{
*noSubfrms = dlSf->dlFdbkInfo.subframe - crntDlTime.subframe;
}
{
*noSubfrms = dlSf->dlFdbkInfo.subframe - crntDlTime.subframe;
}
-
RETVOID
;
+
return
;
}
#endif
\f
}
#endif
\f