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
Fix for L2 compilation with WLS [Issue-ID: ODUHIGH-240]
[o-du/l2.git]
/
src
/
5gnrsch
/
rg_sch_dhm.c
diff --git
a/src/5gnrsch/rg_sch_dhm.c
b/src/5gnrsch/rg_sch_dhm.c
index
6f64f98
..
646e86b
100755
(executable)
--- a/
src/5gnrsch/rg_sch_dhm.c
+++ b/
src/5gnrsch/rg_sch_dhm.c
@@
-63,13
+63,13
@@
static int RLOG_MODULE_ID=4096;
extern U32 rgNumSPSSchedDropMaxRetx;
extern U32 rgNumActDtx;
#endif
extern U32 rgNumSPSSchedDropMaxRetx;
extern U32 rgNumActDtx;
#endif
-
PUBLIC
U32 nackSf[10];
+U32 nackSf[10];
#ifdef MAC_SCH_STATS
#ifdef MAC_SCH_STATS
-
PUBLIC
RgSchNackAckStats hqFailStats;
-
PUBLIC
RgSchHqRetxStats hqRetxStats;
+RgSchNackAckStats hqFailStats;
+RgSchHqRetxStats hqRetxStats;
#endif /* MAC_SCH_STATS */
//Chandan Stats Collection
#ifdef DLHQ_STATS
#endif /* MAC_SCH_STATS */
//Chandan Stats Collection
#ifdef DLHQ_STATS
@@
-103,7
+103,7
@@
U8 rgSchNumOfAcksToAckNack[RG_SCH_MAX_NUM_EXPECTED_ACKS][RG_SCH_NUM_FDBK_VALUE]
PRIVATE Void rgSCHDhmFdbkIndHndlTa ARGS((RgSchDlHqProcCb *hqP, U8 tbIdx, U8 fdbk,
Bool maxHqRetxReached));
PRIVATE Void rgSCHDhmFdbkIndHndlTa ARGS((RgSchDlHqProcCb *hqP, U8 tbIdx, U8 fdbk,
Bool maxHqRetxReached));
-
PUBLIC
void rgEmtcsetNullSubFrm ARGS((RgSchDlHqProcCb *hqP));
+void rgEmtcsetNullSubFrm ARGS((RgSchDlHqProcCb *hqP));
#ifndef LTE_TDD
PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep ARGS((
RgSchDlHqProcCb *hqP,
#ifndef LTE_TDD
PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep ARGS((
RgSchDlHqProcCb *hqP,
@@
-150,7
+150,7
@@
PRIVATE Void rgSchGetHqFdbkPosForM234 ARGS((
/* Freeing up the HARQ proc blocked for
* indefinite time in case of Retx */
/* Freeing up the HARQ proc blocked for
* indefinite time in case of Retx */
-
PUBLIC
S16 rgSCHDhmDlRetxAllocFail ARGS((
+S16 rgSCHDhmDlRetxAllocFail ARGS((
RgSchUeCb *ue,
RgSchDlHqProcCb *proc
));
RgSchUeCb *ue,
RgSchDlHqProcCb *proc
));
@@
-204,12
+204,12
@@
EXTERN Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP))
**/
/*MS_WORKAROUND for ccpu00122893*/
#ifdef ANSI
**/
/*MS_WORKAROUND for ccpu00122893*/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmHqEntReset
+Void rgSCHDhmHqEntReset
(
RgSchDlHqEnt *hqE
)
#else
(
RgSchDlHqEnt *hqE
)
#else
-
PUBLIC
Void rgSCHDhmHqEntReset(hqE)
+Void rgSCHDhmHqEntReset(hqE)
RgSchDlHqEnt *hqE;
#endif
{
RgSchDlHqEnt *hqE;
#endif
{
@@
-276,13
+276,13
@@
PUBLIC Void rgSCHDhmHqEntReset(hqE)
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmAssgnUeHqEntFrmRaCb
+Void rgSCHDhmAssgnUeHqEntFrmRaCb
(
RgSchUeCb *ue,
RgSchRaCb *raCb
)
#else
(
RgSchUeCb *ue,
RgSchRaCb *raCb
)
#else
-
PUBLIC
Void rgSCHDhmAssgnUeHqEntFrmRaCb(ue, raCb)
+Void rgSCHDhmAssgnUeHqEntFrmRaCb(ue, raCb)
RgSchUeCb *ue;
RgSchRaCb *raCb;
#endif
RgSchUeCb *ue;
RgSchRaCb *raCb;
#endif
@@
-318,13
+318,13
@@
RgSchRaCb *raCb;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmDelHqEnt
+Void rgSCHDhmDelHqEnt
(
RgSchCellCb *cell,
RgSchDlHqEnt **hqE
)
#else
(
RgSchCellCb *cell,
RgSchDlHqEnt **hqE
)
#else
-
PUBLIC
Void rgSCHDhmDelHqEnt(cell, hqE)
+Void rgSCHDhmDelHqEnt(cell, hqE)
RgSchCellCb *cell;
RgSchDlHqEnt **hqE;
#endif
RgSchCellCb *cell;
RgSchDlHqEnt **hqE;
#endif
@@
-345,12
+345,12
@@
RgSchDlHqEnt **hqE;
}
#ifdef ANSI
}
#ifdef ANSI
-
PUBLIC
RgSchDlHqEnt *rgSCHDhmHqEntInit
+RgSchDlHqEnt *rgSCHDhmHqEntInit
(
RgSchCellCb *cell
)
#else
(
RgSchCellCb *cell
)
#else
-
PUBLIC
RgSchDlHqEnt *rgSCHDhmHqEntInit(cell)
+RgSchDlHqEnt *rgSCHDhmHqEntInit(cell)
RgSchCellCb *cell;
#endif
{
RgSchCellCb *cell;
#endif
{
@@
-364,7
+364,7
@@
RgSchCellCb *cell;
{
RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId,
"rgSCHDhmHqEntInit hqE alloc fail");
{
RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId,
"rgSCHDhmHqEntInit hqE alloc fail");
-
RETVALUE
(NULLP);
+
return
(NULLP);
}
#ifdef LTE_TDD
/* Init the HARQ processes */
}
#ifdef LTE_TDD
/* Init the HARQ processes */
@@
-374,7
+374,7
@@
RgSchCellCb *cell;
{
RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId,
"rgSCHDhmHqEntInit hqP alloc fail in hqE");
{
RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId,
"rgSCHDhmHqEntInit hqP alloc fail in hqE");
-
RETVALUE
(NULLP);
+
return
(NULLP);
}
#else
hqE->numHqPrcs = RGSCH_NUM_DL_HQ_PROC;
}
#else
hqE->numHqPrcs = RGSCH_NUM_DL_HQ_PROC;
@@
-394,7
+394,7
@@
RgSchCellCb *cell;
hqE->cell = cell;
/* CA Dev End*/
hqE->cell = cell;
/* CA Dev End*/
-
RETVALUE
(hqE);
+
return
(hqE);
} /* rgSCHDhmHqEntInit */
/**
} /* rgSCHDhmHqEntInit */
/**
@@
-423,7
+423,7
@@
RgSchCellCb *cell;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmGetAvlHqProc
+S16 rgSCHDhmGetAvlHqProc
(
RgSchCellCb *cell,
RgSchUeCb *ue,
(
RgSchCellCb *cell,
RgSchUeCb *ue,
@@
-431,7
+431,7
@@
CmLteTimingInfo timingInfo,
RgSchDlHqProcCb **hqP
)
#else
RgSchDlHqProcCb **hqP
)
#else
-
PUBLIC
S16 rgSCHDhmGetAvlHqProc (cell, ue, timingInfo, hqP)
+S16 rgSCHDhmGetAvlHqProc (cell, ue, timingInfo, hqP)
RgSchCellCb *cell;
RgSchUeCb *ue;
CmLteTimingInfo timingInfo;
RgSchCellCb *cell;
RgSchUeCb *ue;
CmLteTimingInfo timingInfo;
@@
-449,7
+449,7
@@
RgSchDlHqProcCb **hqP;
{
RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDhmGetAvlHqProc hqE NULL ue %d"
, ue->ueId);
{
RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDhmGetAvlHqProc hqE NULL ue %d"
, ue->ueId);
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
@@
-461,7
+461,7
@@
RgSchDlHqProcCb **hqP;
"rgSCHDhmGetAvlHqProc free %ld inUse %ld ue %d"
, hqE->free.count, hqE->inUse.count, ue->ueId);
/* No Harq Process available in the free queue. */
"rgSCHDhmGetAvlHqProc free %ld inUse %ld ue %d"
, hqE->free.count, hqE->inUse.count, ue->ueId);
/* No Harq Process available in the free queue. */
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
tmpHqProc = (RgSchDlHqProcCb *)(tmp->node);
}
tmpHqProc = (RgSchDlHqProcCb *)(tmp->node);
@@
-483,7
+483,7
@@
RgSchDlHqProcCb **hqP;
if (!tmp)
{
/* No Harq Process available in the free queue. */
if (!tmp)
{
/* No Harq Process available in the free queue. */
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
#endif
}
}
#endif
@@
-519,7
+519,7
@@
RgSchDlHqProcCb **hqP;
tmpHqProc->itbsAtEstimate[1] = 0;
tmpHqProc->prbAtEstimate = 0;
tmpHqProc->itbsAtEstimate[1] = 0;
tmpHqProc->prbAtEstimate = 0;
-
RETVALUE(ROK)
;
+
return ROK
;
} /* rgSCHDhmGetAvlHqProc */
} /* rgSCHDhmGetAvlHqProc */
@@
-548,7
+548,7
@@
RgSchDlHqProcCb **hqP;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmHqTbRetx
+Void rgSCHDhmHqTbRetx
(
RgSchDlHqEnt *hqE,
CmLteTimingInfo timingInfo,
(
RgSchDlHqEnt *hqE,
CmLteTimingInfo timingInfo,
@@
-556,7
+556,7
@@
RgSchDlHqProcCb *hqP,
U8 tbIdx
)
#else
U8 tbIdx
)
#else
-
PUBLIC
Void rgSCHDhmHqTbRetx(hqE, timingInfo, hqP, tbIdx)
+Void rgSCHDhmHqTbRetx(hqE, timingInfo, hqP, tbIdx)
RgSchDlHqEnt *hqE;
CmLteTimingInfo timingInfo;
RgSchDlHqProcCb *hqP;
RgSchDlHqEnt *hqE;
CmLteTimingInfo timingInfo;
RgSchDlHqProcCb *hqP;
@@
-616,12
+616,12
@@
U8 tbIdx;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc
+RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc
(
RgSchDlHqEnt *hqE
)
#else
(
RgSchDlHqEnt *hqE
)
#else
-
PUBLIC
RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(hqE)
+RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(hqE)
RgSchDlHqEnt *hqE;
#endif
{
RgSchDlHqEnt *hqE;
#endif
{
@@
-630,9
+630,9
@@
RgSchDlHqEnt *hqE;
* until RACH procedure is completed */
if ((hqE == NULLP) || (hqE->inUse.last == NULLP))
{
* until RACH procedure is completed */
if ((hqE == NULLP) || (hqE->inUse.last == NULLP))
{
-
RETVALUE
(NULLP);
+
return
(NULLP);
}
}
-
RETVALUE
((RgSchDlHqProcCb *)hqE->inUse.last->node);
+
return
((RgSchDlHqProcCb *)hqE->inUse.last->node);
} /* rgSCHDhmLastSchedHqProc */
#ifdef RGR_V1
} /* rgSCHDhmLastSchedHqProc */
#ifdef RGR_V1
@@
-662,14
+662,14
@@
RgSchDlHqEnt *hqE;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmGetCcchSduHqProc
+S16 rgSCHDhmGetCcchSduHqProc
(
RgSchUeCb *ueCb,
CmLteTimingInfo timingInfo,
RgSchDlHqProcCb **hqP
)
#else
(
RgSchUeCb *ueCb,
CmLteTimingInfo timingInfo,
RgSchDlHqProcCb **hqP
)
#else
-
PUBLIC
S16 rgSCHDhmGetCcchSduHqProc (ueCb, timingInfo, hqP)
+S16 rgSCHDhmGetCcchSduHqProc (ueCb, timingInfo, hqP)
RgSchUeCb *ueCb;
CmLteTimingInfo timingInfo;
RgSchDlHqProcCb **hqP;
RgSchUeCb *ueCb;
CmLteTimingInfo timingInfo;
RgSchDlHqProcCb **hqP;
@@
-686,7
+686,7
@@
RgSchDlHqProcCb **hqP;
if (NULLP == tmp)
{
/* No Harq Process available in the free queue. */
if (NULLP == tmp)
{
/* No Harq Process available in the free queue. */
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* Remove the element from the free Queue and */
}
/* Remove the element from the free Queue and */
@@
-706,7
+706,7
@@
RgSchDlHqProcCb **hqP;
//cmLListAdd2Tail(&hqE->inUse, &tmpHqProc->lnk);
rgSCHDhmHqPAdd2InUseLst(tmpHqProc);
//cmLListAdd2Tail(&hqE->inUse, &tmpHqProc->lnk);
rgSCHDhmHqPAdd2InUseLst(tmpHqProc);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* rgSCHDhmGetCcchSduHqProc */
#endif
} /* rgSCHDhmGetCcchSduHqProc */
#endif
@@
-736,13
+736,13
@@
RgSchDlHqProcCb **hqP;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmGetMsg4HqProc
+S16 rgSCHDhmGetMsg4HqProc
(
RgSchRaCb *raCb,
CmLteTimingInfo timingInfo
)
#else
(
RgSchRaCb *raCb,
CmLteTimingInfo timingInfo
)
#else
-
PUBLIC
S16 rgSCHDhmGetMsg4HqProc (raCb, timingInfo)
+S16 rgSCHDhmGetMsg4HqProc (raCb, timingInfo)
RgSchRaCb *raCb;
CmLteTimingInfo timingInfo;
#endif
RgSchRaCb *raCb;
CmLteTimingInfo timingInfo;
#endif
@@
-758,7
+758,7
@@
CmLteTimingInfo timingInfo;
if (NULLP == tmp)
{
/* No Harq Process available in the free queue. */
if (NULLP == tmp)
{
/* No Harq Process available in the free queue. */
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* Remove the element from the free Queue and */
}
/* Remove the element from the free Queue and */
@@
-769,7
+769,7
@@
CmLteTimingInfo timingInfo;
tmpHqProc->tbInfo[0].timingInfo = timingInfo;
hqE->msg4Proc = tmpHqProc;
tmpHqProc->tbInfo[0].timingInfo = timingInfo;
hqE->msg4Proc = tmpHqProc;
-
RETVALUE(ROK)
;
+
return ROK
;
} /* rgSCHDhmGetMsg4HqProc */
/**
} /* rgSCHDhmGetMsg4HqProc */
/**
@@
-792,14
+792,14
@@
CmLteTimingInfo timingInfo;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmRlsHqpTb
+Void rgSCHDhmRlsHqpTb
(
RgSchDlHqProcCb *hqP,
U8 tbIdx,
Bool togNdi
)
#else
(
RgSchDlHqProcCb *hqP,
U8 tbIdx,
Bool togNdi
)
#else
-
PUBLIC
Void rgSCHDhmRlsHqpTb(hqP, tbIdx, togNdi)
+Void rgSCHDhmRlsHqpTb(hqP, tbIdx, togNdi)
RgSchDlHqProcCb *hqP;
U8 tbIdx;
Bool togNdi;
RgSchDlHqProcCb *hqP;
U8 tbIdx;
Bool togNdi;
@@
-1033,12
+1033,12
@@
rgEmtcsetNullSubFrm(hqP);
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmRlsHqProc
+Void rgSCHDhmRlsHqProc
(
RgSchDlHqProcCb *hqP
)
#else
(
RgSchDlHqProcCb *hqP
)
#else
-
PUBLIC
Void rgSCHDhmRlsHqProc(hqP)
+Void rgSCHDhmRlsHqProc(hqP)
RgSchDlHqProcCb *hqP;
#endif
{
RgSchDlHqProcCb *hqP;
#endif
{
@@
-1115,7
+1115,7
@@
rgEmtcsetNullSubFrm(hqP);
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmGetHqProcFrmId
+S16 rgSCHDhmGetHqProcFrmId
(
RgSchCellCb *cell,
RgSchUeCb *ue,
(
RgSchCellCb *cell,
RgSchUeCb *ue,
@@
-1123,7
+1123,7
@@
U8 idx,
RgSchDlHqProcCb **hqP
)
#else
RgSchDlHqProcCb **hqP
)
#else
-
PUBLIC
S16 rgSCHDhmGetHqProcFrmId(cell, ue, idx, hqP)
+S16 rgSCHDhmGetHqProcFrmId(cell, ue, idx, hqP)
RgSchCellCb *cell;
RgSchUeCb *ue;
U8 idx;
RgSchCellCb *cell;
RgSchUeCb *ue;
U8 idx;
@@
-1137,7
+1137,7
@@
RgSchDlHqProcCb **hqP;
/* Pick the proc based on the index provided */
*hqP = &(hqE->procs[idx]);
/* Pick the proc based on the index provided */
*hqP = &(hqE->procs[idx]);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* rgSCHDhmGetHqProcFrmId */
/**
} /* rgSCHDhmGetHqProcFrmId */
/**
@@
-1154,14
+1154,14
@@
RgSchDlHqProcCb **hqP;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc
+RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc
(
RgSchCellCb *cell,
RgSchUeCb *ue,
CmLteTimingInfo timingInfo
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ue,
CmLteTimingInfo timingInfo
)
#else
-
PUBLIC
RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(cell, ue, timingInfo)
+RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(cell, ue, timingInfo)
RgSchCellCb *cell,
RgSchUeCb *ue;
CmLteTimingInfo timingInfo;
RgSchCellCb *cell,
RgSchUeCb *ue;
CmLteTimingInfo timingInfo;
@@
-1181,7
+1181,7
@@
CmLteTimingInfo timingInfo;
if (NULLP == tmp)
{
/* No Harq Process available in the free queue. */
if (NULLP == tmp)
{
/* No Harq Process available in the free queue. */
-
RETVALUE
(NULLP);
+
return
(NULLP);
}
idx = ((timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + timingInfo.slot)/
}
idx = ((timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + timingInfo.slot)/
@@
-1204,7
+1204,7
@@
CmLteTimingInfo timingInfo;
if (!tmp)
{
/* No Harq Process available in the free queue. */
if (!tmp)
{
/* No Harq Process available in the free queue. */
-
RETVALUE
(NULLP);
+
return
(NULLP);
}
hqProc->tbInfo[0].timingInfo = timingInfo;
}
hqProc->tbInfo[0].timingInfo = timingInfo;
@@
-1222,7
+1222,7
@@
CmLteTimingInfo timingInfo;
rgSCHLaaResetDlHqProcCb(hqProc);
#endif
rgSCHLaaResetDlHqProcCb(hqProc);
#endif
-
RETVALUE
(hqProc);
+
return
(hqProc);
} /* rgSCHDhmSpsDlGetHqProc */
#endif /* LTEMAC_SPS */
} /* rgSCHDhmSpsDlGetHqProc */
#endif /* LTEMAC_SPS */
@@
-1336,13
+1336,13
@@
Bool maxHqRetxReached;
* -# None.
**/
#ifdef ANSI
* -# None.
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmSchdTa
+Void rgSCHDhmSchdTa
(
RgSchUeCb *ueCb,
RgSchDlHqTbCb *tbInfo
)
#else
(
RgSchUeCb *ueCb,
RgSchDlHqTbCb *tbInfo
)
#else
-
PUBLIC
Void rgSCHDhmSchdTa(ueCb, tbInfo)
+Void rgSCHDhmSchdTa(ueCb, tbInfo)
RgSchUeCb *ueCb;
RgSchDlHqTbCb *tbInfo;
#endif
RgSchUeCb *ueCb;
RgSchDlHqTbCb *tbInfo;
#endif
@@
-1423,7
+1423,7
@@
RgSchCellCb *cell;
tbStrtIdx[*cntHqPrcs] = 0;
numTbs[*cntHqPrcs] = 1;
(*cntHqPrcs)++;
tbStrtIdx[*cntHqPrcs] = 0;
numTbs[*cntHqPrcs] = 1;
(*cntHqPrcs)++;
-
RETVALUE(ROK)
;
+
return ROK
;
}
}
ascIdx = rgSchTddDlAscSetIdxKTbl[cell->ulDlCfgIdx][timeInfo.slot];
}
}
ascIdx = rgSchTddDlAscSetIdxKTbl[cell->ulDlCfgIdx][timeInfo.slot];
@@
-1500,7
+1500,7
@@
RgSchCellCb *cell;
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
#else /* LTE_TDD */
/** * @brief Handler for fetching Harq Proc given the timming information.
}
#else /* LTE_TDD */
/** * @brief Handler for fetching Harq Proc given the timming information.
@@
-1521,7
+1521,7
@@
RgSchCellCb *cell;
* -# NULLP
**/
#ifdef ANSI
* -# NULLP
**/
#ifdef ANSI
-
PUBLIC
RgSchDlHqProcCb *rgSCHDhmHqProcByTime
+RgSchDlHqProcCb *rgSCHDhmHqProcByTime
(
RgSchDlHqEnt *hqE,
CmLteTimingInfo timeInfo,
(
RgSchDlHqEnt *hqE,
CmLteTimingInfo timeInfo,
@@
-1529,7
+1529,7
@@
Bool *isMsg4,
RgSchDlSf *sf
)
#else
RgSchDlSf *sf
)
#else
-
PUBLIC
RgSchDlHqProcCb *rgSCHDhmHqProcByTime(hqE, timeInfo,
+RgSchDlHqProcCb *rgSCHDhmHqProcByTime(hqE, timeInfo,
isMsg4,sf)
RgSchDlHqEnt *hqE;
CmLteTimingInfo timeInfo;
isMsg4,sf)
RgSchDlHqEnt *hqE;
CmLteTimingInfo timeInfo;
@@
-1542,11
+1542,11
@@
RgSchDlSf *sf;
if (RGSCH_TIMEINFO_SAME(hqE->msg4Proc->tbInfo[0].timingInfo, timeInfo))
{
*isMsg4 = TRUE;
if (RGSCH_TIMEINFO_SAME(hqE->msg4Proc->tbInfo[0].timingInfo, timeInfo))
{
*isMsg4 = TRUE;
-
RETVALUE
(hqE->msg4Proc);
+
return
(hqE->msg4Proc);
}
}
}
}
-
RETVALUE
(NULLP);
+
return
(NULLP);
}
#endif
}
#endif
@@
-1569,7
+1569,7
@@
RgSchDlSf *sf;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmHqTbTrnsFail
+Void rgSCHDhmHqTbTrnsFail
(
RgSchCellCb *cell,
RgSchDlHqProcCb *hqP,
(
RgSchCellCb *cell,
RgSchDlHqProcCb *hqP,
@@
-1577,7
+1577,7
@@
U8 tbCnt,
Bool *isMaxRetx
)
#else
Bool *isMaxRetx
)
#else
-
PUBLIC
Void rgSCHDhmHqTbTrnsFail(cell, hqP, tbCnt, isMaxRetx)
+Void rgSCHDhmHqTbTrnsFail(cell, hqP, tbCnt, isMaxRetx)
RgSchCellCb *cell;
RgSchDlHqProcCb *hqP;
U8 tbCnt;
RgSchCellCb *cell;
RgSchDlHqProcCb *hqP;
U8 tbCnt;
@@
-1747,7
+1747,7
@@
Bool *isMaxRetx;
RETVOID;
} /* rgSCHDhmHqTbTrnsFail */
RETVOID;
} /* rgSCHDhmHqTbTrnsFail */
-
PUBLIC
U32 rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}},
+U32 rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}},
{{0, 0}, {0, 0}, {0, 0}, {0, 0}}};
#ifdef LTE_TDD
#ifdef LTE_ADV
{{0, 0}, {0, 0}, {0, 0}, {0, 0}}};
#ifdef LTE_TDD
#ifdef LTE_ADV
@@
-2058,7
+2058,7
@@
PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmHqFdbkInd
+S16 rgSCHDhmHqFdbkInd
(
Void *cb,
U8 cbType,
(
Void *cb,
U8 cbType,
@@
-2069,7
+2069,7
@@
RgInfRlsHqInfo *rlsHqBufs,
RgSchErrInfo *err
)
#else
RgSchErrInfo *err
)
#else
-
PUBLIC
S16 rgSCHDhmHqFdbkInd(cb, cbType, cellCb, timeInfo, fdbk, rlsHqBufs, err)
+S16 rgSCHDhmHqFdbkInd(cb, cbType, cellCb, timeInfo, fdbk, rlsHqBufs, err)
Void *cb;
U8 cbType;
RgSchCellCb *cellCb;
Void *cb;
U8 cbType;
RgSchCellCb *cellCb;
@@
-2186,7
+2186,7
@@
RgSchErrInfo *err;
{
err->errType = RGSCHERR_DHM_FDBK_IND;
err->errCause = RGSCHERR_DHM_FDBK_IND_INVALID_CB;
{
err->errType = RGSCHERR_DHM_FDBK_IND;
err->errCause = RGSCHERR_DHM_FDBK_IND_INVALID_CB;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* ccpu00147469 : This code is moved below as here this code always try to
}
/* ccpu00147469 : This code is moved below as here this code always try to
@@
-2265,7
+2265,7
@@
RgSchErrInfo *err;
{
RGSCHDBGINFO(cellCb->instIdx,(rgSchPBuf(cellCb->instIdx),
"Ack Rcvd. No Ack/Nack feedback available \n"));
{
RGSCHDBGINFO(cellCb->instIdx,(rgSchPBuf(cellCb->instIdx),
"Ack Rcvd. No Ack/Nack feedback available \n"));
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
}
}
}
@@
-2704,7
+2704,7
@@
RgSchErrInfo *err;
ue->ueId,timeInfo.sfn, timeInfo.slot);
err->errType = RGSCHERR_DHM_FDBK_IND;
err->errCause = RGSCHERR_DHM_FDBK_IND_INVALID_CB;
ue->ueId,timeInfo.sfn, timeInfo.slot);
err->errType = RGSCHERR_DHM_FDBK_IND;
err->errCause = RGSCHERR_DHM_FDBK_IND_INVALID_CB;
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
*/
}/*if(hqCnt==0)*/
}
*/
}/*if(hqCnt==0)*/
@@
-2736,7
+2736,7
@@
RgSchErrInfo *err;
#endif
}
#endif
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
//#endif /* LTEMAC_SPS */
}
//#endif /* LTEMAC_SPS */
@@
-2757,7
+2757,7
@@
RgSchErrInfo *err;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmPrcFdbkForTb
+S16 rgSCHDhmPrcFdbkForTb
(
RgSchCellCb *cell,
RgSchUeCb *ue,
(
RgSchCellCb *cell,
RgSchUeCb *ue,
@@
-2772,7
+2772,7
@@
RgInfRlsHqInfo *rlsHqBufs,
RgSchErrInfo *err
)
#else
RgSchErrInfo *err
)
#else
-
PUBLIC
S16 rgSCHDhmPrcFdbkForTb(cell, ue, hqP, sf, isMsg4, rnti, tbCnt, timingInfo, isAck, rlsHqBufs, err)
+S16 rgSCHDhmPrcFdbkForTb(cell, ue, hqP, sf, isMsg4, rnti, tbCnt, timingInfo, isAck, rlsHqBufs, err)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchDlHqProcCb *hqP;
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchDlHqProcCb *hqP;
@@
-2905,7
+2905,7
@@
RgSchErrInfo *err;
{
if((rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,&isAck)) != ROK)
{
{
if((rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,&isAck)) != ROK)
{
-
RETVALUE
(ret);
+
return
(ret);
}
}
else
}
}
else
@@
-3022,7
+3022,7
@@
RgSchErrInfo *err;
{
rgSCHDhmFdbkIndHndlTa(hqP, tbCnt, isAck, maxHqRetxReached);
}
{
rgSCHDhmFdbkIndHndlTa(hqP, tbCnt, isAck, maxHqRetxReached);
}
-
RETVALUE
(ret);
+
return
(ret);
} /* rgSCHDhmPrcFdbkForTb */
/** * @brief Function to decode the position of HarqFb for eachCell.
*
} /* rgSCHDhmPrcFdbkForTb */
/** * @brief Function to decode the position of HarqFb for eachCell.
*
@@
-3039,7
+3039,7
@@
RgSchErrInfo *err;
* @return RETVOID
**/
#ifdef ANSI
* @return RETVOID
**/
#ifdef ANSI
-
PUBLIC
Void rgSchGetHqFdbkPos
+Void rgSchGetHqFdbkPos
(
RgSchCellCb *cell,
RgSchUeCb *ue,
(
RgSchCellCb *cell,
RgSchUeCb *ue,
@@
-3049,7
+3049,7
@@
PUBLIC Void rgSchGetHqFdbkPos
RgTfuHqInfo *fdbk
)
#else
RgTfuHqInfo *fdbk
)
#else
-
PUBLIC
Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
+Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchDlHqProcCb *hqP;
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchDlHqProcCb *hqP;
@@
-3220,14
+3220,14
@@
PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk)
}/* End of rgSchGetHqFdbkPos */
#ifdef LTE_ADV
#ifdef ANSI
}/* End of rgSchGetHqFdbkPos */
#ifdef LTE_ADV
#ifdef ANSI
-
PUBLIC
Void rgSchGetHqFdbkPosFormat3
+Void rgSchGetHqFdbkPosFormat3
(
RgSchDlHqProcCb *hqP,
U8 *isAck,
TfuHqFdbk *fdbk
)
#else
(
RgSchDlHqProcCb *hqP,
U8 *isAck,
TfuHqFdbk *fdbk
)
#else
-
PUBLIC
Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
+Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
RgSchDlHqProcCb *hqP;
U8 *isAck;
TfuHqFdbk *fdbk;
RgSchDlHqProcCb *hqP;
U8 *isAck;
TfuHqFdbk *fdbk;
@@
-3260,7
+3260,7
@@
PUBLIC Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk)
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhm5gtfHqFdbkInd
+S16 rgSCHDhm5gtfHqFdbkInd
(
RgSchUeCb *ue,
RgSchCellCb *cell,
(
RgSchUeCb *ue,
RgSchCellCb *cell,
@@
-3269,7
+3269,7
@@
TfuHqFdbk fdbk,
RgSchErrInfo *err
)
#else
RgSchErrInfo *err
)
#else
-
PUBLIC
S16 rgSCHDhm5gtfHqFdbkInd(ue, cell, timingInfo, fdbk, err)
+S16 rgSCHDhm5gtfHqFdbkInd(ue, cell, timingInfo, fdbk, err)
RgSchUeCb *ue;
RgSchCellCb *cell;
CmLteTimingInfo timingInfo;
RgSchUeCb *ue;
RgSchCellCb *cell;
CmLteTimingInfo timingInfo;
@@
-3323,7
+3323,7
@@
RgSchErrInfo *err;
hqPCount--;
}
hqPCount--;
}
-
RETVALUE
(ret);
+
return
(ret);
} /* rgSCHDhm5gtfHqFdbkInd */
/** * @brief Handler for HARQ feedback received for DL transmission.
} /* rgSCHDhm5gtfHqFdbkInd */
/** * @brief Handler for HARQ feedback received for DL transmission.
@@
-3348,7
+3348,7
@@
RgSchErrInfo *err;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmHqFdbkInd
+S16 rgSCHDhmHqFdbkInd
(
Void *cb,
U8 cbType,
(
Void *cb,
U8 cbType,
@@
-3359,7
+3359,7
@@
RgInfRlsHqInfo *rlsHqBufs,
RgSchErrInfo *err
)
#else
RgSchErrInfo *err
)
#else
-
PUBLIC
S16 rgSCHDhmHqFdbkInd(cb, cbType, cell, timingInfo, fdbk, rlsHqBufs, err)
+S16 rgSCHDhmHqFdbkInd(cb, cbType, cell, timingInfo, fdbk, rlsHqBufs, err)
Void *cb;
U8 cbType;
RgSchCellCb *cell;
Void *cb;
U8 cbType;
RgSchCellCb *cell;
@@
-3512,7
+3512,7
@@
RgSchErrInfo *err;
"CRNTI:%d NO HARQ proc available for feedback: TimingInfo: "
"sfn %d slot %d", ue->ueId, timingInfo.sfn,
timingInfo.slot);
"CRNTI:%d NO HARQ proc available for feedback: TimingInfo: "
"sfn %d slot %d", ue->ueId, timingInfo.sfn,
timingInfo.slot);
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
isAck[0] = fdbk->isAck[0];
}
isAck[0] = fdbk->isAck[0];
@@
-3523,7
+3523,7
@@
RgSchErrInfo *err;
/* Remove release PDCCH from the subframe */
rgSCHUtlPdcchPut(cell, &sf->pdcchInfo, sf->relPdcch);
sf->relPdcch = NULLP;
/* Remove release PDCCH from the subframe */
rgSCHUtlPdcchPut(cell, &sf->pdcchInfo, sf->relPdcch);
sf->relPdcch = NULLP;
-
RETVALUE(ROK)
;
+
return ROK
;
}
}
}
}
}
}
@@
-3611,7
+3611,7
@@
RgSchErrInfo *err;
node = node->next;
}
node = node->next;
}
-
RETVALUE
(ret);
+
return
(ret);
} /* rgSCHDhmHqFdbkInd */
#endif /* LTE_FDD */
} /* rgSCHDhmHqFdbkInd */
#endif /* LTE_FDD */
@@
-3636,7
+3636,7
@@
RgSchErrInfo *err;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmRgrUeCfg
+Void rgSCHDhmRgrUeCfg
(
RgSchCellCb *cell,
RgSchUeCb *ueCb,
(
RgSchCellCb *cell,
RgSchUeCb *ueCb,
@@
-3644,7
+3644,7
@@
RgrUeCfg *ueCfg,
RgSchErrInfo *err
)
#else
RgSchErrInfo *err
)
#else
-
PUBLIC
Void rgSCHDhmRgrUeCfg(cell, ueCb, ueCfg, err)
+Void rgSCHDhmRgrUeCfg(cell, ueCb, ueCfg, err)
RgSchCellCb *cell;
RgSchUeCb *ueCb;
RgrUeCfg *ueCfg;
RgSchCellCb *cell;
RgSchUeCb *ueCb;
RgrUeCfg *ueCfg;
@@
-3704,14
+3704,14
@@
RgSchErrInfo *err;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmRgrCellCfg
+Void rgSCHDhmRgrCellCfg
(
RgSchCellCb *cell,
RgrCellCfg *cellCfg,
RgSchErrInfo *err
)
#else
(
RgSchCellCb *cell,
RgrCellCfg *cellCfg,
RgSchErrInfo *err
)
#else
-
PUBLIC
Void rgSCHDhmRgrCellCfg(cell, cellCfg, err)
+Void rgSCHDhmRgrCellCfg(cell, cellCfg, err)
RgSchCellCb *cell;
RgrCellCfg *cellCfg;
RgSchErrInfo *err;
RgSchCellCb *cell;
RgrCellCfg *cellCfg;
RgSchErrInfo *err;
@@
-3791,14
+3791,14
@@
RgSchErrInfo *err;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmRgrCellRecfg
+Void rgSCHDhmRgrCellRecfg
(
RgSchCellCb *cell,
RgrCellRecfg *cellRecfg,
RgSchErrInfo *err
)
#else
(
RgSchCellCb *cell,
RgrCellRecfg *cellRecfg,
RgSchErrInfo *err
)
#else
-
PUBLIC
Void rgSCHDhmRgrCellRecfg(cell, cellRecfg, err)
+Void rgSCHDhmRgrCellRecfg(cell, cellRecfg, err)
RgSchCellCb *cell;
RgrCellRecfg *cellRecfg;
RgSchErrInfo *err;
RgSchCellCb *cell;
RgrCellRecfg *cellRecfg;
RgSchErrInfo *err;
@@
-3854,12
+3854,12
@@
RgSchErrInfo *err;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmFreeUe
+Void rgSCHDhmFreeUe
(
RgSchUeCb *ueCb
)
#else
(
RgSchUeCb *ueCb
)
#else
-
PUBLIC
Void rgSCHDhmFreeUe(ueCb)
+Void rgSCHDhmFreeUe(ueCb)
RgSchUeCb *ueCb;
#endif
{
RgSchUeCb *ueCb;
#endif
{
@@
-3924,14
+3924,14
@@
RgSchUeCb *ueCb;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmUpdTa
+Void rgSCHDhmUpdTa
(
RgSchCellCb *cell,
RgSchUeCb *ueCb,
U8 ta
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ueCb,
U8 ta
)
#else
-
PUBLIC
Void rgSCHDhmUpdTa(cell, ueCb, ta)
+Void rgSCHDhmUpdTa(cell, ueCb, ta)
RgSchCellCb *cell;
RgSchUeCb *ueCb;
U8 ta;
RgSchCellCb *cell;
RgSchUeCb *ueCb;
U8 ta;
@@
-3987,12
+3987,12
@@
U8 ta;
* -#None.
*/
#ifdef ANSI
* -#None.
*/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmProcTAExp
+Void rgSCHDhmProcTAExp
(
RgSchUeCb *ueCb
)
#else
(
RgSchUeCb *ueCb
)
#else
-
PUBLIC
Void rgSCHDhmProcTAExp (ueCb)
+Void rgSCHDhmProcTAExp (ueCb)
RgSchUeCb *ueCb;
#endif
{
RgSchUeCb *ueCb;
#endif
{
@@
-4023,14
+4023,14
@@
PUBLIC Void rgSCHDhmProcTAExp (ueCb)
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmAddLcData
+S16 rgSCHDhmAddLcData
(
Inst inst,
RgSchLchAllocInfo *lchData,
RgSchDlHqTbCb *tbInfo
)
#else
(
Inst inst,
RgSchLchAllocInfo *lchData,
RgSchDlHqTbCb *tbInfo
)
#else
-
PUBLIC
S16 rgSCHDhmAddLcData(inst, lchData, tbInfo)
+S16 rgSCHDhmAddLcData(inst, lchData, tbInfo)
Inst inst;
RgSchLchAllocInfo *lchData;
RgSchDlHqTbCb *tbInfo;
Inst inst;
RgSchLchAllocInfo *lchData;
RgSchDlHqTbCb *tbInfo;
@@
-4041,14
+4041,14
@@
RgSchDlHqTbCb *tbInfo;
if(tbInfo->numLch >= RGSCH_MAX_NUM_DED_LC)
{
if(tbInfo->numLch >= RGSCH_MAX_NUM_DED_LC)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
tbInfo->lchSchdDataArr[tbInfo->numLch] = *lchData;
tbInfo->numLch++;
}
tbInfo->lchSchdDataArr[tbInfo->numLch] = *lchData;
tbInfo->numLch++;
-
RETVALUE(ROK)
;
+
return ROK
;
} /* rgSCHDhmAddLcData */
} /* rgSCHDhmAddLcData */
@@
-4070,13
+4070,13
@@
RgSchDlHqTbCb *tbInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmTddRlsSubFrm
+S16 rgSCHDhmTddRlsSubFrm
(
RgSchCellCb *cellCb,
CmLteTimingInfo uciTimingInfo
)
#else
(
RgSchCellCb *cellCb,
CmLteTimingInfo uciTimingInfo
)
#else
-
PUBLIC
S16 rgSCHDhmTddRlsSubFrm(cellCb, uciTimingInfo)
+S16 rgSCHDhmTddRlsSubFrm(cellCb, uciTimingInfo)
RgSchCellCb *cellCb;
CmLteTimingInfo uciTimingInfo;
#endif
RgSchCellCb *cellCb;
CmLteTimingInfo uciTimingInfo;
#endif
@@
-4102,7
+4102,7
@@
CmLteTimingInfo uciTimingInfo;
RGSCHDECRFRMCRNTTIME(uciTimingInfo, dlSfTime, ascIdx.subfrmNum[i]);
rgSCHUtlDlRlsSubFrm(cellCb, dlSfTime);
}
RGSCHDECRFRMCRNTTIME(uciTimingInfo, dlSfTime, ascIdx.subfrmNum[i]);
rgSCHUtlDlRlsSubFrm(cellCb, dlSfTime);
}
-
RETVALUE(ROK)
;
+
return ROK
;
}/* rgSCHDhmTddRlsSubFrm */
#ifdef TFU_TDD
}/* rgSCHDhmTddRlsSubFrm */
#ifdef TFU_TDD
@@
-4127,13
+4127,13
@@
U32 macDtx = 0;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmRlsDlsfHqProc
+S16 rgSCHDhmRlsDlsfHqProc
(
RgSchCellCb *cellCb,
CmLteTimingInfo uciTimingInfo
)
#else
(
RgSchCellCb *cellCb,
CmLteTimingInfo uciTimingInfo
)
#else
-
PUBLIC
S16 rgSCHDhmRlsDlsfHqProc(cellCb, uciTimingInfo)
+S16 rgSCHDhmRlsDlsfHqProc(cellCb, uciTimingInfo)
RgSchCellCb *cellCb;
CmLteTimingInfo uciTimingInfo;
#endif
RgSchCellCb *cellCb;
CmLteTimingInfo uciTimingInfo;
#endif
@@
-4344,7
+4344,7
@@
CmLteTimingInfo uciTimingInfo;
#endif
if(anInfo == NULLP)
{
#endif
if(anInfo == NULLP)
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
RGSCH_NULL_CHECK(cellCb->instIdx, nxtDlsf);
RGSCH_UPD_HQAN_FDBKTIME(tbCb, nxtDlsf, nxtfrm);
}
RGSCH_NULL_CHECK(cellCb->instIdx, nxtDlsf);
RGSCH_UPD_HQAN_FDBKTIME(tbCb, nxtDlsf, nxtfrm);
@@
-4393,7
+4393,7
@@
CmLteTimingInfo uciTimingInfo;
}
}
}
}
}
}
-
RETVALUE(ROK)
;
+
return ROK
;
}/* rgSCHDhmRlsDlsfHqProc */
#else /* ifdef LTE_TDD */
/**
}/* rgSCHDhmRlsDlsfHqProc */
#else /* ifdef LTE_TDD */
/**
@@
-4414,13
+4414,13
@@
CmLteTimingInfo uciTimingInfo;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmRlsDlsfHqProc
+S16 rgSCHDhmRlsDlsfHqProc
(
RgSchCellCb *cell,
CmLteTimingInfo timingInfo
)
#else
(
RgSchCellCb *cell,
CmLteTimingInfo timingInfo
)
#else
-
PUBLIC
S16 rgSCHDhmRlsDlsfHqProc(cell, timingInfo)
+S16 rgSCHDhmRlsDlsfHqProc(cell, timingInfo)
RgSchCellCb *cell;
CmLteTimingInfo timingInfo;
#endif
RgSchCellCb *cell;
CmLteTimingInfo timingInfo;
#endif
@@
-4554,7
+4554,7
@@
CmLteTimingInfo timingInfo;
}
/*CA Dev End*/
}
/*CA Dev End*/
-
RETVALUE(ROK)
;
+
return ROK
;
} /* rgSCHDhmRlsDlsfHqProc */
#endif
#ifdef LTEMAC_SPS
} /* rgSCHDhmRlsDlsfHqProc */
#endif
#ifdef LTEMAC_SPS
@@
-4580,13
+4580,13
@@
CmLteTimingInfo timingInfo;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmMarkSpsHqProc
+S16 rgSCHDhmMarkSpsHqProc
(
RgSchUeCb *ue,
U8 idx
)
#else
(
RgSchUeCb *ue,
U8 idx
)
#else
-
PUBLIC
S16 rgSCHDhmMarkSpsHqProc(ue, idx)
+S16 rgSCHDhmMarkSpsHqProc(ue, idx)
RgSchUeCb *ue;
U8 idx;
#endif
RgSchUeCb *ue;
U8 idx;
#endif
@@
-4597,7
+4597,7
@@
U8 idx;
/* Pick the proc based on the index provided */
rgSCHDhmGetHqProcFrmId(ue->cell, ue, idx, &hqP);
/* Pick the proc based on the index provided */
rgSCHDhmGetHqProcFrmId(ue->cell, ue, idx, &hqP);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* rgSCHDhmMarkSpsHqProc */
#endif /* RG_UNUSED */
#endif /* LTEMAC_SPS */
} /* rgSCHDhmMarkSpsHqProc */
#endif /* RG_UNUSED */
#endif /* LTEMAC_SPS */
@@
-4646,7
+4646,7
@@
U8 *isAck;
/* Update timingInfo for this hqP so that next subframe its picked up */
RG_SCH_ADD_TO_CRNT_TIME(hqP->tbInfo[tbCnt].timingInfo, \
hqP->tbInfo[tbCnt].timingInfo, 1);
/* Update timingInfo for this hqP so that next subframe its picked up */
RG_SCH_ADD_TO_CRNT_TIME(hqP->tbInfo[tbCnt].timingInfo, \
hqP->tbInfo[tbCnt].timingInfo, 1);
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
/* Take decision here based on the number
}
/* Take decision here based on the number
@@
-4671,7
+4671,7
@@
U8 *isAck;
hqP->tbInfo[tbCnt].isAckNackDtx = *isAck;
hqP->tbInfo[tbCnt].isAckNackDtx = *isAck;
-
RETVALUE(ROK)
;
+
return ROK
;
}
#endif /* ifndef LTE_TDD */
}
#endif /* ifndef LTE_TDD */
@@
-4692,13
+4692,13
@@
U8 *isAck;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmDlRetxAllocFail
+S16 rgSCHDhmDlRetxAllocFail
(
RgSchUeCb *ue,
RgSchDlHqProcCb *hqP
)
#else
(
RgSchUeCb *ue,
RgSchDlHqProcCb *hqP
)
#else
-
PUBLIC
S16 rgSCHDhmDlRetxAllocFail(ue, hqP)
+S16 rgSCHDhmDlRetxAllocFail(ue, hqP)
RgSchUeCb *ue;
RgSchDlHqProcCb *hqP;
#endif
RgSchUeCb *ue;
RgSchDlHqProcCb *hqP;
#endif
@@
-4807,7
+4807,7
@@
RgSchDlHqProcCb *hqP;
RgSchMacRlsHq(&pst, rlsHqInfo);
}
RgSchMacRlsHq(&pst, rlsHqInfo);
}
-
RETVALUE(ROK)
;
+
return ROK
;
}
#ifdef DL_LA
}
#ifdef DL_LA
@@
-4853,18
+4853,18
@@
U8 tbCnt;
*/
rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt);
*/
rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt);
-
RETVALUE(ROK)
;
+
return ROK
;
}
#ifdef ANSI
}
#ifdef ANSI
-
PUBLIC
S16 rgSCHDhmUpdBlerBasediTbsEff
+S16 rgSCHDhmUpdBlerBasediTbsEff
(
RgSchCellCb *cell,
RgSchUeCb *ueCb,
U8 tbCnt
)
#else
(
RgSchCellCb *cell,
RgSchUeCb *ueCb,
U8 tbCnt
)
#else
-
PUBLIC
S16 rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt)
+S16 rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt)
(
RgSchCellCb *cell;
RgSchUeCb *ueCb;
(
RgSchCellCb *cell;
RgSchUeCb *ueCb;
@@
-4913,7
+4913,7
@@
U8 tbCnt;
(*(RgSchCmnTbSzEff *)(cellSch->dl.cqiToEffTbl[1][cfi]))\
[ueDl->mimoInfo.cwInfo[tbCnt].iTbs[1]];
(*(RgSchCmnTbSzEff *)(cellSch->dl.cqiToEffTbl[1][cfi]))\
[ueDl->mimoInfo.cwInfo[tbCnt].iTbs[1]];
-
RETVALUE(ROK)
;
+
return ROK
;
}
#endif
}
#endif
@@
-5006,12
+5006,12
@@
U8 hqCnt;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmHqPAdd2FreeLst
+Void rgSCHDhmHqPAdd2FreeLst
(
RgSchDlHqProcCb *hqP
)
#else
(
RgSchDlHqProcCb *hqP
)
#else
-
PUBLIC
Void rgSCHDhmHqPAdd2FreeLst(hqP)
+Void rgSCHDhmHqPAdd2FreeLst(hqP)
RgSchDlHqProcCb *hqP;
#endif
{
RgSchDlHqProcCb *hqP;
#endif
{
@@
-5063,12
+5063,12
@@
RgSchDlHqProcCb *hqP;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmHqPAdd2InUseLst
+Void rgSCHDhmHqPAdd2InUseLst
(
RgSchDlHqProcCb *hqP
)
#else
(
RgSchDlHqProcCb *hqP
)
#else
-
PUBLIC
Void rgSCHDhmHqPAdd2InUseLst(hqP)
+Void rgSCHDhmHqPAdd2InUseLst(hqP)
RgSchDlHqProcCb *hqP;
#endif
{
RgSchDlHqProcCb *hqP;
#endif
{
@@
-5115,12
+5115,12
@@
RgSchDlHqProcCb *hqP;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmHqPDelFrmFreeLst
+Void rgSCHDhmHqPDelFrmFreeLst
(
RgSchDlHqProcCb *hqP
)
#else
(
RgSchDlHqProcCb *hqP
)
#else
-
PUBLIC
Void rgSCHDhmHqPDelFrmFreeLst(hqP)
+Void rgSCHDhmHqPDelFrmFreeLst(hqP)
RgSchDlHqProcCb *hqP;
#endif
{
RgSchDlHqProcCb *hqP;
#endif
{
@@
-5178,12
+5178,12
@@
RgSchDlHqProcCb *hqP;
*
**/
#ifdef ANSI
*
**/
#ifdef ANSI
-
PUBLIC
Void rgSCHDhmHqPDelFrmInUseLst
+Void rgSCHDhmHqPDelFrmInUseLst
(
RgSchDlHqProcCb *hqP
)
#else
(
RgSchDlHqProcCb *hqP
)
#else
-
PUBLIC
Void rgSCHDhmHqPDelFrmInUseLst(hqP)
+Void rgSCHDhmHqPDelFrmInUseLst(hqP)
RgSchDlHqProcCb *hqP;
#endif
{
RgSchDlHqProcCb *hqP;
#endif
{