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
[Task-ID: ODUHIGH-455] Changes to support new L1 20.11
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_rom.c
diff --git
a/src/5gnrmac/rg_rom.c
b/src/5gnrmac/rg_rom.c
index
f8e1f4c
..
cd20209
100755
(executable)
--- a/
src/5gnrmac/rg_rom.c
+++ b/
src/5gnrmac/rg_rom.c
@@
-32,9
+32,6
@@
@brief APIs to handle all the primitives invoked on RGU interface.
*/
@brief APIs to handle all the primitives invoked on RGU interface.
*/
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_FILE_ID=184;
-static int RLOG_MODULE_ID=4096;
/* header include files (.h) */
#include "common_def.h"
/* header include files (.h) */
#include "common_def.h"
@@
-66,18
+63,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,17
+101,7
@@
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;
{
#if 0
RgCellCb *cell;
@@
-143,8
+130,7
@@
RgRguDedDatReq *datReq;
{
#if (ERRCLASS & ERRCLS_INT_PAR)
/* Handle Cell fetch failure */
{
#if (ERRCLASS & ERRCLS_INT_PAR)
/* Handle Cell fetch failure */
- RGLOGERROR(inst,ERRCLS_INT_PAR,ERG001,(ErrVal)datReq->cellId,
- "rgROMDedDatReq(): Invalid cell Id");
+ DU_LOG("\nERROR --> MAC : rgROMDedDatReq(): Invalid cell Id");
#endif
err.errType = RGERR_ROM_DEDDATREQ;
err.errCause = RGERR_ROM_INV_CELL_ID;
#endif
err.errType = RGERR_ROM_DEDDATREQ;
err.errCause = RGERR_ROM_INV_CELL_ID;
@@
-180,7
+166,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
uint32_t dbgDelayedDatReqInMac;
+ uint32_t dbgDelayedDatReqInMac;
dbgDelayedDatReqInMac++;
}
#endif /* CA_DBG */
dbgDelayedDatReqInMac++;
}
#endif /* CA_DBG */
@@
-195,8
+181,7
@@
RgRguDedDatReq *datReq;
{
#if (ERRCLASS & ERRCLS_INT_PAR)
/* Handle Ue fetch failure */
{
#if (ERRCLASS & ERRCLS_INT_PAR)
/* Handle Ue fetch failure */
- RGLOGERROR(inst,ERRCLS_INT_PAR,ERG002,(ErrVal)datReq->datReq[idx].rnti,
- "rgROMDedDatReq(): Invalid ue Id");
+ DU_LOG("\nERROR --> MAC : rgROMDedDatReq(): Invalid ue Id");
#endif
err.errType = RGERR_ROM_DEDDATREQ;
err.errCause = RGERR_ROM_INV_UE_ID;
#endif
err.errType = RGERR_ROM_DEDDATREQ;
err.errCause = RGERR_ROM_INV_UE_ID;
@@
-209,7
+194,7
@@
RgRguDedDatReq *datReq;
ret = rgROMUpdDlSfRemDataCnt(cell, sf);
if(ret == RFAILED)
{
ret = rgROMUpdDlSfRemDataCnt(cell, sf);
if(ret == RFAILED)
{
-
RLOG0(L_INFO, "
Dropping due to no ue \n");
+
DU_LOG("\nERROR --> MAC :
Dropping due to no ue \n");
#ifndef L2_OPTMZ
RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]);
#endif
#ifndef L2_OPTMZ
RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]);
#endif
@@
-228,8
+213,7
@@
RgRguDedDatReq *datReq;
if (rgDHMHndlDedDatReq(inst,hqProc, &datReq->datReq[idx], sf, &err) == RFAILED)
{
if (rgDHMHndlDedDatReq(inst,hqProc, &datReq->datReq[idx], sf, &err) == RFAILED)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,datReq->cellId,
- "Handling of Data request in DHM failedi RNTI:%d",
+ DU_LOG("\nERROR --> MAC : Handling of Data request in DHM failedi RNTI:%d",
datReq->datReq[idx].rnti);
err.errType = RGERR_ROM_DEDDATREQ;
/* errcause shall be filled in appropriately by DHM */
datReq->datReq[idx].rnti);
err.errType = RGERR_ROM_DEDDATREQ;
/* errcause shall be filled in appropriately by DHM */
@@
-242,7
+226,7
@@
RgRguDedDatReq *datReq;
ret = rgROMUpdDlSfRemDataCnt(cell, sf);
if(ret == RFAILED)
{
ret = rgROMUpdDlSfRemDataCnt(cell, sf);
if(ret == RFAILED)
{
-
RLOG0(L_INFO, "
Dropping due to no failure of remCnt update");
+
DU_LOG("\nERROR --> MAC :
Dropping due to no failure of remCnt update");
#ifndef L2_OPTMZ
RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]);
#endif
#ifndef L2_OPTMZ
RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]);
#endif
@@
-295,7
+279,7
@@
RgRguDedDatReq *datReq;
ret = rgROMUpdDlSfRemDataCnt(cell, sf);
if(ret == RFAILED)
{
ret = rgROMUpdDlSfRemDataCnt(cell, sf);
if(ret == RFAILED)
{
-
RLOG0(L_INFO, "\n
Dropping due to no failure of remCnt update(1) \n");
+
DU_LOG("\nERROR --> MAC :
Dropping due to no failure of remCnt update(1) \n");
#ifndef L2_OPTMZ
RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]);
#endif
#ifndef L2_OPTMZ
RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[idx]);
#endif
@@
-328,17
+312,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;
@@
-356,8
+330,7
@@
RgRguCmnDatReq *datReq;
{
#if (ERRCLASS & ERRCLS_INT_PAR)
/* Handle Cell fetch failure */
{
#if (ERRCLASS & ERRCLS_INT_PAR)
/* Handle Cell fetch failure */
- RGLOGERROR(inst,ERRCLS_INT_PAR,ERG003,(ErrVal)datReq->cellId,
- "rgROMCmnDatReq(): Invalid cell Id");
+ DU_LOG("\nERROR --> MAC : rgROMCmnDatReq(): Invalid cell Id");
#endif
err.errCause = RGERR_ROM_INV_CELL_ID;
/* Update stats */
#endif
err.errCause = RGERR_ROM_INV_CELL_ID;
/* Update stats */
@@
-432,19
+405,7
@@
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;
@@
-464,8
+425,7
@@
RgErrInfo *err;
{
#if (ERRCLASS & ERRCLS_INT_PAR)
/* Handle Ue fetch failure */
{
#if (ERRCLASS & ERRCLS_INT_PAR)
/* Handle Ue fetch failure */
- RGLOGERROR(inst,ERRCLS_INT_PAR,ERG004,(ErrVal)datReq->u.rnti,
- "rgROMHndlCcchDatReq(): Invalid ue Id");
+ DU_LOG("\nERROR --> MAC : rgROMHndlCcchDatReq(): Invalid ue Id");
#endif
err->errCause = RGERR_ROM_INV_UE_ID;
return RFAILED;
#endif
err->errCause = RGERR_ROM_INV_UE_ID;
return RFAILED;
@@
-500,8
+460,7
@@
RgErrInfo *err;
/* invoke DHM to process CCCH data */
if (rgDHMHndlCmnDatReq(inst,hqProc, datReq, err) == RFAILED)
{
/* invoke DHM to process CCCH data */
if (rgDHMHndlCmnDatReq(inst,hqProc, datReq, err) == RFAILED)
{
- RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,
- "Handling of Data request in DHM failed RNTI:%d LCID:%d",
+ DU_LOG("\nERROR --> MAC : Handling of Data request in DHM failed RNTI:%d LCID:%d",
datReq->u.rnti,datReq->lcId);
/* Release First TB */
rgDHMRlsHqProcTB(cell, hqProc, 1);
datReq->u.rnti,datReq->lcId);
/* Release First TB */
rgDHMRlsHqProcTB(cell, hqProc, 1);
@@
-530,19
+489,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;
@@
-597,7
+544,7
@@
RgErrInfo *err;
return ROK;
}
#endif/*RGR_SI_SCH*/
return ROK;
}
#endif/*RGR_SI_SCH*/
-
+ UNUSED(inst);
pcch = rgDBMGetPcch(cell);
if ((pcch) && (pcch->lcId == datReq->lcId))
{
pcch = rgDBMGetPcch(cell);
if ((pcch) && (pcch->lcId == datReq->lcId))
{
@@
-607,8
+554,7
@@
RgErrInfo *err;
}
/* Handle lcCb fetch failure */
}
/* Handle lcCb fetch failure */
- RGLOGERROR(inst,ERRCLS_INT_PAR,ERG005,(ErrVal)datReq->lcId,
- "rgROMHndlBcchPcchDatReq(): Invalid Lc Id");
+ DU_LOG("\nERROR --> MAC : rgROMHndlBcchPcchDatReq(): Invalid Lc Id");
err->errCause = RGERR_ROM_INV_LC_ID;
return RFAILED;
err->errCause = RGERR_ROM_INV_LC_ID;
return RFAILED;
@@
-631,17
+577,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;
@@
-671,7
+607,7
@@
RgRguDedStaRsp *staRsp;
//TODO: commented for compilation without SCH RgMacSchDedBoUpdt(&schPst, &boRpt);
return ROK;
}
//TODO: commented for compilation without SCH RgMacSchDedBoUpdt(&schPst, &boRpt);
return ROK;
}
-
RLOG_ARG2(L_ERROR,DBG_CELLID,staRsp->cellId,"
Invalid cell for CRNTI:%d LCID:%d ",
+
DU_LOG("\nERROR --> MAC :
Invalid cell for CRNTI:%d LCID:%d ",
staRsp->rnti,staRsp->lcId);
return RFAILED;
staRsp->rnti,staRsp->lcId);
return RFAILED;
@@
-724,17
+660,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;
@@
-743,8
+669,7
@@
RgRguCmnStaRsp *staRsp;
|| (cell->cellId != staRsp->cellId))
{
/* Handle Cell fetch failure */
|| (cell->cellId != staRsp->cellId))
{
/* Handle Cell fetch failure */
- RLOG_ARG2(L_ERROR,DBG_CELLID,staRsp->cellId,
- "Invalid cell for CRNTI:%d LCID:%d",staRsp->u.rnti,staRsp->lcId);
+ DU_LOG("\nERROR --> MAC : Invalid cell for CRNTI:%d LCID:%d",staRsp->u.rnti,staRsp->lcId);
err.errType = RGERR_ROM_CMNSTARSP;
err.errCause = RGERR_ROM_INV_CELL_ID;
return RFAILED;
err.errType = RGERR_ROM_CMNSTARSP;
err.errCause = RGERR_ROM_INV_CELL_ID;
return RFAILED;
@@
-783,17
+708,7
@@
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;
@@
-821,7
+736,7
@@
RgRguL2MUlThrpMeasReq *measReq;
return ROK;
}
}
return ROK;
}
}
-
RLOG_ARG1(L_ERROR,DBG_CELLID,measReq->cellId,"
Invalid cell CRNTI:%d",
+
DU_LOG("\nERROR --> MAC :
Invalid cell CRNTI:%d",
measReq->rnti);
return RFAILED;
} /* rgROML2MUlThrpMeasReq */
measReq->rnti);
return RFAILED;
} /* rgROML2MUlThrpMeasReq */
@@
-846,19
+761,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;
@@
-897,19
+800,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;
@@
-920,7
+811,7
@@
RgErrInfo *err;
if (rgDBMChkCmnLcCb(cell, staRsp->lcId) != ROK)
{
/* Handle lcCb fetch failure */
if (rgDBMChkCmnLcCb(cell, staRsp->lcId) != ROK)
{
/* Handle lcCb fetch failure */
-
RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"
Invalid LCID:%d",staRsp->lcId);
+
DU_LOG("\nERROR --> MAC :
Invalid LCID:%d",staRsp->lcId);
err->errCause = RGERR_ROM_INV_LC_ID;
return RFAILED;
}
err->errCause = RGERR_ROM_INV_LC_ID;
return RFAILED;
}
@@
-977,17
+868,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;
@@
-996,8
+877,7
@@
RgDlSf *dlSf;
{
/*This is an error scenario of RLC generating more data
* request than the allocation. Do nothing for this. */
{
/*This is an error scenario of RLC generating more data
* request than the allocation. Do nothing for this. */
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,
- "RX new data while remDatReqCnt is 0 for cell");
+ DU_LOG("\nERROR --> MAC : RX new data while remDatReqCnt is 0 for cell");
return RFAILED;
}
return RFAILED;
}
@@
-1015,8
+895,7
@@
RgDlSf *dlSf;
if (ROK != rgTOMUtlProcDlSf (dlSf, cellCb, &err))
{
if (ROK != rgTOMUtlProcDlSf (dlSf, cellCb, &err))
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,
- "Unable to process downlink slot for cell");
+ DU_LOG("\nERROR --> MAC : Unable to process downlink slot for cell");
err.errType = RGERR_ROM_DEDDATREQ;
}
err.errType = RGERR_ROM_DEDDATREQ;
}