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
Merge "Added details of O1 Module in docs.[Issue-Id: ODUHIGH-256]"
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_rom.c
diff --git
a/src/5gnrmac/rg_rom.c
b/src/5gnrmac/rg_rom.c
index
06760d2
..
363209d
100755
(executable)
--- a/
src/5gnrmac/rg_rom.c
+++ b/
src/5gnrmac/rg_rom.c
@@
-66,18
+66,18
@@
static int RLOG_MODULE_ID=4096;
/* local typedefs */
S16 RgMacSchBrdcmDedBoUpdtReq ARGS((Inst inst, CmLteCellId cellId, CmLteRnti rnti, CmLteLcId lcId, S32 bo ));
/* local typedefs */
S16 RgMacSchBrdcmDedBoUpdtReq ARGS((Inst inst, CmLteCellId cellId, CmLteRnti rnti, CmLteLcId lcId, S32 bo ));
-
PRIVATE
S16 rgROMHndlCcchDatReq ARGS((RgCellCb *cell,
+
static
S16 rgROMHndlCcchDatReq ARGS((RgCellCb *cell,
RgRguCmnDatReq *datReq, RgErrInfo *err));
RgRguCmnDatReq *datReq, RgErrInfo *err));
-
PRIVATE
S16 rgROMHndlBcchPcchDatReq ARGS((RgCellCb *cell,
+
static
S16 rgROMHndlBcchPcchDatReq ARGS((RgCellCb *cell,
RgRguCmnDatReq *datReq, RgErrInfo *err));
RgRguCmnDatReq *datReq, RgErrInfo *err));
-
PRIVATE
S16 rgROMHndlCcchStaRsp ARGS((RgCellCb *cell,
+
static
S16 rgROMHndlCcchStaRsp ARGS((RgCellCb *cell,
RgRguCmnStaRsp *staRsp, RgErrInfo *err));
RgRguCmnStaRsp *staRsp, RgErrInfo *err));
-
PRIVATE
S16 rgROMHndlBcchPcchStaRsp ARGS((RgCellCb *cell,
+
static
S16 rgROMHndlBcchPcchStaRsp ARGS((RgCellCb *cell,
RgRguCmnStaRsp *staRsp, RgErrInfo *err));
/* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
RgRguCmnStaRsp *staRsp, RgErrInfo *err));
/* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
-
PRIVATE
S16 rgROMUpdDlSfRemDataCnt ARGS((RgCellCb *cellCb,
+
static
S16 rgROMUpdDlSfRemDataCnt ARGS((RgCellCb *cellCb,
RgDlSf *dlSf));
S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf,
RgCellCb *cellCb,
RgDlSf *dlSf));
S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf,
RgCellCb *cellCb,
@@
-104,24
+104,14
@@
S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf,
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 rgROMDedDatReq
-(
-Inst inst,
-RgRguDedDatReq *datReq
-)
-#else
-S16 rgROMDedDatReq(inst,datReq)
-Inst inst;
-RgRguDedDatReq *datReq;
-#endif
+S16 rgROMDedDatReq(Inst inst,RgRguDedDatReq *datReq)
{
#if 0
RgCellCb *cell;
RgUeCb *ue;
{
#if 0
RgCellCb *cell;
RgUeCb *ue;
-
U8
idx1,idx2;
+
uint8_t
idx1,idx2;
RgDlHqProcCb *hqProc;
RgDlHqProcCb *hqProc;
-
U8
hqPId;
+
uint8_t
hqPId;
RgErrInfo err;
Pst schPst;
RgInfDedBoRpt boRpt;
RgErrInfo err;
Pst schPst;
RgInfDedBoRpt boRpt;
@@
-134,8
+124,8
@@
RgRguDedDatReq *datReq;
#ifdef LTEMAC_DLUE_TMGOPTMZ
S16 ret;
#endif
#ifdef LTEMAC_DLUE_TMGOPTMZ
S16 ret;
#endif
-
U32
idx;
- //
U8
datReqFailCnt = 0;
+
uint32_t
idx;
+ //
uint8_t
datReqFailCnt = 0;
if (((cell = rgCb[inst].cell) == NULLP)
if (((cell = rgCb[inst].cell) == NULLP)
@@
-160,8
+150,8
@@
RgRguDedDatReq *datReq;
for(idx = 0; idx < datReq->nmbOfUeGrantPerTti; idx++)
{
for(idx = 0; idx < datReq->nmbOfUeGrantPerTti; idx++)
{
- timingInfo.slot = (
U8
)((datReq->datReq[idx].transId >> 8) & 0XFF);
- timingInfo.sfn = (
U16
)((datReq->datReq[idx].transId >> 16) & 0xFFFF);
+ timingInfo.slot = (
uint8_t
)((datReq->datReq[idx].transId >> 8) & 0XFF);
+ timingInfo.sfn = (
uint16_t
)((datReq->datReq[idx].transId >> 16) & 0xFFFF);
sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
if( (sf->txDone == TRUE) ||
sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
if( (sf->txDone == TRUE) ||
@@
-180,7
+170,7
@@
RgRguDedDatReq *datReq;
rgUpdtRguDedSts(inst,cell->rguDlSap,RG_RGU_SDU_DROP, datReq);
#ifdef CA_DBG
{
rgUpdtRguDedSts(inst,cell->rguDlSap,RG_RGU_SDU_DROP, datReq);
#ifdef CA_DBG
{
-
EXTERN U32
dbgDelayedDatReqInMac;
+
uint32_t
dbgDelayedDatReqInMac;
dbgDelayedDatReqInMac++;
}
#endif /* CA_DBG */
dbgDelayedDatReqInMac++;
}
#endif /* CA_DBG */
@@
-221,7
+211,7
@@
RgRguDedDatReq *datReq;
continue;
}
continue;
}
- hqPId = (
U8
)(datReq->datReq[idx].transId);
+ hqPId = (
uint8_t
)(datReq->datReq[idx].transId);
hqPId = hqPId >> 2;
/* get harq process and invoke DHM */
rgDHMGetHqProcFrmId(ue, hqPId, &hqProc);
hqPId = hqPId >> 2;
/* get harq process and invoke DHM */
rgDHMGetHqProcFrmId(ue, hqPId, &hqProc);
@@
-328,17
+318,7
@@
RgRguDedDatReq *datReq;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 rgROMCmnDatReq
-(
-Inst inst,
-RgRguCmnDatReq *datReq
-)
-#else
-S16 rgROMCmnDatReq(inst,datReq)
-Inst inst;
-RgRguCmnDatReq *datReq;
-#endif
+S16 rgROMCmnDatReq(Inst inst, RgRguCmnDatReq *datReq)
{
RgCellCb *cell;
RgErrInfo err;
{
RgCellCb *cell;
RgErrInfo err;
@@
-375,8
+355,8
@@
RgRguCmnDatReq *datReq;
/*Get the timing Info*/
/* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
/*Get the timing Info*/
/* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
- timingInfo.slot = (
U8
)((datReq->transId >> 8) & 0XFF);
- timingInfo.sfn = (
U16
)((datReq->transId >> 16) & 0xFFFF);
+ timingInfo.slot = (
uint8_t
)((datReq->transId >> 8) & 0XFF);
+ timingInfo.sfn = (
uint16_t
)((datReq->transId >> 16) & 0xFFFF);
#endif
}
else
#endif
}
else
@@
-386,8
+366,8
@@
RgRguCmnDatReq *datReq;
/*Get the timing Info*/
/* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
/*Get the timing Info*/
/* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
- timingInfo.slot = (
U8
)(datReq->transId & 0XFF);
- timingInfo.sfn = (
U16
)((datReq->transId >> 8) & 0xFFFF);
+ timingInfo.slot = (
uint8_t
)(datReq->transId & 0XFF);
+ timingInfo.sfn = (
uint16_t
)((datReq->transId >> 8) & 0xFFFF);
#endif
}
#endif
}
@@
-432,23
+412,11
@@
RgRguCmnDatReq *datReq;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgROMHndlCcchDatReq
-(
-RgCellCb *cell,
-RgRguCmnDatReq *datReq,
-RgErrInfo *err
-)
-#else
-PRIVATE S16 rgROMHndlCcchDatReq(cell, datReq, err)
-RgCellCb *cell;
-RgRguCmnDatReq *datReq;
-RgErrInfo *err;
-#endif
+static S16 rgROMHndlCcchDatReq(RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err)
{
Inst inst = cell->macInst - RG_INST_START;
RgUeCb *ue;
{
Inst inst = cell->macInst - RG_INST_START;
RgUeCb *ue;
-
U8
hqPId;
+
uint8_t
hqPId;
RgDlHqProcCb *hqProc;
CmLteTimingInfo timingInfo;
RgDlSf *sf;
RgDlHqProcCb *hqProc;
CmLteTimingInfo timingInfo;
RgDlSf *sf;
@@
-472,8
+440,8
@@
RgErrInfo *err;
}
}
}
}
- timingInfo.slot = (
U8
)((datReq->transId >> 8) & 0XFF);
- timingInfo.sfn = (
U16
)((datReq->transId >> 16) & 0xFFFF);
+ timingInfo.slot = (
uint8_t
)((datReq->transId >> 8) & 0XFF);
+ timingInfo.sfn = (
uint16_t
)((datReq->transId >> 16) & 0xFFFF);
sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
if( (sf->txDone == TRUE) ||
sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
if( (sf->txDone == TRUE) ||
@@
-490,7
+458,7
@@
RgErrInfo *err;
return RFAILED;
}
return RFAILED;
}
- hqPId = (
U8
)(datReq->transId);
+ hqPId = (
uint8_t
)(datReq->transId);
hqPId = hqPId >> 2;
/* get harq process and invoke DHM */
hqPId = hqPId >> 2;
/* get harq process and invoke DHM */
@@
-530,19
+498,7
@@
RgErrInfo *err;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgROMHndlBcchPcchDatReq
-(
-RgCellCb *cell,
-RgRguCmnDatReq *datReq,
-RgErrInfo *err
-)
-#else
-PRIVATE S16 rgROMHndlBcchPcchDatReq(cell, datReq, err)
-RgCellCb *cell;
-RgRguCmnDatReq *datReq;
-RgErrInfo *err;
-#endif
+static S16 rgROMHndlBcchPcchDatReq(RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err)
{
Inst inst = cell->macInst - RG_INST_START;
RgPcchLcCb *pcch;
{
Inst inst = cell->macInst - RG_INST_START;
RgPcchLcCb *pcch;
@@
-557,8
+513,9
@@
RgErrInfo *err;
RgUstaDgn dgn; /* Alarm diagnostics structure */
#endif
RgUstaDgn dgn; /* Alarm diagnostics structure */
#endif
- timingInfo.slot = (U8)(datReq->transId & 0XFF);
- timingInfo.sfn = (U16)((datReq->transId >> 8) & 0xFFFF);
+
+ timingInfo.slot = (uint8_t)(datReq->transId & 0XFF);
+ timingInfo.sfn = (uint16_t)((datReq->transId >> 8) & 0xFFFF);
sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
if( (sf->txDone == TRUE) ||
sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
if( (sf->txDone == TRUE) ||
@@
-630,17
+587,7
@@
RgErrInfo *err;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 rgROMDedStaRsp
-(
-Inst inst,
-RgRguDedStaRsp *staRsp
-)
-#else
-S16 rgROMDedStaRsp(inst,staRsp)
-Inst inst;
-RgRguDedStaRsp *staRsp;
-#endif
+S16 rgROMDedStaRsp(Inst inst, RgRguDedStaRsp *staRsp)
{
RgCellCb *cell;
{
RgCellCb *cell;
@@
-723,17
+670,7
@@
S32 bo
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 rgROMCmnStaRsp
-(
-Inst inst,
-RgRguCmnStaRsp *staRsp
-)
-#else
-S16 rgROMCmnStaRsp(inst,staRsp)
-Inst inst;
-RgRguCmnStaRsp *staRsp;
-#endif
+S16 rgROMCmnStaRsp(Inst inst, RgRguCmnStaRsp *staRsp)
{
RgCellCb *cell;
RgErrInfo err;
{
RgCellCb *cell;
RgErrInfo err;
@@
-782,22
+719,12
@@
RgRguCmnStaRsp *staRsp;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 rgROML2MUlThrpMeasReq
-(
-Inst inst,
-RgRguL2MUlThrpMeasReq *measReq
-)
-#else
-S16 rgROML2MUlThrpMeasReq(inst,measReq)
-Inst inst;
-RgRguL2MUlThrpMeasReq *measReq;
-#endif
+S16 rgROML2MUlThrpMeasReq(Inst inst, RgRguL2MUlThrpMeasReq *measReq)
{
RgCellCb *cell;
RgUeCb *ue;
{
RgCellCb *cell;
RgUeCb *ue;
-
U8
lcgId;
-
U8
loop;
+
uint8_t
lcgId;
+
uint8_t
loop;
if(((cell = rgCb[inst].cell) != NULLP)
&&(cell->cellId == measReq->cellId))
if(((cell = rgCb[inst].cell) != NULLP)
&&(cell->cellId == measReq->cellId))
@@
-845,19
+772,7
@@
RgRguL2MUlThrpMeasReq *measReq;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgROMHndlCcchStaRsp
-(
-RgCellCb *cell,
-RgRguCmnStaRsp *staRsp,
-RgErrInfo *err
-)
-#else
-PRIVATE S16 rgROMHndlCcchStaRsp(cell, staRsp, err)
-RgCellCb *cell;
-RgRguCmnStaRsp *staRsp;
-RgErrInfo *err;
-#endif
+static S16 rgROMHndlCcchStaRsp(RgCellCb *cell,RgRguCmnStaRsp *staRsp, RgErrInfo *err)
{
Pst schPst;
Inst macInst = cell->macInst - RG_INST_START;
{
Pst schPst;
Inst macInst = cell->macInst - RG_INST_START;
@@
-896,19
+811,7
@@
RgErrInfo *err;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgROMHndlBcchPcchStaRsp
-(
-RgCellCb *cell,
-RgRguCmnStaRsp *staRsp,
-RgErrInfo *err
-)
-#else
-PRIVATE S16 rgROMHndlBcchPcchStaRsp(cell, staRsp, err)
-RgCellCb *cell;
-RgRguCmnStaRsp *staRsp;
-RgErrInfo *err;
-#endif
+static S16 rgROMHndlBcchPcchStaRsp(RgCellCb *cell,RgRguCmnStaRsp *staRsp,RgErrInfo *err)
{
Pst schPst;
//RgInfCmnBoRpt boRpt;
{
Pst schPst;
//RgInfCmnBoRpt boRpt;
@@
-927,7
+830,7
@@
RgErrInfo *err;
This assumes that BO is not received more than 4 frames in advance from the enodeb application */
if (cell->bcchBchInfo.lcId == staRsp->lcId)
{
This assumes that BO is not received more than 4 frames in advance from the enodeb application */
if (cell->bcchBchInfo.lcId == staRsp->lcId)
{
-
U16
nextBchSfn;
+
uint16_t
nextBchSfn;
nextBchSfn = (cell->crntTime.sfn + 4 - (cell->crntTime.sfn%4)) % RG_MAX_SFN;
if ((staRsp->u.timeToTx.sfn != nextBchSfn) ||
nextBchSfn = (cell->crntTime.sfn + 4 - (cell->crntTime.sfn%4)) % RG_MAX_SFN;
if ((staRsp->u.timeToTx.sfn != nextBchSfn) ||
@@
-976,17
+879,7
@@
RgErrInfo *err;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgROMUpdDlSfRemDataCnt
-(
-RgCellCb *cellCb,
-RgDlSf *dlSf
-)
-#else
-PRIVATE S16 rgROMUpdDlSfRemDataCnt(cellCb, dlSf)
-RgCellCb *cellCb;
-RgDlSf *dlSf;
-#endif
+static S16 rgROMUpdDlSfRemDataCnt(RgCellCb *cellCb, RgDlSf *dlSf)
{
RgErrInfo err;
//Inst inst = cellCb->macInst - RG_INST_START;
{
RgErrInfo err;
//Inst inst = cellCb->macInst - RG_INST_START;