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
U8, U16, U32 data type changes
[o-du/l2.git]
/
src
/
5gnrsch
/
rg_sch_pwr.c
diff --git
a/src/5gnrsch/rg_sch_pwr.c
b/src/5gnrsch/rg_sch_pwr.c
index
41faf57
..
d973fd6
100755
(executable)
--- a/
src/5gnrsch/rg_sch_pwr.c
+++ b/
src/5gnrsch/rg_sch_pwr.c
@@
-77,7
+77,7
@@
PRIVATE RgSchCmnUlPwrCqiToPwrTbl rgSchPwrCqiToPwrTbl;
/* This table maps a given number of RBs (given by array index)
* to the power in dB that these many RBs map to. */
/* This table maps a given number of RBs (given by array index)
* to the power in dB that these many RBs map to. */
-CONSTANT
U8
rgSchPwrRbToPwrTbl[111] = { 0, /* First entry is dummy */
+CONSTANT
uint8_t
rgSchPwrRbToPwrTbl[111] = { 0, /* First entry is dummy */
0, 3, 4, 6, 7, 7, 8, 9, 9, 10,
10, 10, 11, 11, 11, 12, 12, 12, 12, 13,
13, 13, 13, 13, 14, 14, 14, 14, 14, 14,
0, 3, 4, 6, 7, 7, 8, 9, 9, 10,
10, 10, 11, 11, 11, 12, 12, 12, 12, 13,
13, 13, 13, 13, 14, 14, 14, 14, 14, 14,
@@
-94,7
+94,7
@@
CONSTANT U8 rgSchPwrRbToPwrTbl[111] = { 0, /* First entry is dummy */
/* This table maps power (in dB) to number of RBs */
/* The array size comes from max power in rgSchPwrRbToPwrTbl */
/* This table maps power (in dB) to number of RBs */
/* The array size comes from max power in rgSchPwrRbToPwrTbl */
-CONSTANT
U8
rgSchPwrToRbTbl[20+1] = {
+CONSTANT
uint8_t
rgSchPwrToRbTbl[20+1] = {
1, 1, 2, 2, 3, 4, 5, 6, 7, 9, 11,
13, 17, 21, 26, 33, 41, 52, 65, 82, 103
};
1, 1, 2, 2, 3, 4, 5, 6, 7, 9, 11,
13, 17, 21, 26, 33, 41, 52, 65, 82, 103
};
@@
-102,36
+102,36
@@
CONSTANT U8 rgSchPwrToRbTbl[20+1] = {
PRIVATE S8 rgSCHPwrGetCqiPwr ARGS((
PRIVATE S8 rgSCHPwrGetCqiPwr ARGS((
-
U8
cqi
+
uint8_t
cqi
));
PRIVATE S8 rgSCHPwrGetCqiPwrForUe ARGS((
RgSchCellCb *cell,
RgSchUeCb *ue,
));
PRIVATE S8 rgSCHPwrGetCqiPwrForUe ARGS((
RgSchCellCb *cell,
RgSchUeCb *ue,
-
U8
cqi
+
uint8_t
cqi
));
PRIVATE S8 rgSCHPwrCalcEfficncyPwr ARGS((
));
PRIVATE S8 rgSCHPwrCalcEfficncyPwr ARGS((
-
U32
eff
+
uint32_t
eff
));
PRIVATE S8 rgSCHPwrGetDelta2FrmCqi ARGS((
));
PRIVATE S8 rgSCHPwrGetDelta2FrmCqi ARGS((
-
U8
crntCqi,
-
U8
trgCqi,
+
uint8_t
crntCqi,
+
uint8_t
trgCqi,
RgSchUeCb *ue,
RgSchCellCb *cell
));
PRIVATE Void rgSCHPwrGetPuschTpc ARGS((
RgSchUeCb *ue,
RgSchCellCb *cell
));
PRIVATE Void rgSCHPwrGetPuschTpc ARGS((
-
U8
isAcc,
+
uint8_t
isAcc,
S8 delta,
S8 availPwr,
S8 delta,
S8 availPwr,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *tpcDelta
));
S8 *tpcDelta
));
-PRIVATE
U8
rgSCHPwrGetMaxRb ARGS((
+PRIVATE
uint8_t
rgSCHPwrGetMaxRb ARGS((
RgSchCellCb *cell,
S8 pwr
));
RgSchCellCb *cell,
S8 pwr
));
-PRIVATE
U8
rgSCHPwrRbToPwr ARGS((
+PRIVATE
uint8_t
rgSCHPwrRbToPwr ARGS((
RgSchCellCb *cell,
RgSchCellCb *cell,
-
U8
numRb
+
uint8_t
numRb
));
PRIVATE Void rgSCHPwrSchedPucchRnti ARGS((
RgSchCellCb *cell,
));
PRIVATE Void rgSCHPwrSchedPucchRnti ARGS((
RgSchCellCb *cell,
@@
-157,37
+157,37
@@
PRIVATE Void rgSCHPwrSchedPuschRnti ARGS((
));
PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe ARGS((
RgSchUeCb *ue,
));
PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe ARGS((
RgSchUeCb *ue,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
));
PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe ARGS((
RgSchUeCb *ue,
S8 *delta
));
PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe ARGS((
RgSchUeCb *ue,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
));
PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe ARGS((
RgSchUeCb *ue,
S8 *delta
));
PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe ARGS((
RgSchUeCb *ue,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
));
PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe ARGS((
RgSchUeCb *ue,
S8 *delta
));
PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe ARGS((
RgSchUeCb *ue,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
));
PRIVATE Void rgSCHPwrGetAcc1bitTpc ARGS((
S8 remPwr,
S8 *delta
));
PRIVATE Void rgSCHPwrGetAcc1bitTpc ARGS((
S8 remPwr,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
));
PRIVATE Void rgSCHPwrGetAcc2bitTpc ARGS((
S8 remPwr,
S8 *delta
));
PRIVATE Void rgSCHPwrGetAcc2bitTpc ARGS((
S8 remPwr,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
));
PRIVATE Void rgSCHPwrGetAbsTpc ARGS((
S8 remPwr,
S8 *delta
));
PRIVATE Void rgSCHPwrGetAbsTpc ARGS((
S8 remPwr,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
));
PRIVATE Void rgSCHPwrOnPucchGrpPwrForUe ARGS((
S8 *delta
));
PRIVATE Void rgSCHPwrOnPucchGrpPwrForUe ARGS((
@@
-326,29
+326,29
@@
PRIVATE Void rgSCHPwrRmvSchdPuschTpcRntiCb ARGS((
));
PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx ARGS((
RgSchCmnTpcRntiCb *cb,
));
PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx ARGS((
RgSchCmnTpcRntiCb *cb,
-
U8
idx
+
uint8_t
idx
));
PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx ARGS((
RgSchCmnTpcRntiCb *cb,
));
PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx ARGS((
RgSchCmnTpcRntiCb *cb,
-
U8
idx
+
uint8_t
idx
));
PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx ARGS((
RgSchCmnTpcRntiCb *cb,
));
PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx ARGS((
RgSchCmnTpcRntiCb *cb,
-
U8
idx
+
uint8_t
idx
));
PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx ARGS((
RgSchCmnTpcRntiCb *cb,
));
PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx ARGS((
RgSchCmnTpcRntiCb *cb,
-
U8
idx
+
uint8_t
idx
));
PRIVATE S16 rgSCHPwrChkTpcRntiIdx ARGS((
RgSchCmnTpcRntiCb *cb,
));
PRIVATE S16 rgSCHPwrChkTpcRntiIdx ARGS((
RgSchCmnTpcRntiCb *cb,
-
U8
idx
+
uint8_t
idx
));
PRIVATE S8 rgSCHPwrGetPhValFromPhr ARGS((
));
PRIVATE S8 rgSCHPwrGetPhValFromPhr ARGS((
-
U8
phr
+
uint8_t
phr
));
PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax ARGS((
));
PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax ARGS((
-
U8
pCMax
+
uint8_t
pCMax
));
/* local defines */
));
/* local defines */
@@
-369,23
+369,22
@@
PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax ARGS((
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHPwrInit
+Void rgSCHPwrInit
(
Void
)
#else
(
Void
)
#else
-
PUBLIC
Void rgSCHPwrInit()
+Void rgSCHPwrInit()
#endif
{
#endif
{
- U8 idx;
- TRC2(rgSCHPwrInit);
+ uint8_t idx;
rgSchPwrCqiToPwrTbl[0] = 0; /* This should never be used anyway */
for (idx = 1; idx < RG_SCH_CMN_UL_NUM_CQI; ++idx)
{
rgSchPwrCqiToPwrTbl[idx] = rgSCHPwrCalcEfficncyPwr(rgSchCmnUlCqiTbl[idx].eff);
}
rgSchPwrCqiToPwrTbl[0] = 0; /* This should never be used anyway */
for (idx = 1; idx < RG_SCH_CMN_UL_NUM_CQI; ++idx)
{
rgSchPwrCqiToPwrTbl[idx] = rgSCHPwrCalcEfficncyPwr(rgSchCmnUlCqiTbl[idx].eff);
}
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-395,7
+394,7
@@
PUBLIC Void rgSCHPwrInit()
* Desc : Returns power corresponding to coding efficiency
* when beta pusch is assumed 1.
*
* Desc : Returns power corresponding to coding efficiency
* when beta pusch is assumed 1.
*
- * Ret :
U8
+ * Ret :
uint8_t
*
* Notes:
*
*
* Notes:
*
@@
-405,16
+404,15
@@
PUBLIC Void rgSCHPwrInit()
#ifdef ANSI
PRIVATE S8 rgSCHPwrGetCqiPwr
(
#ifdef ANSI
PRIVATE S8 rgSCHPwrGetCqiPwr
(
-
U8
cqi
+
uint8_t
cqi
)
#else
PRIVATE S8 rgSCHPwrGetCqiPwr(cqi)
)
#else
PRIVATE S8 rgSCHPwrGetCqiPwr(cqi)
-
U8
cqi;
+
uint8_t
cqi;
#endif
{
#endif
{
- TRC2(rgSCHPwrGetCqiPwr);
-
RETVALUE
(rgSchPwrCqiToPwrTbl[cqi]);
+
return
(rgSchPwrCqiToPwrTbl[cqi]);
} /* rgSCHPwrGetCqiPwr */
/***********************************************************
} /* rgSCHPwrGetCqiPwr */
/***********************************************************
@@
-424,7
+422,7
@@
U8 cqi;
* Desc : If MCS control is enabled for UE, returns
* power corresponding to CQI, else 0.
*
* Desc : If MCS control is enabled for UE, returns
* power corresponding to CQI, else 0.
*
- * Ret :
U8
+ * Ret :
uint8_t
*
* Notes:
*
*
* Notes:
*
@@
-436,23
+434,22
@@
PRIVATE S8 rgSCHPwrGetCqiPwrForUe
(
RgSchCellCb *cell,
RgSchUeCb *ue,
(
RgSchCellCb *cell,
RgSchUeCb *ue,
-
U8
cqi
+
uint8_t
cqi
)
#else
PRIVATE S8 rgSCHPwrGetCqiPwrForUe(cell, ue, cqi)
RgSchCellCb *cell;
RgSchUeCb *ue;
)
#else
PRIVATE S8 rgSCHPwrGetCqiPwrForUe(cell, ue, cqi)
RgSchCellCb *cell;
RgSchUeCb *ue;
-
U8
cqi;
+
uint8_t
cqi;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
- TRC2(rgSCHPwrGetCqiPwrForUe);
if (!uePwr->deltaMcsEnbld)
{
if (!uePwr->deltaMcsEnbld)
{
-
RETVALUE
(0);
+
return
(0);
}
}
-
RETVALUE
(rgSCHPwrGetCqiPwr(cqi));
+
return
(rgSCHPwrGetCqiPwr(cqi));
} /* rgSCHPwrGetCqiPwrForUe */
/***********************************************************
} /* rgSCHPwrGetCqiPwrForUe */
/***********************************************************
@@
-462,7
+459,7
@@
U8 cqi;
* Desc : Computes power corresponding to a coding
* efficiency.
*
* Desc : Computes power corresponding to a coding
* efficiency.
*
- * Ret :
U8
+ * Ret :
uint8_t
*
* Notes: Assumes beta pusch to be 1
*
*
* Notes: Assumes beta pusch to be 1
*
@@
-472,20
+469,19
@@
U8 cqi;
#ifdef ANSI
PRIVATE S8 rgSCHPwrCalcEfficncyPwr
(
#ifdef ANSI
PRIVATE S8 rgSCHPwrCalcEfficncyPwr
(
-
U32
eff
+
uint32_t
eff
)
#else
PRIVATE S8 rgSCHPwrCalcEfficncyPwr(eff)
)
#else
PRIVATE S8 rgSCHPwrCalcEfficncyPwr(eff)
-
U32
eff;
+
uint32_t
eff;
#endif
{
F64 ks = 1.25; /* or F64 */
F64 tmp = cmPow(2, ks*eff/1024) - 1;
#endif
{
F64 ks = 1.25; /* or F64 */
F64 tmp = cmPow(2, ks*eff/1024) - 1;
- TRC2(rgSCHPwrCalcEfficncyPwr);
if (tmp <= 0)
if (tmp <= 0)
-
RETVALUE
(0);
-
RETVALUE
((S8)(10 * cmLog10(tmp)));
+
return
(0);
+
return
((S8)(10 * cmLog10(tmp)));
} /* rgSCHPwrCalcEfficncyPwr */
} /* rgSCHPwrCalcEfficncyPwr */
@@
-509,16
+505,16
@@
U32 eff;
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
- * @return
U8
+ * @return
uint8_t
**/
#ifdef ANSI
**/
#ifdef ANSI
-
PUBLIC U8
rgSCHPwrPuschTpcForUe
+
uint8_t
rgSCHPwrPuschTpcForUe
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-
PUBLIC U8
rgSCHPwrPuschTpcForUe(cell, ue)
+
uint8_t
rgSCHPwrPuschTpcForUe(cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
@@
-526,10
+522,9
@@
RgSchUeCb *ue;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue,cell);
UNUSED(cell);
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue,cell);
UNUSED(cell);
- TRC2(rgSCHPwrPuschTpcForUe);
rgSCHPwrOnSchedPuschTpc(cell, ue);
rgSCHPwrOnSchedPuschTpc(cell, ue);
-
RETVALUE
(uePwr->puschTpc);
+
return
(uePwr->puschTpc);
}
/**
}
/**
@@
-555,23
+550,22
@@
RgSchUeCb *ue;
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC U8
rgSCHPwrGetMaxUlRb
+
uint8_t
rgSCHPwrGetMaxUlRb
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-
PUBLIC U8
rgSCHPwrGetMaxUlRb(cell, ue)
+
uint8_t
rgSCHPwrGetMaxUlRb(cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
- TRC2(rgSCHPwrGetMaxUlRb);
rgSCHPwrPuschCntrl(cell, ue); /* This stores tpc, delta and maxRb
* in uePwr */
rgSCHPwrPuschCntrl(cell, ue); /* This stores tpc, delta and maxRb
* in uePwr */
-
RETVALUE
(uePwr->maxUlRbs);
+
return
(uePwr->maxUlRbs);
}
/**
}
/**
@@
-622,20
+616,18
@@
RgSchUeCb *ue;
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
S8 delta;
#ifdef TFU_UPGRADE
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
S8 delta;
#ifdef TFU_UPGRADE
-
U8
cqi = ueUl->validUlCqi;
+
uint8_t
cqi = ueUl->validUlCqi;
S32 tmp;
#else
S32 tmp;
#else
-
U8
cqi = ueUl->crntUlCqi[0];
+
uint8_t
cqi = ueUl->crntUlCqi[0];
#endif
Bool isAcc = uePwr->isAccumulated;
#endif
Bool isAcc = uePwr->isAccumulated;
-
U8
tpc;
+
uint8_t
tpc;
S8 availPwr;
S8 availPwr;
-
U8
maxRb;
+
uint8_t
maxRb;
UNUSED(cell);
UNUSED(cell);
- TRC2(rgSCHPwrPuschCntrl);
-
if (!uePwr->isPhrAvail)
{
availPwr = 60; /* setting a large value so that availPwr does
if (!uePwr->isPhrAvail)
{
availPwr = 60; /* setting a large value so that availPwr does
@@
-683,7
+675,7
@@
RgSchUeCb *ue;
uePwr->delta = delta;
uePwr->maxUlRbs = maxRb;
uePwr->puschTpc = tpc;
uePwr->delta = delta;
uePwr->maxUlRbs = maxRb;
uePwr->puschTpc = tpc;
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-703,25
+695,24
@@
RgSchUeCb *ue;
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
- * @return
U8
+ * @return
uint8_t
**/
#ifdef ANSI
**/
#ifdef ANSI
-
PUBLIC U8
rgSCHPwrPucchTpcForUe
+
uint8_t
rgSCHPwrPucchTpcForUe
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-
PUBLIC U8
rgSCHPwrPucchTpcForUe(cell, ue)
+
uint8_t
rgSCHPwrPucchTpcForUe(cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
- TRC2(rgSCHPwrPucchTpcForUe);
rgSCHPwrPucchCntrl(cell, ue);
rgSCHPwrPucchCntrl(cell, ue);
-
RETVALUE
(uePwr->pucchTpc);
+
return
(uePwr->pucchTpc);
}
/***********************************************************
}
/***********************************************************
@@
-742,22
+733,21
@@
RgSchUeCb *ue;
#ifdef ANSI
PRIVATE S8 rgSCHPwrGetDelta2FrmCqi
(
#ifdef ANSI
PRIVATE S8 rgSCHPwrGetDelta2FrmCqi
(
-
U8
crntCqi,
-
U8
trgCqi,
+
uint8_t
crntCqi,
+
uint8_t
trgCqi,
RgSchUeCb *ue,
RgSchCellCb *cell
)
#else
PRIVATE S8 rgSCHPwrGetDelta2FrmCqi(crntCqi, trgCqi)
RgSchUeCb *ue,
RgSchCellCb *cell
)
#else
PRIVATE S8 rgSCHPwrGetDelta2FrmCqi(crntCqi, trgCqi)
-
U8
crntCqi;
-
U8
trgCqi;
+
uint8_t
crntCqi;
+
uint8_t
trgCqi;
RgSchUeCb *ue;
RgSchCellCb *cell;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgSchUeCb *ue;
RgSchCellCb *cell;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
- TRC2(rgSCHPwrGetDelta2FrmCqi);
if (uePwr->isPhrAvail)
{
if (uePwr->isPhrAvail)
{
@@
-772,9
+762,9
@@
RgSchCellCb *cell;
if (uePwr->maxPwrDeltaByPhr < 0 && (trgCqi - crntCqi) *
RG_SCH_UL_CQI_DB_STEP_2 > 0)
{
if (uePwr->maxPwrDeltaByPhr < 0 && (trgCqi - crntCqi) *
RG_SCH_UL_CQI_DB_STEP_2 > 0)
{
-
RETVALUE
(0);
+
return
(0);
}
}
-
RETVALUE
(RGSCH_MIN(uePwr->maxPwrDeltaByPhr,
+
return
(RGSCH_MIN(uePwr->maxPwrDeltaByPhr,
(trgCqi - crntCqi) * RG_SCH_UL_CQI_DB_STEP_2));
} /* rgSCHPwrGetDelta2FrmCqi */
(trgCqi - crntCqi) * RG_SCH_UL_CQI_DB_STEP_2));
} /* rgSCHPwrGetDelta2FrmCqi */
@@
-796,22
+786,21
@@
RgSchCellCb *cell;
#ifdef ANSI
PRIVATE Void rgSCHPwrGetPuschTpc
(
#ifdef ANSI
PRIVATE Void rgSCHPwrGetPuschTpc
(
-
U8
isAcc,
+
uint8_t
isAcc,
S8 delta,
S8 availPwr,
S8 delta,
S8 availPwr,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *tpcDelta
)
#else
PRIVATE Void rgSCHPwrGetPuschTpc(isAcc, delta, availPwr, tpc, tpcDelta)
S8 *tpcDelta
)
#else
PRIVATE Void rgSCHPwrGetPuschTpc(isAcc, delta, availPwr, tpc, tpcDelta)
-
U8
isAcc;
+
uint8_t
isAcc;
S8 delta;
S8 availPwr;
S8 delta;
S8 availPwr;
-
U8
*tpc;
+
uint8_t
*tpc;
S8 *tpcDelta;
#endif
{
S8 *tpcDelta;
#endif
{
- TRC2(rgSCHPwrGetPuschTpc);
delta = RGSCH_MIN(delta, availPwr);
delta = RGSCH_MIN(delta, availPwr);
@@
-825,7
+814,7
@@
S8 *tpcDelta;
{
rgSCHPwrGetAbsTpc(delta, tpc, tpcDelta);
}
{
rgSCHPwrGetAbsTpc(delta, tpc, tpcDelta);
}
-
RETVOID
;
+
return
;
} /* rgSCHPwrGetPuschTpc */
/***********************************************************
} /* rgSCHPwrGetPuschTpc */
/***********************************************************
@@
-836,7
+825,7
@@
S8 *tpcDelta;
* expected to be supported by the passed
* power headroom.
*
* expected to be supported by the passed
* power headroom.
*
- * Ret :
U8
+ * Ret :
uint8_t
*
* Notes:
*
*
* Notes:
*
@@
-844,34
+833,32
@@
S8 *tpcDelta;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-PRIVATE
U8
rgSCHPwrGetMaxRb
+PRIVATE
uint8_t
rgSCHPwrGetMaxRb
(
RgSchCellCb *cell,
S8 pwr
)
#else
(
RgSchCellCb *cell,
S8 pwr
)
#else
-PRIVATE
U8
rgSCHPwrGetMaxRb(cell, pwr)
+PRIVATE
uint8_t
rgSCHPwrGetMaxRb(cell, pwr)
RgSchCellCb *cell;
S8 pwr;
#endif
{
RgSchCmnUlCell *cellUl;
RgSchCellCb *cell;
S8 pwr;
#endif
{
RgSchCmnUlCell *cellUl;
- TRC2(rgSCHPwrGetMaxRb);
-
cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
if (pwr <= 0)
{
/* Give 4 RBS so that UE can report changed power status*/
/* [ccpu00119916] Mod -return 0th index of rgSchPwrToRbTbl when pwr <=0
* Change the Macros from RGSCH_MAX_DL_BW to RGSCH_MAX_UL_BW*/
cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
if (pwr <= 0)
{
/* Give 4 RBS so that UE can report changed power status*/
/* [ccpu00119916] Mod -return 0th index of rgSchPwrToRbTbl when pwr <=0
* Change the Macros from RGSCH_MAX_DL_BW to RGSCH_MAX_UL_BW*/
-
RETVALUE
(rgSchPwrToRbTbl[0]);
+
return
(rgSchPwrToRbTbl[0]);
}
if (pwr > rgSchPwrRbToPwrTbl[cellUl->maxUlBwPerUe])
{
}
if (pwr > rgSchPwrRbToPwrTbl[cellUl->maxUlBwPerUe])
{
-
RETVALUE
(cellUl->maxUlBwPerUe);
+
return
(cellUl->maxUlBwPerUe);
}
}
-
RETVALUE(RGSCH_MIN(cellUl->maxUlBwPerUe,rgSchPwrToRbTbl[(U8
)pwr]));
+
return (RGSCH_MIN(cellUl->maxUlBwPerUe,rgSchPwrToRbTbl[(uint8_t
)pwr]));
} /* rgSCHPwrGetMaxRb */
/***********************************************************
} /* rgSCHPwrGetMaxRb */
/***********************************************************
@@
-880,7
+867,7
@@
S8 pwr;
*
* Desc : Get the power corresponding to number of RBs
*
*
* Desc : Get the power corresponding to number of RBs
*
- * Ret :
U8
+ * Ret :
uint8_t
*
* Notes:
*
*
* Notes:
*
@@
-888,21
+875,20
@@
S8 pwr;
*
**********************************************************/
#ifdef ANSI
*
**********************************************************/
#ifdef ANSI
-PRIVATE
U8
rgSCHPwrRbToPwr
+PRIVATE
uint8_t
rgSCHPwrRbToPwr
(
RgSchCellCb *cell,
(
RgSchCellCb *cell,
-
U8
numRb
+
uint8_t
numRb
)
#else
)
#else
-PRIVATE
U8
rgSCHPwrRbToPwr(cell,numRb)
+PRIVATE
uint8_t
rgSCHPwrRbToPwr(cell,numRb)
RgSchCellCb *cell;
RgSchCellCb *cell;
-
U8
numRb;
+
uint8_t
numRb;
#endif
{
#ifndef NO_ERRCLS
RgSchCmnUlCell *cellUl;
#endif
#endif
{
#ifndef NO_ERRCLS
RgSchCmnUlCell *cellUl;
#endif
- TRC2(rgSCHPwrRbToPwr);
#if (ERRCLASS & ERRCLS_DEBUG)
cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
if (numRb > cellUl->maxUlBwPerUe)
#if (ERRCLASS & ERRCLS_DEBUG)
cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
if (numRb > cellUl->maxUlBwPerUe)
@@
-910,7
+896,7
@@
U8 numRb;
numRb = cellUl->maxUlBwPerUe;
}
#endif
numRb = cellUl->maxUlBwPerUe;
}
#endif
-
RETVALUE
(rgSchPwrRbToPwrTbl[numRb]);
+
return
(rgSchPwrRbToPwrTbl[numRb]);
} /* rgSCHPwrRbToPwr */
} /* rgSCHPwrRbToPwr */
@@
-943,11
+929,10
@@
RgSchUeCb *ue;
{
S8 delta;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
{
S8 delta;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
- TRC2(rgSCHPwrPucchCntrl);
rgSCHPwrGetAcc2bitTpc(uePwr->remPucchPwr, &uePwr->pucchTpc, &delta);
rgSCHPwrOnSchedPucchTpc(cell, ue, delta);
rgSCHPwrGetAcc2bitTpc(uePwr->remPucchPwr, &uePwr->pucchTpc, &delta);
rgSCHPwrOnSchedPucchTpc(cell, ue, delta);
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-999,13
+984,13
@@
RgSchUeCb *ue;
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHPwrGrpCntrlPucch
+Void rgSCHPwrGrpCntrlPucch
(
RgSchCellCb *cell,
RgSchDlSf *dlSf
)
#else
(
RgSchCellCb *cell,
RgSchDlSf *dlSf
)
#else
-
PUBLIC
Void rgSCHPwrGrpCntrlPucch(cell, dlSf)
+Void rgSCHPwrGrpCntrlPucch(cell, dlSf)
RgSchCellCb *cell;
RgSchDlSf *dlSf;
#endif
RgSchCellCb *cell;
RgSchDlSf *dlSf;
#endif
@@
-1014,7
+999,6
@@
RgSchDlSf *dlSf;
CmLListCp *lst;
CmLList *lnk;
RgSchPdcch *pdcch;
CmLListCp *lst;
CmLList *lnk;
RgSchPdcch *pdcch;
- TRC2(rgSCHPwrGrpCntrlPucch);
lst = &cellPwr->pucchGrpPwr;
lnk = lst->first;
lst = &cellPwr->pucchGrpPwr;
lnk = lst->first;
@@
-1032,7
+1016,7
@@
RgSchDlSf *dlSf;
* be scheduled again */
}
* be scheduled again */
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-1082,14
+1066,14
@@
RgSchDlSf *dlSf;
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHPwrGrpCntrlPusch
+Void rgSCHPwrGrpCntrlPusch
(
RgSchCellCb *cell,
RgSchDlSf *dlSf,
RgSchUlSf *ulSf
)
#else
(
RgSchCellCb *cell,
RgSchDlSf *dlSf,
RgSchUlSf *ulSf
)
#else
-
PUBLIC
Void rgSCHPwrGrpCntrlPusch(cell, dlSf, ulSf)
+Void rgSCHPwrGrpCntrlPusch(cell, dlSf, ulSf)
RgSchCellCb *cell;
RgSchDlSf *dlSf;
RgSchUlSf *ulSf;
RgSchCellCb *cell;
RgSchDlSf *dlSf;
RgSchUlSf *ulSf;
@@
-1099,7
+1083,6
@@
RgSchUlSf *ulSf;
CmLListCp *lst;
CmLList *lnk;
RgSchPdcch *pdcch;
CmLListCp *lst;
CmLList *lnk;
RgSchPdcch *pdcch;
- TRC2(rgSCHPwrGrpCntrlPusch);
lst = &cellPwr->puschGrpPwr;
lnk = lst->first;
lst = &cellPwr->puschGrpPwr;
lnk = lst->first;
@@
-1117,7
+1100,7
@@
RgSchUlSf *ulSf;
* be scheduled again */
}
* be scheduled again */
}
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-1153,11
+1136,10
@@
Bool *sched;
{
CmLListCp *lst;
CmLList *lnk;
{
CmLListCp *lst;
CmLList *lnk;
-
U8
*tpcCmds;
-
U8
tpc;
+
uint8_t
*tpcCmds;
+
uint8_t
tpc;
S8 delta;
Bool atleastOne;
S8 delta;
Bool atleastOne;
- TRC2(rgSCHPwrSchedPucchRnti);
pdcch->rnti = cb->tpcRnti;
pdcch->rnti = cb->tpcRnti;
@@
-1209,7
+1191,7
@@
Bool *sched;
pdcch->dci.u.format3Info.isPucch = TRUE;
/* Fill TPC 1 (corresponding to no power change) initially */
pdcch->dci.u.format3Info.isPucch = TRUE;
/* Fill TPC 1 (corresponding to no power change) initially */
-
cmMemset((U8 *)
tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd));
+
memset(
tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd));
for (atleastOne = FALSE, lnk = lst->first; lnk; lnk = lnk->next)
{
for (atleastOne = FALSE, lnk = lst->first; lnk; lnk = lnk->next)
{
@@
-1248,7
+1230,7
@@
Bool *sched;
rgSCHPwrRmvSchdPucchTpcRntiCb(cell, cb);
}
rgSCHPwrRmvSchdPucchTpcRntiCb(cell, cb);
}
-
RETVOID
;
+
return
;
} /* rgSCHPwrSchedPucchRnti */
/***********************************************************
} /* rgSCHPwrSchedPucchRnti */
/***********************************************************
@@
-1284,11
+1266,10
@@
Bool *sched;
{
CmLListCp *lst;
CmLList *lnk;
{
CmLListCp *lst;
CmLList *lnk;
-
U8
*tpcCmds;
-
U8
tpc;
+
uint8_t
*tpcCmds;
+
uint8_t
tpc;
S8 delta;
Bool atleastOne;
S8 delta;
Bool atleastOne;
- TRC2(rgSCHPwrSchedPuschRnti);
pdcch->rnti = cb->tpcRnti;
pdcch->rnti = cb->tpcRnti;
@@
-1339,7
+1320,7
@@
Bool *sched;
tpcCmds = pdcch->dci.u.format3Info.tpcCmd;
/* Fill TPC 1 (corresponding to no power change) initially */
tpcCmds = pdcch->dci.u.format3Info.tpcCmd;
/* Fill TPC 1 (corresponding to no power change) initially */
-
cmMemset((U8 *)
tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd));
+
memset(
tpcCmds, 1, sizeof(pdcch->dci.u.format3Info.tpcCmd));
for (atleastOne = FALSE, lnk = lst->first; lnk; lnk = lnk->next)
{
for (atleastOne = FALSE, lnk = lst->first; lnk; lnk = lnk->next)
{
@@
-1378,7
+1359,7
@@
Bool *sched;
rgSCHPwrRmvSchdPuschTpcRntiCb(cell, cb);
}
rgSCHPwrRmvSchdPuschTpcRntiCb(cell, cb);
}
-
RETVOID
;
+
return
;
} /* rgSCHPwrSchedPuschRnti */
/***********************************************************
} /* rgSCHPwrSchedPuschRnti */
/***********************************************************
@@
-1398,21
+1379,20
@@
Bool *sched;
PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe
(
RgSchUeCb *ue,
PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe
(
RgSchUeCb *ue,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe(ue, tpc, delta)
RgSchUeCb *ue;
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe(ue, tpc, delta)
RgSchUeCb *ue;
-
U8
*tpc;
+
uint8_t
*tpc;
S8 *delta;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
S8 *delta;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrGetPucchFmt3TpcForUe);
rgSCHPwrGetAcc2bitTpc(uePwr->remPucchPwr, tpc, delta);
rgSCHPwrGetAcc2bitTpc(uePwr->remPucchPwr, tpc, delta);
-
RETVOID
;
+
return
;
} /* rgSCHPwrGetPucchFmt3TpcForUe */
/***********************************************************
} /* rgSCHPwrGetPucchFmt3TpcForUe */
/***********************************************************
@@
-1432,21
+1412,20
@@
S8 *delta;
PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe
(
RgSchUeCb *ue,
PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe
(
RgSchUeCb *ue,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe(ue, tpc, delta)
RgSchUeCb *ue;
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe(ue, tpc, delta)
RgSchUeCb *ue;
-
U8
*tpc;
+
uint8_t
*tpc;
S8 *delta;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
S8 *delta;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrGetPucchFmt3aTpcForUe);
rgSCHPwrGetAcc1bitTpc(uePwr->remPucchPwr, tpc, delta);
rgSCHPwrGetAcc1bitTpc(uePwr->remPucchPwr, tpc, delta);
-
RETVOID
;
+
return
;
} /* rgSCHPwrGetPucchFmt3aTpcForUe */
/***********************************************************
} /* rgSCHPwrGetPucchFmt3aTpcForUe */
/***********************************************************
@@
-1466,22
+1445,21
@@
S8 *delta;
PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe
(
RgSchUeCb *ue,
PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe
(
RgSchUeCb *ue,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe(ue, tpc, delta)
RgSchUeCb *ue;
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe(ue, tpc, delta)
RgSchUeCb *ue;
-
U8
*tpc;
+
uint8_t
*tpc;
S8 *delta;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
S8 adj = RGSCH_MIN(uePwr->remPuschPwr, uePwr->phVal);
S8 *delta;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
S8 adj = RGSCH_MIN(uePwr->remPuschPwr, uePwr->phVal);
- TRC2(rgSCHPwrGetPuschFmt3TpcForUe);
rgSCHPwrGetAcc2bitTpc(adj, tpc, delta);
rgSCHPwrGetAcc2bitTpc(adj, tpc, delta);
-
RETVOID
;
+
return
;
} /* rgSCHPwrGetPuschFmt3TpcForUe */
/***********************************************************
} /* rgSCHPwrGetPuschFmt3TpcForUe */
/***********************************************************
@@
-1501,23
+1479,22
@@
S8 *delta;
PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe
(
RgSchUeCb *ue,
PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe
(
RgSchUeCb *ue,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe(ue, tpc, delta)
RgSchUeCb *ue;
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe(ue, tpc, delta)
RgSchUeCb *ue;
-
U8
*tpc;
+
uint8_t
*tpc;
S8 *delta;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
S8 *delta;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrGetPuschFmt3aTpcForUe);
/* Don't attempt to look at headroom now, power
* adjustment is small anyway */
rgSCHPwrGetAcc1bitTpc(uePwr->remPuschPwr, tpc, delta);
/* Don't attempt to look at headroom now, power
* adjustment is small anyway */
rgSCHPwrGetAcc1bitTpc(uePwr->remPuschPwr, tpc, delta);
-
RETVOID
;
+
return
;
} /* rgSCHPwrGetPuschFmt3aTpcForUe */
/***********************************************************
} /* rgSCHPwrGetPuschFmt3aTpcForUe */
/***********************************************************
@@
-1537,17
+1514,16
@@
S8 *delta;
PRIVATE Void rgSCHPwrGetAcc1bitTpc
(
S8 remPwr,
PRIVATE Void rgSCHPwrGetAcc1bitTpc
(
S8 remPwr,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetAcc1bitTpc(remPwr, tpc, delta)
S8 remPwr;
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetAcc1bitTpc(remPwr, tpc, delta)
S8 remPwr;
-
U8
*tpc;
+
uint8_t
*tpc;
S8 *delta;
#endif
{
S8 *delta;
#endif
{
- TRC2(rgSCHPwrGetAcc1bitTpc);
/*
* TPC delta
* 0 -1
/*
* TPC delta
* 0 -1
@@
-1563,7
+1539,7
@@
S8 *delta;
*delta = 1;
*tpc = 1;
}
*delta = 1;
*tpc = 1;
}
-
RETVOID
;
+
return
;
} /* rgSCHPwrGetAcc1bitTpc */
/***********************************************************
} /* rgSCHPwrGetAcc1bitTpc */
/***********************************************************
@@
-1583,13
+1559,13
@@
S8 *delta;
PRIVATE Void rgSCHPwrGetAcc2bitTpc
(
S8 remPwr,
PRIVATE Void rgSCHPwrGetAcc2bitTpc
(
S8 remPwr,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetAcc2bitTpc(remPwr, tpc, delta)
S8 remPwr;
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetAcc2bitTpc(remPwr, tpc, delta)
S8 remPwr;
-
U8
*tpc;
+
uint8_t
*tpc;
S8 *delta;
#endif
{
S8 *delta;
#endif
{
@@
-1600,9
+1576,8
@@
S8 *delta;
* 2 1
* 3 3
*/
* 2 1
* 3 3
*/
- U8 tpcs[3] = {1, 2, 2};
- U8 deltas[3] = {0, 1, 1};
- TRC2(rgSCHPwrGetAcc2bitTpc);
+ uint8_t tpcs[3] = {1, 2, 2};
+ uint8_t deltas[3] = {0, 1, 1};
if (remPwr <= -1)
{
*tpc = 0;
if (remPwr <= -1)
{
*tpc = 0;
@@
-1615,10
+1590,10
@@
S8 *delta;
}
else
{
}
else
{
- *tpc = tpcs[(
U8
)remPwr];
- *delta = deltas[(
U8
)remPwr];
+ *tpc = tpcs[(
uint8_t
)remPwr];
+ *delta = deltas[(
uint8_t
)remPwr];
}
}
-
RETVOID
;
+
return
;
} /* rgSCHPwrGetAcc2bitTpc */
/***********************************************************
} /* rgSCHPwrGetAcc2bitTpc */
/***********************************************************
@@
-1638,17
+1613,16
@@
S8 *delta;
PRIVATE Void rgSCHPwrGetAbsTpc
(
S8 remPwr,
PRIVATE Void rgSCHPwrGetAbsTpc
(
S8 remPwr,
-
U8
*tpc,
+
uint8_t
*tpc,
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetAbsTpc(remPwr, tpc, delta)
S8 remPwr;
S8 *delta
)
#else
PRIVATE Void rgSCHPwrGetAbsTpc(remPwr, tpc, delta)
S8 remPwr;
-
U8
*tpc;
+
uint8_t
*tpc;
S8 *delta;
#endif
{
S8 *delta;
#endif
{
- TRC2(rgSCHPwrGetAbsTpc);
/*
* TPC delta
* 0 -4
/*
* TPC delta
* 0 -4
@@
-1676,7
+1650,7
@@
S8 *delta;
*tpc = 3;
*delta = 4;
}
*tpc = 3;
*delta = 4;
}
-
RETVOID
;
+
return
;
} /* rgSCHPwrGetAbsTpc */
/***********************************************************
} /* rgSCHPwrGetAbsTpc */
/***********************************************************
@@
-1719,8
+1693,6
@@
S8 delta;
UNUSED(cell);
UNUSED(cell);
- TRC2(rgSCHPwrOnPucchGrpPwrForUe);
-
uePwr->remPucchPwr -= delta;
/* UE was already scheduled for PUCCH group power
uePwr->remPucchPwr -= delta;
/* UE was already scheduled for PUCCH group power
@@
-1740,7
+1712,7
@@
S8 delta;
* this will happen in the caller once this
* function is called for every UE scheduled. */
}
* this will happen in the caller once this
* function is called for every UE scheduled. */
}
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-1782,7
+1754,6
@@
S8 delta;
Bool rmvUe = FALSE;
UNUSED(cell);
Bool rmvUe = FALSE;
UNUSED(cell);
- TRC2(rgSCHPwrOnPuschGrpPwrForUe);
uePwr->delta = delta;
uePwr->remPuschPwr -= delta;
uePwr->delta = delta;
uePwr->remPuschPwr -= delta;
@@
-1811,7
+1782,7
@@
S8 delta;
* this will happen in the caller once this
* function is called for every UE scheduled. */
}
* this will happen in the caller once this
* function is called for every UE scheduled. */
}
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-1844,11
+1815,9
@@
RgSchDlSf *sf;
RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
RgSchDlHqProcCb *proc = rgSCHDhmLastSchedHqProc(hqEnt);
RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
RgSchDlHqProcCb *proc = rgSCHDhmLastSchedHqProc(hqEnt);
- TRC2(rgSCHPwrIsDlUeSched);
-
if (proc == NULLP)
{
if (proc == NULLP)
{
-
RETVALUE
(FALSE);
+
return
(FALSE);
}
/*
}
/*
@@
-1873,11
+1842,11
@@
RgSchDlSf *sf;
* Checking for PDCCH would have to be in common proc
* the way things are now.
*/
* Checking for PDCCH would have to be in common proc
* the way things are now.
*/
-
RETVALUE
(TRUE);
+
return
(TRUE);
}
else
{
}
else
{
-
RETVALUE
(FALSE);
+
return
(FALSE);
}
} /* rgSCHPwrIsDlUeSched */
}
} /* rgSCHPwrIsDlUeSched */
@@
-1911,24
+1880,22
@@
RgSchUlSf *sf;
RgSchCmnUlCell *cmnCell = RG_SCH_CMN_GET_UL_CELL(cell);
RgSchUlHqProcCb *proc = rgSCHUhmGetUlHqProc(cell, ue, cmnCell->schdHqProcIdx);
RgSchCmnUlCell *cmnCell = RG_SCH_CMN_GET_UL_CELL(cell);
RgSchUlHqProcCb *proc = rgSCHUhmGetUlHqProc(cell, ue, cmnCell->schdHqProcIdx);
- TRC2(rgSCHPwrIsUlUeSched);
-
UNUSED(sf);
#if (ERRCLASS & ERRCLS_DEBUG)
if( proc == NULLP )
{
UNUSED(sf);
#if (ERRCLASS & ERRCLS_DEBUG)
if( proc == NULLP )
{
-
RETVALUE
(FALSE);
+
return
(FALSE);
}
#endif
if (proc->alloc)
{
}
#endif
if (proc->alloc)
{
-
RETVALUE
(TRUE);
+
return
(TRUE);
}
else
{
}
else
{
-
RETVALUE
(FALSE);
+
return
(FALSE);
}
} /* rgSCHPwrIsUlUeSched */
}
} /* rgSCHPwrIsUlUeSched */
@@
-1964,18
+1931,18
@@
RgSchUlSf *sf;
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
- * @param[in]
U8
pwrDelta
+ * @param[in]
uint8_t
pwrDelta
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHPwrPucchDeltaInd
+Void rgSCHPwrPucchDeltaInd
(
RgSchCellCb *cell,
RgSchUeCb *ue,
S8 pwrDelta
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue,
S8 pwrDelta
)
#else
-
PUBLIC
Void rgSCHPwrPucchDeltaInd(cell, ue, pwrDelta)
+Void rgSCHPwrPucchDeltaInd(cell, ue, pwrDelta)
RgSchCellCb *cell;
RgSchUeCb *ue;
S8 pwrDelta;
RgSchCellCb *cell;
RgSchUeCb *ue;
S8 pwrDelta;
@@
-1984,13
+1951,12
@@
S8 pwrDelta;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgSchCmnTpcRntiCb *cb;
Bool toAdd;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgSchCmnTpcRntiCb *cb;
Bool toAdd;
- TRC2(rgSCHPwrPucchDeltaInd);
uePwr->remPucchPwr = pwrDelta;
if ((cb = uePwr->tpcPucchRntiCb) == NULLP)
{
uePwr->remPucchPwr = pwrDelta;
if ((cb = uePwr->tpcPucchRntiCb) == NULLP)
{
-
RETVOID
;
+
return
;
}
toAdd = FALSE;
}
toAdd = FALSE;
@@
-2010,7
+1976,7
@@
S8 pwrDelta;
rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue);
}
rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue);
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-2053,13
+2019,12
@@
S8 delta;
* improved its remPwr as part of power control. */
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
Bool rmvUe = FALSE;
* improved its remPwr as part of power control. */
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
Bool rmvUe = FALSE;
- TRC2(rgSCHPwrOnSchedPucchTpc);
uePwr->remPucchPwr -= delta;
if (uePwr->schdPucchGrpLnk.node == NULLP)
{
uePwr->remPucchPwr -= delta;
if (uePwr->schdPucchGrpLnk.node == NULLP)
{
-
RETVOID
;
+
return
;
}
/* UE was scheduled for TPC, sent TPC may
}
/* UE was scheduled for TPC, sent TPC may
@@
-2078,7
+2043,7
@@
S8 delta;
rgSCHPwrRmvSchdPucchTpcRntiCb(cell, uePwr->tpcPucchRntiCb);
}
}
rgSCHPwrRmvSchdPucchTpcRntiCb(cell, uePwr->tpcPucchRntiCb);
}
}
-
RETVOID
;
+
return
;
}
}
@@
-2112,12
+2077,11
@@
RgSchUeCb *ue;
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
Bool rmvUe = FALSE;
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
Bool rmvUe = FALSE;
- TRC2(rgSCHPwrOnSchedPuschTpc);
/* Don't do anything for the case of absolute TPC commands */
if (!uePwr->isAccumulated)
{
/* Don't do anything for the case of absolute TPC commands */
if (!uePwr->isAccumulated)
{
-
RETVOID
;
+
return
;
}
uePwr->remPuschPwr -= uePwr->delta;
}
uePwr->remPuschPwr -= uePwr->delta;
@@
-2129,7
+2093,7
@@
RgSchUeCb *ue;
if (uePwr->schdPuschGrpLnk.node == NULLP)
{
if (uePwr->schdPuschGrpLnk.node == NULLP)
{
-
RETVOID
;
+
return
;
}
/* UE was scheduled for pusch TPC, sent TPC may
}
/* UE was scheduled for pusch TPC, sent TPC may
@@
-2145,7
+2109,7
@@
RgSchUeCb *ue;
rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, uePwr->tpcPuschRntiCb, ue);
}
rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, uePwr->tpcPuschRntiCb, ue);
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-2161,7
+2125,7
@@
RgSchUeCb *ue;
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHPwrUpdExtPhr
+Void rgSCHPwrUpdExtPhr
(
RgSchCellCb *cell,
RgSchUeCb *ue,
(
RgSchCellCb *cell,
RgSchUeCb *ue,
@@
-2169,19
+2133,17
@@
RgInfExtPhrCEInfo *extPhr,
RgSchCmnAllocRecord *allocInfo
)
#else
RgSchCmnAllocRecord *allocInfo
)
#else
-
PUBLIC
Void rgSCHPwrUpdExtPhr(cell, ue, extPhr, allocInfo)
+Void rgSCHPwrUpdExtPhr(cell, ue, extPhr, allocInfo)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgInfExtPhrCEInfo *extPhr;
RgSchCmnAllocRecord *allocInfo;
#endif
{
RgSchCellCb *cell;
RgSchUeCb *ue;
RgInfExtPhrCEInfo *extPhr;
RgSchCmnAllocRecord *allocInfo;
#endif
{
-
U8
idx;
+
uint8_t
idx;
RgInfExtPhrSCellInfo *servCellPhr;
S8 pCMax;
RgInfExtPhrSCellInfo *servCellPhr;
S8 pCMax;
- TRC2(rgSCHPwrUpdExtPhr);
-
for (idx = 0; idx < extPhr->numServCells; idx++)
{
servCellPhr = &extPhr->servCellPhr[idx];
for (idx = 0; idx < extPhr->numServCells; idx++)
{
servCellPhr = &extPhr->servCellPhr[idx];
@@
-2197,7
+2159,7
@@
RgSchCmnAllocRecord *allocInfo;
rgSCHPwrUpdPhr(ue->cellInfo[servCellPhr->sCellIdx]->cell,
ue, servCellPhr->phr, allocInfo, pCMax);
}
rgSCHPwrUpdPhr(ue->cellInfo[servCellPhr->sCellIdx]->cell,
ue, servCellPhr->phr, allocInfo, pCMax);
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-2232,36
+2194,34
@@
RgSchCmnAllocRecord *allocInfo;
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
- * @param[in]
U8
phr
+ * @param[in]
uint8_t
phr
* @param[in] RgSchCmnAllocRecord allocInfo
* @param[in] RgSchCmnAllocRecord allocInfo
- * @param[in]
U8
maxUePwr
+ * @param[in]
uint8_t
maxUePwr
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHPwrUpdPhr
+Void rgSCHPwrUpdPhr
(
RgSchCellCb *cell,
RgSchUeCb *ue,
(
RgSchCellCb *cell,
RgSchUeCb *ue,
-
U8
phr,
+
uint8_t
phr,
RgSchCmnAllocRecord *allocInfo,
S8 maxUePwr
)
#else
RgSchCmnAllocRecord *allocInfo,
S8 maxUePwr
)
#else
-
PUBLIC
Void rgSCHPwrUpdPhr(cell, ue, phr, allocInfo, maxUePwr)
+Void rgSCHPwrUpdPhr(cell, ue, phr, allocInfo, maxUePwr)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchCellCb *cell;
RgSchUeCb *ue;
-
U8
phr;
+
uint8_t
phr;
RgSchCmnAllocRecord *allocInfo;
S8 maxUePwr;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgSchCmnAllocRecord *allocInfo;
S8 maxUePwr;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
-
U8
rbPwr;
-
U8
effPwr;
+
uint8_t
rbPwr;
+
uint8_t
effPwr;
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
- TRC2(rgSCHPwrUpdPhr);
-
uePwr->phVal = rgSCHPwrGetPhValFromPhr(phr);
if (maxUePwr == RG_SCH_CMN_PWR_USE_CFG_MAX_PWR)
uePwr->phVal = rgSCHPwrGetPhValFromPhr(phr);
if (maxUePwr == RG_SCH_CMN_PWR_USE_CFG_MAX_PWR)
@@
-2292,7
+2252,7
@@
S8 maxUePwr;
allocInfo->cqi,
allocInfo->numRb,
uePwr->pwrPerRb);
allocInfo->cqi,
allocInfo->numRb,
uePwr->pwrPerRb);
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-2312,17
+2272,17
@@
S8 maxUePwr;
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
- * @param[in]
U8
numRb
+ * @param[in]
uint8_t
numRb
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHPwrUlCqiInd
+Void rgSCHPwrUlCqiInd
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-
PUBLIC
Void rgSCHPwrUlCqiInd(cell, ue)
+Void rgSCHPwrUlCqiInd(cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
@@
-2332,7
+2292,6
@@
RgSchUeCb *ue;
#ifdef TFU_UPGRADE
S32 tmp;
#endif
#ifdef TFU_UPGRADE
S32 tmp;
#endif
- TRC2(rgSCHPwrUlCqiInd);
/*
* For absolute power cmd case, we could look at the time
/*
* For absolute power cmd case, we could look at the time
@@
-2370,7
+2329,7
@@
RgSchUeCb *ue;
}
#endif
}
#endif
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-2393,27
+2352,26
@@
RgSchUeCb *ue;
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
*
* @param[in] RgSchCellCb *cell
* @param[in] RgSchUeCb *ue
- * @param[in]
U8
numRb
+ * @param[in]
uint8_t
numRb
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHPwrRecordRbAlloc
+Void rgSCHPwrRecordRbAlloc
(
RgSchCellCb *cell,
RgSchUeCb *ue,
(
RgSchCellCb *cell,
RgSchUeCb *ue,
-
U8
numRb
+
uint8_t
numRb
)
#else
)
#else
-
PUBLIC
Void rgSCHPwrRecordRbAlloc(cell, ue, numRb)
+Void rgSCHPwrRecordRbAlloc(cell, ue, numRb)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchCellCb *cell;
RgSchUeCb *ue;
-
U8
numRb;
+
uint8_t
numRb;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
UNUSED(cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
UNUSED(cell);
- TRC2(rgSCHPwrRecordRbAlloc);
- RETVOID;
+ return;
if (uePwr->isPhrAvail)
{
if (uePwr->isPhrAvail)
{
@@
-2421,7
+2379,7
@@
U8 numRb;
uePwr->phVal = RGSCH_MIN(40, uePwr->phVal);
}
uePwr->numRb = numRb;
uePwr->phVal = RGSCH_MIN(40, uePwr->phVal);
}
uePwr->numRb = numRb;
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-2451,13
+2409,13
@@
U8 numRb;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHPwrCellCfg
+S16 rgSCHPwrCellCfg
(
RgSchCellCb *cell,
RgrCellCfg *cfg
)
#else
(
RgSchCellCb *cell,
RgrCellCfg *cfg
)
#else
-
PUBLIC
S16 rgSCHPwrCellCfg(cell, cfg)
+S16 rgSCHPwrCellCfg(cell, cfg)
RgSchCellCb *cell;
RgrCellCfg *cfg;
#endif
RgSchCellCb *cell;
RgrCellCfg *cfg;
#endif
@@
-2465,9
+2423,8
@@
RgrCellCfg *cfg;
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
CmLteRnti rnti;
CmLteRnti startRnti;
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
CmLteRnti rnti;
CmLteRnti startRnti;
-
U16
size;
+
uint16_t
size;
Bool isFmt3a;
Bool isFmt3a;
- TRC2(rgSCHPwrCellCfg);
/* Right now, all UEs have fixed maximum power capability. So
* we store cell wide pMax as minimum of configured pMax and
/* Right now, all UEs have fixed maximum power capability. So
* we store cell wide pMax as minimum of configured pMax and
@@
-2483,7
+2440,7
@@
RgrCellCfg *cfg;
|| (cfg->pwrCfg.puschPwrFmt3.size + cfg->pwrCfg.puschPwrFmt3a.size
> RG_SCH_CMN_MAX_NUM_TPC_PUSCH_RNTI))
{
|| (cfg->pwrCfg.puschPwrFmt3.size + cfg->pwrCfg.puschPwrFmt3a.size
> RG_SCH_CMN_MAX_NUM_TPC_PUSCH_RNTI))
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* Now initialise TPC RNTIs */
}
/* Now initialise TPC RNTIs */
@@
-2524,7
+2481,7
@@
RgrCellCfg *cfg;
rgSCHPwrAddRntiToPuschRntiLst(cell, rnti, isFmt3a);
}
rgSCHPwrAddRntiToPuschRntiLst(cell, rnti, isFmt3a);
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
/**
}
/**
@@
-2543,24
+2500,23
@@
RgrCellCfg *cfg;
* -# ROK
**/
#ifdef ANSI
* -# ROK
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHPwrCellRecfg
+S16 rgSCHPwrCellRecfg
(
RgSchCellCb *cell,
RgrCellRecfg *recfg
)
#else
(
RgSchCellCb *cell,
RgrCellRecfg *recfg
)
#else
-
PUBLIC
S16 rgSCHPwrCellRecfg(cell, recfg)
+S16 rgSCHPwrCellRecfg(cell, recfg)
RgSchCellCb *cell;
RgrCellRecfg *recfg;
#endif
{
UNUSED(cell);
UNUSED(recfg);
RgSchCellCb *cell;
RgrCellRecfg *recfg;
#endif
{
UNUSED(cell);
UNUSED(recfg);
- TRC2(rgSCHPwrCellRecfg);
/* Not doing anything for power reconfig, so such structure
* in RGR */
/* Not doing anything for power reconfig, so such structure
* in RGR */
-
RETVALUE(ROK)
;
+
return ROK
;
}
/**
}
/**
@@
-2577,20
+2533,19
@@
RgrCellRecfg *recfg;
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHPwrCellDel
+Void rgSCHPwrCellDel
(
RgSchCellCb *cell
)
#else
(
RgSchCellCb *cell
)
#else
-
PUBLIC
Void rgSCHPwrCellDel(cell)
+Void rgSCHPwrCellDel(cell)
RgSchCellCb *cell;
#endif
{
UNUSED(cell);
RgSchCellCb *cell;
#endif
{
UNUSED(cell);
- TRC2(rgSCHPwrCellDel);
/* There is no allocated memory, so do nothing */
/* There is no allocated memory, so do nothing */
-
RETVOID
;
+
return
;
}
}
@@
-2610,14
+2565,14
@@
RgSchCellCb *cell;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHPwrUeSCellCfg
+S16 rgSCHPwrUeSCellCfg
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeSecCellCfg *sCellInfoCfg
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeSecCellCfg *sCellInfoCfg
)
#else
-
PUBLIC
S16 rgSCHPwrUeSCellCfg(cell, ue, sCellInfoCfg)
+S16 rgSCHPwrUeSCellCfg(cell, ue, sCellInfoCfg)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgrUeSecCellCfg *sCellInfoCfg;
RgSchCellCb *cell;
RgSchUeCb *ue;
RgrUeSecCellCfg *sCellInfoCfg;
@@
-2630,7
+2585,6
@@
RgrUeSecCellCfg *sCellInfoCfg;
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
- TRC2(rgSCHPwrUeSCellCfg);
uePwr->maxUePwr = cellPwr->pMax;
uePwr->trgCqi = cellPwr->trgUlCqi; /* Overriding with UE's happens later */
uePwr->maxUePwr = cellPwr->pMax;
uePwr->trgCqi = cellPwr->trgUlCqi; /* Overriding with UE's happens later */
@@
-2658,7
+2612,7
@@
RgrUeSecCellCfg *sCellInfoCfg;
}
uePwr->p0UePusch = sCellInfoCfg->ueSCellUlDedPwrCfg.p0UePusch;
}
uePwr->p0UePusch = sCellInfoCfg->ueSCellUlDedPwrCfg.p0UePusch;
-
RETVALUE(ROK)
;
+
return ROK
;
}
#endif
}
#endif
@@
-2699,14
+2653,14
@@
RgrUeSecCellCfg *sCellInfoCfg;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHPwrUeCfg
+S16 rgSCHPwrUeCfg
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeCfg *cfg
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeCfg *cfg
)
#else
-
PUBLIC
S16 rgSCHPwrUeCfg(cell, ue, cfg)
+S16 rgSCHPwrUeCfg(cell, ue, cfg)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgrUeCfg *cfg;
RgSchCellCb *cell;
RgSchUeCb *ue;
RgrUeCfg *cfg;
@@
-2718,8
+2672,6
@@
RgrUeCfg *cfg;
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell);
- TRC2(rgSCHPwrUeCfg);
-
uePwr->maxUePwr = cellPwr->pMax;
uePwr->trgCqi = cellPwr->trgUlCqi; /* Overriding with UE's happens later */
uePwr->numRb = 1;
uePwr->maxUePwr = cellPwr->pMax;
uePwr->trgCqi = cellPwr->trgUlCqi; /* Overriding with UE's happens later */
uePwr->numRb = 1;
@@
-2733,7
+2685,7
@@
RgrUeCfg *cfg;
* config happens in the function below */
ret = rgSCHPwrApplyUePwrCfg(cell, ue, &cfg->ueUlPwrCfg);
* config happens in the function below */
ret = rgSCHPwrApplyUePwrCfg(cell, ue, &cfg->ueUlPwrCfg);
-
RETVALUE
(ret);
+
return
(ret);
}
/**
}
/**
@@
-2762,14
+2714,14
@@
RgrUeCfg *cfg;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHPwrUeRecfg
+S16 rgSCHPwrUeRecfg
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeRecfg *recfg
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeRecfg *recfg
)
#else
-
PUBLIC
S16 rgSCHPwrUeRecfg(cell, ue, recfg)
+S16 rgSCHPwrUeRecfg(cell, ue, recfg)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgrUeRecfg *recfg;
RgSchCellCb *cell;
RgSchUeCb *ue;
RgrUeRecfg *recfg;
@@
-2778,7
+2730,6
@@
RgrUeRecfg *recfg;
S16 ret;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgrUeUlPwrCfg *pwrCfg = &recfg->ueUlPwrRecfg;
S16 ret;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgrUeUlPwrCfg *pwrCfg = &recfg->ueUlPwrRecfg;
- TRC2(rgSCHPwrUeRecfg);
if (pwrCfg->p0UePucch != uePwr->p0UePucch)
{
if (pwrCfg->p0UePucch != uePwr->p0UePucch)
{
@@
-2791,7
+2742,7
@@
RgrUeRecfg *recfg;
}
ret = rgSCHPwrApplyUePwrCfg(cell, ue, &recfg->ueUlPwrRecfg);
}
ret = rgSCHPwrApplyUePwrCfg(cell, ue, &recfg->ueUlPwrRecfg);
-
RETVALUE
(ret);
+
return
(ret);
}
/***********************************************************
}
/***********************************************************
@@
-2827,9
+2778,8
@@
RgrUeUlPwrCfg *pwrCfg;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgSchCmnTpcRntiCb *pucchRntiCb = NULLP;
RgSchCmnTpcRntiCb *puschRntiCb = NULLP;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgSchCmnTpcRntiCb *pucchRntiCb = NULLP;
RgSchCmnTpcRntiCb *puschRntiCb = NULLP;
- U8 pucchIdx = 0;
- U8 puschIdx = 0;
- TRC2(rgSCHPwrApplyUePwrCfg);
+ uint8_t pucchIdx = 0;
+ uint8_t puschIdx = 0;
/* Validate Pucch group power control config */
if (pwrCfg->uePucchPwr.pres)
/* Validate Pucch group power control config */
if (pwrCfg->uePucchPwr.pres)
@@
-2838,13
+2788,13
@@
RgrUeUlPwrCfg *pwrCfg;
rgSCHPwrGetPucchRntiCb(cell, pwrCfg->uePucchPwr.tpcRnti);
if (pucchRntiCb == NULLP)
{
rgSCHPwrGetPucchRntiCb(cell, pwrCfg->uePucchPwr.tpcRnti);
if (pucchRntiCb == NULLP)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
pucchIdx = pwrCfg->uePucchPwr.idx;
ret = rgSCHPwrChkPucchTpcRntiIdx(pucchRntiCb, pucchIdx);
if (ret != ROK)
{
}
pucchIdx = pwrCfg->uePucchPwr.idx;
ret = rgSCHPwrChkPucchTpcRntiIdx(pucchRntiCb, pucchIdx);
if (ret != ROK)
{
-
RETVALUE
(ret);
+
return
(ret);
}
}
}
}
@@
-2855,13
+2805,13
@@
RgrUeUlPwrCfg *pwrCfg;
rgSCHPwrGetPuschRntiCb(cell, pwrCfg->uePuschPwr.tpcRnti);
if (puschRntiCb == NULLP)
{
rgSCHPwrGetPuschRntiCb(cell, pwrCfg->uePuschPwr.tpcRnti);
if (puschRntiCb == NULLP)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
puschIdx = pwrCfg->uePuschPwr.idx;
ret = rgSCHPwrChkPuschTpcRntiIdx(puschRntiCb, puschIdx);
if (ret != ROK)
{
}
puschIdx = pwrCfg->uePuschPwr.idx;
ret = rgSCHPwrChkPuschTpcRntiIdx(puschRntiCb, puschIdx);
if (ret != ROK)
{
-
RETVALUE
(ret);
+
return
(ret);
}
}
}
}
@@
-2881,8
+2831,8
@@
RgrUeUlPwrCfg *pwrCfg;
#ifndef ALIGN_64BIT
RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
"<GRP_PWR>PucchRntiCb cfgdUes(%ld %lu %lu) UEID:%d",
#ifndef ALIGN_64BIT
RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
"<GRP_PWR>PucchRntiCb cfgdUes(%ld %lu %lu) UEID:%d",
- pucchRntiCb->cfgdUes.count,((
U32
)pucchRntiCb->cfgdUes.first),
- ((
U32
)pucchRntiCb->cfgdUes.last),ue->ueId);
+ pucchRntiCb->cfgdUes.count,((
uint32_t
)pucchRntiCb->cfgdUes.first),
+ ((
uint32_t
)pucchRntiCb->cfgdUes.last),ue->ueId);
RLOG_ARG3(L_UNUSED,DBG_CELLID,cell->cellId,
"UEID:%d isFmt3a(%u) ueNode(%ld)",
ue->ueId,pucchRntiCb->isFmt3a,
RLOG_ARG3(L_UNUSED,DBG_CELLID,cell->cellId,
"UEID:%d isFmt3a(%u) ueNode(%ld)",
ue->ueId,pucchRntiCb->isFmt3a,
@@
-2890,14
+2840,14
@@
RgrUeUlPwrCfg *pwrCfg;
RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
"toBeSchdUes(%ld %lu %lu) tpcRnti(%u)",
pucchRntiCb->toBeSchdUes.count,
RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
"toBeSchdUes(%ld %lu %lu) tpcRnti(%u)",
pucchRntiCb->toBeSchdUes.count,
- ((
U32
)pucchRntiCb->toBeSchdUes.first),
- ((
U32
)pucchRntiCb->toBeSchdUes.last),
+ ((
uint32_t
)pucchRntiCb->toBeSchdUes.first),
+ ((
uint32_t
)pucchRntiCb->toBeSchdUes.last),
pucchRntiCb->tpcRnti);
#else
RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
"<GRP_PWR>PucchRntiCb cfgdUes(%ld %lu %lu) UEID:%d",
pucchRntiCb->tpcRnti);
#else
RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
"<GRP_PWR>PucchRntiCb cfgdUes(%ld %lu %lu) UEID:%d",
- pucchRntiCb->cfgdUes.count,((
U64
)pucchRntiCb->cfgdUes.first),
- ((
U64
)pucchRntiCb->cfgdUes.last),ue->ueId);
+ pucchRntiCb->cfgdUes.count,((
uint64_t
)pucchRntiCb->cfgdUes.first),
+ ((
uint64_t
)pucchRntiCb->cfgdUes.last),ue->ueId);
RLOG_ARG3(L_UNUSED,DBG_CELLID,cell->cellId,
"UEID:%d isFmt3a(%u) ueNode(%ld)",
ue->ueId,pucchRntiCb->isFmt3a,
RLOG_ARG3(L_UNUSED,DBG_CELLID,cell->cellId,
"UEID:%d isFmt3a(%u) ueNode(%ld)",
ue->ueId,pucchRntiCb->isFmt3a,
@@
-2905,8
+2855,8
@@
RgrUeUlPwrCfg *pwrCfg;
RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
"toBeSchdUes(%ld %lu %lu) tpcRnti(%u)",
pucchRntiCb->toBeSchdUes.count,
RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId,
"toBeSchdUes(%ld %lu %lu) tpcRnti(%u)",
pucchRntiCb->toBeSchdUes.count,
- ((
U64
)pucchRntiCb->toBeSchdUes.first),
- ((
U64
)pucchRntiCb->toBeSchdUes.last),
+ ((
uint64_t
)pucchRntiCb->toBeSchdUes.first),
+ ((
uint64_t
)pucchRntiCb->toBeSchdUes.last),
pucchRntiCb->tpcRnti);
#endif
pucchRntiCb->tpcRnti);
#endif
@@
-2941,7
+2891,7
@@
RgrUeUlPwrCfg *pwrCfg;
uePwr->p0UePusch = pwrCfg->p0UePusch;
uePwr->p0UePucch = pwrCfg->p0UePucch;
uePwr->p0UePusch = pwrCfg->p0UePusch;
uePwr->p0UePucch = pwrCfg->p0UePucch;
-
RETVALUE(ROK)
;
+
return ROK
;
}
}
@@
-2972,19
+2922,18
@@
RgrUeUlPwrCfg *pwrCfg;
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHPwrUeDel
+Void rgSCHPwrUeDel
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-
PUBLIC
Void rgSCHPwrUeDel(cell, ue)
+Void rgSCHPwrUeDel(cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
- TRC2(rgSCHPwrUeDel);
if (uePwr->tpcPucchRntiCb)
{
if (uePwr->tpcPucchRntiCb)
{
@@
-2996,7
+2945,7
@@
RgSchUeCb *ue;
rgSCHPwrDelUeFrmPuschTpcRntiCb(cell, uePwr->tpcPuschRntiCb, ue);
uePwr->tpcPuschRntiCb = NULLP;
}
rgSCHPwrDelUeFrmPuschTpcRntiCb(cell, uePwr->tpcPuschRntiCb, ue);
uePwr->tpcPuschRntiCb = NULLP;
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-3018,22
+2967,21
@@
RgSchUeCb *ue;
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHPwrUeReset
+Void rgSCHPwrUeReset
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-
PUBLIC
Void rgSCHPwrUeReset(cell, ue)
+Void rgSCHPwrUeReset(cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
- TRC2(rgSCHPwrUeReset);
rgSCHPwrUeResetPucch(cell, ue);
rgSCHPwrUeResetPusch(cell, ue);
rgSCHPwrUeResetPucch(cell, ue);
rgSCHPwrUeResetPusch(cell, ue);
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3063,7
+3011,6
@@
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
- TRC2(rgSCHPwrUeResetPucch);
uePwr->pucchTpc = 1;
uePwr->remPucchPwr = 0;
uePwr->pucchTpc = 1;
uePwr->remPucchPwr = 0;
@@
-3073,7
+3020,7
@@
RgSchUeCb *ue;
}
/* Stack Crash problem for TRACE5 changes. Added the line below */
}
/* Stack Crash problem for TRACE5 changes. Added the line below */
-
RETVOID
;
+
return
;
}
}
@@
-3104,7
+3051,6
@@
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
- TRC2(rgSCHPwrUeResetPusch);
uePwr->isPhrAvail = FALSE;
uePwr->phVal = 40;
uePwr->isPhrAvail = FALSE;
uePwr->phVal = 40;
@@
-3116,7
+3062,7
@@
RgSchUeCb *ue;
{
rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, uePwr->tpcPuschRntiCb, ue);
}
{
rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, uePwr->tpcPuschRntiCb, ue);
}
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3148,11
+3094,10
@@
RgSchUeCb *ue;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgSchCmnTpcRntiCb *cb;
Bool toAdd;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell);
RgSchCmnTpcRntiCb *cb;
Bool toAdd;
- TRC2(rgSCHPwrOnPuschPwrUpd);
if ((cb = uePwr->tpcPuschRntiCb) == NULLP)
{
if ((cb = uePwr->tpcPuschRntiCb) == NULLP)
{
-
RETVOID
;
+
return
;
}
/* Not checking for uwPwr->isPhrAvail as uePwr->phVal
}
/* Not checking for uwPwr->isPhrAvail as uePwr->phVal
@@
-3175,7
+3120,7
@@
RgSchUeCb *ue;
rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue);
}
rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue);
}
-
RETVOID
;
+
return
;
}
}
@@
-3210,11
+3155,10
@@
Bool isFmt3a;
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
- TRC2(rgSCHPwrAddRntiToPucchRntiLst);
rgSCHPwrInitTpcRntiCb(&cellPwr->tpcPucchRntiLst[cellPwr->tpcPucchRntiCnt++],
rnti, isFmt3a);
rgSCHPwrInitTpcRntiCb(&cellPwr->tpcPucchRntiLst[cellPwr->tpcPucchRntiCnt++],
rnti, isFmt3a);
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3248,11
+3192,10
@@
Bool isFmt3a;
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
- TRC2(rgSCHPwrAddRntiToPuschRntiLst);
rgSCHPwrInitTpcRntiCb(&cellPwr->tpcPuschRntiLst[cellPwr->tpcPuschRntiCnt++],
rnti, isFmt3a);
rgSCHPwrInitTpcRntiCb(&cellPwr->tpcPuschRntiLst[cellPwr->tpcPuschRntiCnt++],
rnti, isFmt3a);
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3283,14
+3226,13
@@
CmLteRnti rnti;
Bool isFmt3a;
#endif
{
Bool isFmt3a;
#endif
{
- TRC2(rgSCHPwrInitTpcRntiCb);
-
cmMemset((U8 *)
cb, 0, sizeof(*cb));
+
memset(
cb, 0, sizeof(*cb));
cb->tpcRnti = rnti;
cb->isFmt3a = isFmt3a;
/* Not initialising lists as memset 0 takes care of it */
/* cb->schdLnk.node is set when this rnti is to be scheduled */
cb->tpcRnti = rnti;
cb->isFmt3a = isFmt3a;
/* Not initialising lists as memset 0 takes care of it */
/* cb->schdLnk.node is set when this rnti is to be scheduled */
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3321,21
+3263,20
@@
CmLteRnti tpcRnti;
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
- U16 idx;
- TRC2(rgSCHPwrGetPucchRntiCb);
+ uint16_t idx;
if (!cellPwr->tpcPucchRntiCnt)
{
if (!cellPwr->tpcPucchRntiCnt)
{
-
RETVALUE
(NULLP);
+
return
(NULLP);
}
for (idx = 0; idx < cellPwr->tpcPucchRntiCnt; ++idx)
{
if (cellPwr->tpcPucchRntiLst[idx].tpcRnti == tpcRnti)
{
}
for (idx = 0; idx < cellPwr->tpcPucchRntiCnt; ++idx)
{
if (cellPwr->tpcPucchRntiLst[idx].tpcRnti == tpcRnti)
{
-
RETVALUE
(&cellPwr->tpcPucchRntiLst[idx]);
+
return
(&cellPwr->tpcPucchRntiLst[idx]);
}
}
}
}
-
RETVALUE
(NULLP);
+
return
(NULLP);
}
/***********************************************************
}
/***********************************************************
@@
-3366,21
+3307,20
@@
CmLteRnti tpcRnti;
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
- U16 idx;
- TRC2(rgSCHPwrGetPuschRntiCb);
+ uint16_t idx;
if (!cellPwr->tpcPuschRntiCnt)
{
if (!cellPwr->tpcPuschRntiCnt)
{
-
RETVALUE
(NULLP);
+
return
(NULLP);
}
for (idx = 0; idx < cellPwr->tpcPuschRntiCnt; ++idx)
{
if (cellPwr->tpcPuschRntiLst[idx].tpcRnti == tpcRnti)
{
}
for (idx = 0; idx < cellPwr->tpcPuschRntiCnt; ++idx)
{
if (cellPwr->tpcPuschRntiLst[idx].tpcRnti == tpcRnti)
{
-
RETVALUE
(&cellPwr->tpcPuschRntiLst[idx]);
+
return
(&cellPwr->tpcPuschRntiLst[idx]);
}
}
}
}
-
RETVALUE
(NULLP);
+
return
(NULLP);
}
}
@@
-3414,11
+3354,10
@@
RgSchUeCb *ue;
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
UNUSED(cell);
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
UNUSED(cell);
- TRC2(rgSCHPwrAddUeToPucchTpcRntiCb);
cmLListAdd2Tail(&cb->cfgdUes, &uePwr->pucchGrpLnk);
uePwr->pucchGrpLnk.node = (PTR)ue;
cmLListAdd2Tail(&cb->cfgdUes, &uePwr->pucchGrpLnk);
uePwr->pucchGrpLnk.node = (PTR)ue;
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3450,12
+3389,11
@@
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrDelUeFrmPucchTpcRntiCb);
rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue);
cmLListDelFrm(&cb->cfgdUes, &uePwr->pucchGrpLnk);
uePwr->pucchGrpLnk.node = NULLP;
rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue);
cmLListDelFrm(&cb->cfgdUes, &uePwr->pucchGrpLnk);
uePwr->pucchGrpLnk.node = NULLP;
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3488,18
+3426,17
@@
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb);
if (uePwr->schdPucchGrpLnk.node == NULLP)
{
if (uePwr->schdPucchGrpLnk.node == NULLP)
{
-
RETVOID
;
+
return
;
}
rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb(cell, cb, ue);
if (!cb->toBeSchdUes.count)
{
rgSCHPwrRmvSchdPucchTpcRntiCb(cell, cb);
}
}
rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb(cell, cb, ue);
if (!cb->toBeSchdUes.count)
{
rgSCHPwrRmvSchdPucchTpcRntiCb(cell, cb);
}
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3533,14
+3470,13
@@
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb);
if (uePwr->schdPucchGrpLnk.node != NULLP)
{
cmLListDelFrm(&cb->toBeSchdUes, &uePwr->schdPucchGrpLnk);
uePwr->schdPucchGrpLnk.node = NULLP;
}
if (uePwr->schdPucchGrpLnk.node != NULLP)
{
cmLListDelFrm(&cb->toBeSchdUes, &uePwr->schdPucchGrpLnk);
uePwr->schdPucchGrpLnk.node = NULLP;
}
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3570,15
+3506,14
@@
RgSchCmnTpcRntiCb *cb;
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
- TRC2(rgSCHPwrRmvSchdPucchTpcRntiCb);
if (cb->schdLnk.node == NULLP)
{
if (cb->schdLnk.node == NULLP)
{
-
RETVOID
;
+
return
;
}
cmLListDelFrm(&cellPwr->pucchGrpPwr, &cb->schdLnk);
cb->schdLnk.node = NULLP;
}
cmLListDelFrm(&cellPwr->pucchGrpPwr, &cb->schdLnk);
cb->schdLnk.node = NULLP;
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3610,12
+3545,11
@@
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrAddSchdUeToPucchTpcRntiCb);
if (uePwr->schdPucchGrpLnk.node != NULLP)
{
/* UE is already in the list */
if (uePwr->schdPucchGrpLnk.node != NULLP)
{
/* UE is already in the list */
-
RETVOID
;
+
return
;
}
cmLListAdd2Tail(&cb->toBeSchdUes, &uePwr->schdPucchGrpLnk);
uePwr->schdPucchGrpLnk.node = (PTR)ue;
}
cmLListAdd2Tail(&cb->toBeSchdUes, &uePwr->schdPucchGrpLnk);
uePwr->schdPucchGrpLnk.node = (PTR)ue;
@@
-3625,7
+3559,7
@@
RgSchUeCb *ue;
* for scheduling */
rgSCHPwrAddSchdPucchTpcRntiCb(cell, cb);
}
* for scheduling */
rgSCHPwrAddSchdPucchTpcRntiCb(cell, cb);
}
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3655,11
+3589,10
@@
RgSchCmnTpcRntiCb *cb;
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
- TRC2(rgSCHPwrAddSchdPucchTpcRntiCb);
cmLListAdd2Tail(&cellPwr->pucchGrpPwr, &cb->schdLnk);
cb->schdLnk.node = (PTR)cb;
cmLListAdd2Tail(&cellPwr->pucchGrpPwr, &cb->schdLnk);
cb->schdLnk.node = (PTR)cb;
-
RETVOID
;
+
return
;
}
}
@@
-3690,11
+3623,10
@@
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrAddUeToPuschTpcRntiCb);
cmLListAdd2Tail(&cb->cfgdUes, &uePwr->puschGrpLnk);
uePwr->puschGrpLnk.node = (PTR)ue;
cmLListAdd2Tail(&cb->cfgdUes, &uePwr->puschGrpLnk);
uePwr->puschGrpLnk.node = (PTR)ue;
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3726,12
+3658,11
@@
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrAddSchdUeToPuschTpcRntiCb);
if (uePwr->schdPuschGrpLnk.node != NULLP)
{
/* UE is already in the list */
if (uePwr->schdPuschGrpLnk.node != NULLP)
{
/* UE is already in the list */
-
RETVOID
;
+
return
;
}
cmLListAdd2Tail(&cb->toBeSchdUes, &uePwr->schdPuschGrpLnk);
uePwr->schdPuschGrpLnk.node = (PTR)ue;
}
cmLListAdd2Tail(&cb->toBeSchdUes, &uePwr->schdPuschGrpLnk);
uePwr->schdPuschGrpLnk.node = (PTR)ue;
@@
-3741,7
+3672,7
@@
RgSchUeCb *ue;
* for scheduling */
rgSCHPwrAddSchdPuschTpcRntiCb(cell, cb);
}
* for scheduling */
rgSCHPwrAddSchdPuschTpcRntiCb(cell, cb);
}
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3773,12
+3704,11
@@
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrDelUeFrmPuschTpcRntiCb);
rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue);
cmLListDelFrm(&cb->cfgdUes, &uePwr->puschGrpLnk);
uePwr->puschGrpLnk.node = NULLP;
rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue);
cmLListDelFrm(&cb->cfgdUes, &uePwr->puschGrpLnk);
uePwr->puschGrpLnk.node = NULLP;
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3810,18
+3740,17
@@
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb);
if (uePwr->schdPuschGrpLnk.node == NULLP)
{
if (uePwr->schdPuschGrpLnk.node == NULLP)
{
-
RETVOID
;
+
return
;
}
rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb(cell, cb, ue);
if (!cb->toBeSchdUes.count)
{
rgSCHPwrRmvSchdPuschTpcRntiCb(cell, cb);
}
}
rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb(cell, cb, ue);
if (!cb->toBeSchdUes.count)
{
rgSCHPwrRmvSchdPuschTpcRntiCb(cell, cb);
}
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3855,14
+3784,13
@@
RgSchUeCb *ue;
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
#endif
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
- TRC2(rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb);
if (uePwr->schdPuschGrpLnk.node != NULLP)
{
cmLListDelFrm(&cb->toBeSchdUes, &uePwr->schdPuschGrpLnk);
uePwr->schdPuschGrpLnk.node = NULLP;
}
if (uePwr->schdPuschGrpLnk.node != NULLP)
{
cmLListDelFrm(&cb->toBeSchdUes, &uePwr->schdPuschGrpLnk);
uePwr->schdPuschGrpLnk.node = NULLP;
}
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3892,11
+3820,10
@@
RgSchCmnTpcRntiCb *cb;
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
- TRC2(rgSCHPwrAddSchdPuschTpcRntiCb);
cmLListAdd2Tail(&cellPwr->puschGrpPwr, &cb->schdLnk);
cb->schdLnk.node = (PTR)cb;
cmLListAdd2Tail(&cellPwr->puschGrpPwr, &cb->schdLnk);
cb->schdLnk.node = (PTR)cb;
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3926,15
+3853,14
@@
RgSchCmnTpcRntiCb *cb;
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
#endif
{
RgSchCmnUlPwrCb *cellPwr = RG_SCH_PWR_GETCELLPWR(cell);
- TRC2(rgSCHPwrRmvSchdPuschTpcRntiCb);
if (cb->schdLnk.node == NULLP)
{
if (cb->schdLnk.node == NULLP)
{
-
RETVOID
;
+
return
;
}
cmLListDelFrm(&cellPwr->puschGrpPwr, &cb->schdLnk);
cb->schdLnk.node = NULLP;
}
cmLListDelFrm(&cellPwr->puschGrpPwr, &cb->schdLnk);
cb->schdLnk.node = NULLP;
-
RETVOID
;
+
return
;
}
/***********************************************************
}
/***********************************************************
@@
-3956,25
+3882,24
@@
RgSchCmnTpcRntiCb *cb;
PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx
(
RgSchCmnTpcRntiCb *cb,
PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx
(
RgSchCmnTpcRntiCb *cb,
-
U8
idx
+
uint8_t
idx
)
#else
PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx(cb, idx)
RgSchCmnTpcRntiCb *cb;
)
#else
PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx(cb, idx)
RgSchCmnTpcRntiCb *cb;
-
U8
idx;
+
uint8_t
idx;
#endif
{
#endif
{
- TRC2(rgSCHPwrChkPucchTpcRntiIdx);
if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK)
{
if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
if (rgSCHPwrChkUniqPucchTpcRntiIdx(cb, idx) != ROK)
{
}
if (rgSCHPwrChkUniqPucchTpcRntiIdx(cb, idx) != ROK)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
/***********************************************************
}
/***********************************************************
@@
-3996,25
+3921,24
@@
U8 idx;
PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx
(
RgSchCmnTpcRntiCb *cb,
PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx
(
RgSchCmnTpcRntiCb *cb,
-
U8
idx
+
uint8_t
idx
)
#else
PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx(cb, idx)
RgSchCmnTpcRntiCb *cb;
)
#else
PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx(cb, idx)
RgSchCmnTpcRntiCb *cb;
-
U8
idx;
+
uint8_t
idx;
#endif
{
#endif
{
- TRC2(rgSCHPwrChkPuschTpcRntiIdx);
if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK)
{
if (rgSCHPwrChkTpcRntiIdx(cb, idx) != ROK)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
if (rgSCHPwrChkUniqPuschTpcRntiIdx(cb, idx) != ROK)
{
}
if (rgSCHPwrChkUniqPuschTpcRntiIdx(cb, idx) != ROK)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
/***********************************************************
}
/***********************************************************
@@
-4034,16
+3958,15
@@
U8 idx;
PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx
(
RgSchCmnTpcRntiCb *cb,
PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx
(
RgSchCmnTpcRntiCb *cb,
-
U8
idx
+
uint8_t
idx
)
#else
PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx(cb, idx)
RgSchCmnTpcRntiCb *cb;
)
#else
PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx(cb, idx)
RgSchCmnTpcRntiCb *cb;
-
U8
idx;
+
uint8_t
idx;
#endif
{
CmLList *lnk;
#endif
{
CmLList *lnk;
- TRC2(rgSCHPwrChkUniqPucchTpcRntiIdx);
for (lnk = cb->cfgdUes.first; lnk; lnk = lnk->next)
{
for (lnk = cb->cfgdUes.first; lnk; lnk = lnk->next)
{
@@
-4051,10
+3974,10
@@
U8 idx;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
if (uePwr->pucchIdx == idx)
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
if (uePwr->pucchIdx == idx)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
/***********************************************************
}
/***********************************************************
@@
-4074,16
+3997,15
@@
U8 idx;
PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx
(
RgSchCmnTpcRntiCb *cb,
PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx
(
RgSchCmnTpcRntiCb *cb,
-
U8
idx
+
uint8_t
idx
)
#else
PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx(cb, idx)
RgSchCmnTpcRntiCb *cb;
)
#else
PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx(cb, idx)
RgSchCmnTpcRntiCb *cb;
-
U8
idx;
+
uint8_t
idx;
#endif
{
CmLList *lnk;
#endif
{
CmLList *lnk;
- TRC2(rgSCHPwrChkUniqPuschTpcRntiIdx);
for (lnk = cb->cfgdUes.first; lnk; lnk = lnk->next)
{
for (lnk = cb->cfgdUes.first; lnk; lnk = lnk->next)
{
@@
-4091,10
+4013,10
@@
U8 idx;
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
if (uePwr->puschIdx == idx)
{
RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, ue->cell);
if (uePwr->puschIdx == idx)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
/***********************************************************
}
/***********************************************************
@@
-4114,31
+4036,29
@@
U8 idx;
PRIVATE S16 rgSCHPwrChkTpcRntiIdx
(
RgSchCmnTpcRntiCb *cb,
PRIVATE S16 rgSCHPwrChkTpcRntiIdx
(
RgSchCmnTpcRntiCb *cb,
-
U8
idx
+
uint8_t
idx
)
#else
PRIVATE S16 rgSCHPwrChkTpcRntiIdx(cb, idx)
RgSchCmnTpcRntiCb *cb;
)
#else
PRIVATE S16 rgSCHPwrChkTpcRntiIdx(cb, idx)
RgSchCmnTpcRntiCb *cb;
-
U8
idx;
+
uint8_t
idx;
#endif
{
#endif
{
- TRC2(rgSCHPwrChkTpcRntiIdx);
-
if (cb->isFmt3a)
{
if (idx >= TFU_MAX_1BIT_TPC)
{
if (cb->isFmt3a)
{
if (idx >= TFU_MAX_1BIT_TPC)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
else
{
if (idx >= TFU_MAX_2BIT_TPC)
{
}
}
else
{
if (idx >= TFU_MAX_2BIT_TPC)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
/* Warning Fix: Commenting out as not used */
}
/* Warning Fix: Commenting out as not used */
@@
-4160,15
+4080,14
@@
U8 idx;
#ifdef ANSI
PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax
(
#ifdef ANSI
PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax
(
-
U8
pCMax
+
uint8_t
pCMax
)
#else
PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax(pCMax)
)
#else
PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax(pCMax)
-
U8
pCMax;
+
uint8_t
pCMax;
#endif
{
#endif
{
- TRC2(rgSCHPwrGetPCMaxValFromPCMax);
- RETVALUE((pCMax & 63) - 30);
+ return ((pCMax & 63) - 30);
}
}
@@
-4191,15
+4110,14
@@
U8 pCMax;
#ifdef ANSI
PRIVATE S8 rgSCHPwrGetPhValFromPhr
(
#ifdef ANSI
PRIVATE S8 rgSCHPwrGetPhValFromPhr
(
-
U8
phr
+
uint8_t
phr
)
#else
PRIVATE S8 rgSCHPwrGetPhValFromPhr(phr)
)
#else
PRIVATE S8 rgSCHPwrGetPhValFromPhr(phr)
-
U8
phr;
+
uint8_t
phr;
#endif
{
#endif
{
- TRC2(rgSCHPwrGetPhValFromPhr);
- RETVALUE((phr & 63) - 23);
+ return ((phr & 63) - 23);
}
}