@brief This module handles the configuration of MAC by RRC and RRM.
*/
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_FILE_ID=180;
-static int RLOG_MODULE_ID=4096;
/* header include files -- defines (.h) */
#include "common_def.h"
#include "rg_env.h" /* MAC environmental includes*/
#include "rg.h" /* MAC includes*/
#include "rg_err.h" /* MAC error includes*/
-
+#include "mac_utils.h"
/* header/extern include files (.x) */
#include "rgu.x" /* RGU types */
#include "tfu.x" /* RGU types */
RgCb rgCb[RG_MAX_INST];
/* local defines */
-PRIVATE S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
+static S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
RgUeCb **ue, RgErrInfo *errInfo));
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
+static S16 rgCFGVldtCrgCmnLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell,
RgErrInfo *errInfo));
-PRIVATE S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue,
+static S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue,
CrgLchCfg *lcCfg, RgErrInfo *errInfo));
-PRIVATE S16 rgCFGCrgCmnLcCfg ARGS((Inst inst,RgCellCb *cell, CrgLchCfg *lcCfg,
+static S16 rgCFGCrgCmnLcCfg ARGS((Inst inst,RgCellCb *cell, CrgLchCfg *lcCfg,
RgErrInfo *errInfo));
-PRIVATE Void rgCFGFreeCmnLcLst ARGS((RgCellCb *cell));
-PRIVATE Void rgCFGFreeUeLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeCmnLcLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeUeLst ARGS((RgCellCb *cell));
/* Added support for SPS*/
#ifdef LTEMAC_SPS
-PRIVATE Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
+static Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell));
#endif /* LTEMAC_SPS */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGVldtCrgCellCfg
(
Inst inst,
CrgCellCfg *cellCfg,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGVldtCrgCellCfg(inst,cellCfg, errInfo)
-Inst inst;
-CrgCellCfg *cellCfg;
-RgErrInfo *errInfo;
-#endif
{
errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_CFG;
if ((rgCb[inst].cell != NULLP)
|| rgCb[inst].inactiveCell != NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Cell already exists");
+ DU_LOG("\nERROR --> MAC : Cell already exists");
return RFAILED;
}
if ((cellCfg->bwCfg.dlTotalBw < RG_MIN_DL_BW
|| (cellCfg->bwCfg.ulTotalBw < RG_MIN_UL_BW
|| cellCfg->bwCfg.ulTotalBw > RG_MAX_UL_BW))
{
- RLOG_ARG2(L_ERROR,DBG_CELLID,cellCfg->cellId,
- "Invalid Bandwidth configuration: ul %d dl %d",
+ DU_LOG("\nERROR --> MAC : Invalid Bandwidth configuration: ul %d dl %d",
cellCfg->bwCfg.ulTotalBw, cellCfg->bwCfg.dlTotalBw);
return RFAILED;
}
if (cellCfg->rachCfg.maxMsg3Tx < RG_MIN_HQ_TX)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCfg->cellId,
- "Invalid RACH configuration: maxMsg3Tx %d",cellCfg->rachCfg.maxMsg3Tx);
+ DU_LOG("\nERROR --> MAC : Invalid RACH configuration: maxMsg3Tx %d",cellCfg->rachCfg.maxMsg3Tx);
return RFAILED;
}
#ifdef TENB_MULT_CELL_SUPPRT
if((cellCfg->rguDlSapId > rgCb[inst].numRguSaps) ||
(cellCfg->rguUlSapId > rgCb[inst].numRguSaps))
{
- RGDBGERRNEW(inst,(rgPBuf(inst), "Invald Sap Id: DL %d UL %d for CellId %d failed\n",
+ DU_LOG("\nERROR --> MAC : Invald Sap Id: DL %d UL %d for CellId %d failed\n",
cellCfg->rguDlSapId,
cellCfg->rguUlSapId,
- cellCfg->cellId));
+ cellCfg->cellId);
return RFAILED;
}
#endif
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGVldtCrgUeCfg
(
Inst inst,
RgCellCb **cell,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGVldtCrgUeCfg(inst,ueCfg, cell, errInfo)
-Inst inst;
-CrgUeCfg *ueCfg;
-RgCellCb **cell;
-RgErrInfo *errInfo;
-#endif
{
errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_CFG;
if ((ueCfg->txMode.pres == PRSNT_NODEF) &&
(ueCfg->txMode.tm == CRG_UE_TM_5))
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Transmission Mode=%d not supported",
+ DU_LOG("\nERROR --> MAC : Transmission Mode=%d not supported",
ueCfg->txMode.tm);
return RFAILED;
}
if(((*cell = rgCb[inst].cell) == NULLP) ||
((*cell)->cellId != ueCfg->cellId))
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Active Cell does not exist for cellId%d",
+ DU_LOG("\nERROR --> MAC : Active Cell does not exist for cellId%d",
ueCfg->cellId);
return RFAILED;
}
- /* Check if Ue already configured */
+ /* Check if UE already configured */
if (rgDBMGetUeCb(*cell, ueCfg->crnti) != NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CRNTI,ueCfg->crnti,"Ue already exists");
+ DU_LOG("\nERROR --> MAC : UE already exists");
return RFAILED;
}
if (ueCfg->ueUlHqCfg.maxUlHqTx < RG_MIN_HQ_TX)
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,ueCfg->crnti, "Invalid Uplink HARQ config %d ",
+ DU_LOG("\nERROR --> MAC : Invalid Uplink HARQ config %d ",
ueCfg->ueUlHqCfg.maxUlHqTx);
return RFAILED;
}
if((ueCfg->rguDlSapId > rgCb[inst].numRguSaps) ||
(ueCfg->rguUlSapId > rgCb[inst].numRguSaps))
{
- RGDBGERRNEW(inst,(rgPBuf(inst), "Invald Sap Id: DL %d UL %d for ueId %d failed\n",
+ DU_LOG("\nERROR --> MAC : Invald Sap Id: DL %d UL %d for ueId %d failed\n",
ueCfg->rguDlSapId,
ueCfg->rguUlSapId,
- ueCfg->crnti));
+ ueCfg->crnti);
return RFAILED;
}
#endif
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGVldtCrgLcCfg
(
Inst inst,
RgUeCb **ue,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGVldtCrgLcCfg(inst,lcCfg, cell, ue, errInfo)
-Inst inst;
-CrgLchCfg *lcCfg;
-RgCellCb **cell;
-RgUeCb **ue;
-RgErrInfo *errInfo;
-#endif
{
if (lcCfg->lcType == CM_LTE_LCH_DTCH || lcCfg->lcType == CM_LTE_LCH_DCCH)
/* Dedicated logical channels */
if ((rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo)) != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Validation for dedicated LC failed");
+ DU_LOG("\nERROR --> MAC : Validation for dedicated LC failed");
return RFAILED;
}
}
{
if ((rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo)) != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Validation for common logical channels failed");
+ DU_LOG("\nERROR --> MAC : Validation for common logical channels failed");
return RFAILED;
}
}
else
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid logical channel type %d",
+ DU_LOG("\nERROR --> MAC : Invalid logical channel type %d",
lcCfg->lcType);
return RFAILED;
}
lcCfg->qci > RG_QCI_MAX
)
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid qci %x",lcCfg->qci);
+ DU_LOG("\nERROR --> MAC : Invalid qci %x",lcCfg->qci);
return RFAILED;
}
/*validate qci */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGVldtCrgCellRecfg
(
Inst inst,
RgCellCb **cell,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGVldtCrgCellRecfg(inst,cellRecfg, cell, errInfo)
-Inst inst;
-CrgCellRecfg *cellRecfg;
-RgCellCb **cell;
-RgErrInfo *errInfo;
-#endif
{
errInfo->errCause = RGERR_CFG_INVALID_CRG_CELL_RECFG;
if (((*cell = rgCb[inst].cell) == NULLP)
&& ((*cell = rgCb[inst].inactiveCell) == NULLP))
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellRecfg->cellId,"Cell does not exist");
+ DU_LOG("\nERROR --> MAC : Cell does not exist");
return RFAILED;
}
if((*cell)->cellId != cellRecfg->cellId)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellRecfg->cellId, "Cell does not exist %d\n",cellRecfg->cellId);
+ DU_LOG("\nERROR --> MAC : Cell does not exist %d\n",cellRecfg->cellId);
return RFAILED;
}
if (cellRecfg->rachRecfg.maxMsg3Tx < RG_MIN_HQ_TX)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellRecfg->cellId,
- "Invalid RACH configuration: maxMsg3Tx %d",cellRecfg->rachRecfg.maxMsg3Tx);
+ DU_LOG("\nERROR --> MAC : Invalid RACH configuration: maxMsg3Tx %d",cellRecfg->rachRecfg.maxMsg3Tx);
return RFAILED;
}
errInfo->errCause = RGERR_NONE;
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGVldtCrgUeRecfg
(
Inst inst,
RgUeCb **ue,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGVldtCrgUeRecfg(inst,ueRecfg, cell, ue, errInfo)
-Inst inst;
-CrgUeRecfg *ueRecfg;
-RgCellCb **cell;
-RgUeCb **ue;
-RgErrInfo *errInfo;
-#endif
{
errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RECFG;
if ((ueRecfg->txMode.pres == PRSNT_NODEF) &&
(ueRecfg->txMode.tm == CRG_UE_TM_5))
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Transmission Mode=%d not supported",
+ DU_LOG("\nERROR --> MAC : Transmission Mode=%d not supported",
ueRecfg->txMode.tm);
return RFAILED;
}
if (((*cell = rgCb[inst].cell) == NULLP)
|| ((*cell)->cellId != ueRecfg->cellId))
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,ueRecfg->cellId, "Active Cell does not exist\n");
+ DU_LOG("\nERROR --> MAC : Active Cell does not exist\n");
return RFAILED;
}
* by SCH. */
if ((*ue = rgDBMGetUeCb(*cell, ueRecfg->oldCrnti)) == NULLP)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"[%d]Old Ue does not exist", ueRecfg->oldCrnti);
+ DU_LOG("\nERROR --> MAC : [%d]Old UE does not exist", ueRecfg->oldCrnti);
return RFAILED;
}
if (ueRecfg->ueUlHqRecfg.maxUlHqTx < RG_MIN_HQ_TX)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,ueRecfg->cellId,"Invalid Uplink HARQ config for UE %d",
+ DU_LOG("\nERROR --> MAC : Invalid Uplink HARQ config for UE %d",
ueRecfg->ueUlHqRecfg.maxUlHqTx);
return RFAILED;
}
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGVldtCrgLcRecfg
(
Inst inst,
RgUlLcCb **ulLc,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGVldtCrgLcRecfg(inst,lcRecfg, cell, ue, ulLc, errInfo)
-Inst inst;
-CrgLchRecfg *lcRecfg;
-RgCellCb **cell;
-RgUeCb **ue;
-RgUlLcCb **ulLc;
-RgErrInfo *errInfo;
-#endif
{
errInfo->errCause = RGERR_CFG_INVALID_CRG_LC_RECFG;
if ((((*cell = rgCb[inst].cell)) == NULLP)
|| ((*cell)->cellId != lcRecfg->cellId))
{
- RLOG_ARG2(L_ERROR,DBG_CRNTI,lcRecfg->crnti,"Active Cell %u does not exist for UE %u", lcRecfg->cellId, lcRecfg->crnti);
+ DU_LOG("\nERROR --> MAC : Active Cell %u does not exist for UE %u", lcRecfg->cellId, lcRecfg->crnti);
return RFAILED;
}
/* Fetch the Ue for dedicated channels */
if ((*ue = rgDBMGetUeCb(*cell, lcRecfg->crnti)) == NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CRNTI,lcRecfg->crnti,"Ue does not exist for dedicated logical channel");
+ DU_LOG("\nERROR --> MAC : UE does not exist for dedicated logical channel");
return RFAILED;
}
if ((*ulLc = rgDBMGetUlDedLcCb((*ue), lcRecfg->lcId)) == NULLP)
{
- RLOG_ARG1(L_ERROR, DBG_CRNTI,lcRecfg->crnti,"Dedicated UL LC does not exist %d",lcRecfg->lcId);
+ DU_LOG("\nERROR --> MAC : Dedicated UL LC does not exist %d",lcRecfg->lcId);
return RFAILED;
}
if (lcRecfg->ulRecfg.lcgId > (RG_MAX_LCG_PER_UE - 1))
{
- RLOG_ARG2(L_ERROR,DBG_CRNTI,lcRecfg->crnti,"Invalid lcgId for uplink logical channel lcg %d lc %d",
+ DU_LOG("\nERROR --> MAC : Invalid lcgId for uplink logical channel lcg %d lc %d",
lcRecfg->ulRecfg.lcgId, lcRecfg->lcId);
return RFAILED;
}
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGVldtCrgUeReset
(
Inst inst,
RgUeCb **ue,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGVldtCrgUeReset(inst,reset, cell, ue, errInfo)
-Inst inst;
-CrgRst *reset;
-RgCellCb **cell;
-RgUeCb **ue;
-RgErrInfo *errInfo;
-#endif
{
errInfo->errCause = RGERR_CFG_INVALID_CRG_UE_RESET;
if (((*cell = rgCb[inst].cell) == NULLP)
|| ((*cell)->cellId != reset->cellId))
{
- RGDBGERRNEW(inst,(rgPBuf(inst), "[%d]Active Cell does not exist %d\n",reset->crnti, reset->cellId));
- RLOG_ARG1(L_ERROR,DBG_CRNTI,reset->crnti,"Active Cell does not exist %d",reset->cellId);
+ DU_LOG("\nERROR --> MAC : Active Cell does not exist %d",reset->cellId);
return RFAILED;
}
/* Fetch the Ue */
if ((*ue = rgDBMGetUeCb(*cell, reset->crnti)) == NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CRNTI,reset->crnti,"UE does not exist");
+ DU_LOG("\nERROR --> MAC : UE does not exist");
return RFAILED;
}
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGCrgCellCfg
(
Inst inst,
CrgCellCfg *cellCfg,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGCrgCellCfg(inst,cellCfg, errInfo)
-Inst inst;
-CrgCellCfg *cellCfg;
-RgErrInfo *errInfo;
-#endif
{
S16 ret;
RgCellCb *cell = NULLP;
SuId rguUlSapId = 0;
SuId rguDlSapId = 0;
/* RLC SAP to allocate flowCntrlInd buffer*/
- Pst *pst ;
+ /* Commented below to resolve compilation warning */
+ //Pst *pst ;
errInfo->errCause = RGERR_CFG_CRG_CELL_CFG;
/* Allocate the cell control block */
if((ret = rgAllocSBuf(inst,(Data**)&cell, sizeof(RgCellCb))) != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"Memory allocation FAILED for cell");
+ DU_LOG("\nERROR --> MAC : Memory allocation FAILED for cell");
return RFAILED;
}
if (cell == NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId, "Memory allocation FAILED for cell");
+ DU_LOG("\nERROR --> MAC : Memory allocation FAILED for cell");
return RFAILED;
}
ret = rgDBMInitCell(cell);
if (ret != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellCfg->cellId,"DBM initialization for cell failed");
+ DU_LOG("\nERROR --> MAC : DBM initialization for cell failed");
rgCFGFreeInactvCellCb(cell);
return RFAILED;
}
rgUpdtCellCnt(inst,RG_CFG_ADD);
errInfo->errCause = RGERR_NONE;
- pst = &rgCb[inst].rguSap[rguDlSapId].sapCfg.sapPst;
+ /* Commented below to resolve compilation warning */
+ //pst = &rgCb[inst].rguSap[rguDlSapId].sapCfg.sapPst;
/* Allocate a buffer for flowCntrlInd.*/
- SGetSBuf(pst->region, pst->pool, (Data **)&cell->flowCntrlInd,
- sizeof(RguFlowCntrlInd));
+ MAC_ALLOC(cell->flowCntrlInd, sizeof(RguFlowCntrlInd));
+ if(cell->flowCntrlInd == NULLP)
+ {
+ DU_LOG("ERROR --> MAC : rgCFGCrgCellCfg(): Memory allocation failed");
+ return RFAILED;
+ }
return ROK;
} /* rgCFGCrgCellCfg */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCfgAddUeSCellCfg
(
Inst dstMacInst,
RgPrgUeSCellCfgInfo *ueSCellCb,
RgCellCb *cell
)
-#else
-S16 rgCfgAddUeSCellCfg(dstMacInst, ueSCellCb, cell)
-Inst dstMacInst;
-RgPrgUeSCellCfgInfo *ueSCellCb;
-RgCellCb *cell;
-#endif
{
RgUeCb *ueCb = NULLP;
SuId rguUlSapId = 0;
if ((ueCb = rgDBMGetUeCb(cell, ueSCellCb->ueId)) != NULLP)
{
- RGDBGERRNEW(dstMacInst,(rgPBuf(dstMacInst),
- "[%d]Ue already exist in scell %d during scell addition\n",
+ DU_LOG("\nERROR --> MAC : [%d]UE already exist in scell %d during scell addition\n",
ueSCellCb->ueId,
- cell->cellId));
+ cell->cellId);
return RFAILED;
}
if((ueCb = rgRAMCreateUeCb(cell, ueSCellCb->ueId,
FALSE, &errInfo)) == NULLP)
{
- RGDBGERRNEW(dstMacInst, (rgPBuf(dstMacInst),
- "[%d]UeCb creation failed\n", ueSCellCb->ueId));
+ DU_LOG("\nERROR --> MAC : [%d]UeCb creation failed\n", ueSCellCb->ueId);
return RFAILED;
}
if(rgDHMHqEntInit(dstMacInst, &ueCb->dl.hqEnt,
(rgCb[dstMacInst].cell)->maxDlHqProcPerUe) != ROK)
{
- RGDBGERRNEW(dstMacInst,(rgPBuf(dstMacInst),
- "[%d]UeCb Harq Entity Initialization failed\n", ueSCellCb->ueId));
+ DU_LOG("\nERROR --> MAC : [%d]UeCb Harq Entity Initialization failed\n", ueSCellCb->ueId);
return RFAILED;
}
rgDBMInsUeCb(cell, ueCb);
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgFillAndAddSCellCfg
(
Inst inst,
CrgCfgTransId transId,
Bool *isCfmRqrd
)
-#else
-S16 rgFillAndAddSCellCfg(inst, cell, ueRecfg, transId, isCfmRqrd)
-Inst inst;
-RgCellCb *cell;
-CrgUeRecfg *ueRecfg;
-CrgCfgTransId transId;
-Bool *isCfmRqrd;
-#endif
{
RgUeCb *ue = NULLP;
uint8_t idx = 0;
if(((cell = rgCb[inst].cell) == NULLP) ||
(cell->cellId != ueRecfg->cellId))
{
- RGDBGERRNEW(inst,(rgPBuf(inst),
- "[%d]Active Cell does not exist %d\n",
- ueRecfg->oldCrnti, ueRecfg->cellId));
+ DU_LOG("\nERROR --> MAC : [%d]Active Cell does not exist %d\n",
+ ueRecfg->oldCrnti, ueRecfg->cellId);
return RFAILED;
}
- RGDBGPRM(inst,(rgPBuf(inst),
- "Filling SCell Config : cellId %d ueId %d\n",
- cell->cellId, cell->ueId));
+ DU_LOG("\nINFO --> MAC : Filling SCell Config : cellId %d ueId %d\n",
+ cell->cellId, cell->ueId);
if ((ue = rgDBMGetUeCb(cell, ueRecfg->oldCrnti)) == NULLP)
{
- RGDBGERRNEW(inst,(rgPBuf(inst),
- "[%d]Ue does not exist\n", ueRecfg->oldCrnti));
+ DU_LOG("\nERROR --> MAC : [%d]UE does not exist\n", ueRecfg->oldCrnti);
return RFAILED;
}
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGCrgUeCfg
(
Inst inst,
CrgUeCfg *ueCfg,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGCrgUeCfg(inst,cell, ueCfg, errInfo)
-Inst inst;
-RgCellCb *cell;
-CrgUeCfg *ueCfg;
-RgErrInfo *errInfo;
-#endif
{
RgUeCb *ue = NULLP;
Bool handover = FALSE;
/* Create UeCb and Insert in Rach List */
if((ue=rgRAMCreateUeCb(cell, ueCfg->crnti, FALSE, errInfo)) == NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CRNTI,ueCfg->crnti,"UeCb creation failed");
+ DU_LOG("\nERROR --> MAC : UeCb creation failed");
return RFAILED;
}
if(rgDHMHqEntInit(inst,&ue->dl.hqEnt, cell->maxDlHqProcPerUe) != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CRNTI,ueCfg->crnti,"UeCb Harq Entity Initialization failed");
+ DU_LOG("\nERROR --> MAC : UeCb Harq Entity Initialization failed");
return RFAILED;
}
handover = TRUE;
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGCrgLcCfg
(
Inst inst,
Bool *isCfmRqrd,
CrgCfgTransId transId
)
-#else
-S16 rgCFGCrgLcCfg(inst,cell, ue, lcCfg, errInfo, isCfmRqrd,transId)
-Inst inst;
-RgCellCb *cell;
-RgUeCb *ue;
-CrgLchCfg *lcCfg;
-RgErrInfo *errInfo;
-Bool *isCfmRqrd;
-CrgCfgTransId transId;
-#endif
{
/* Handle Config for dedicated/common logical channels */
if ((rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo)) != ROK)
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,
- "Dedicated logical channel configuration failed %d",lcCfg->lcId);
+ DU_LOG("\nERROR --> MAC : Dedicated logical channel configuration failed %d",lcCfg->lcId);
return RFAILED;
}
#ifdef LTE_ADV
{
if ((rgCFGCrgCmnLcCfg(inst,cell, lcCfg, errInfo)) != ROK)
{
- RLOG_ARG1(L_ERROR, DBG_CRNTI, lcCfg->crnti, "Common logical channel configuration"
+ DU_LOG("\nERROR --> MAC : Common logical channel configuration"
"failed %d\n", lcCfg->lcId);
return RFAILED;
}
}
errInfo->errCause = RGERR_NONE;
- RLOG_ARG1(L_INFO, DBG_CRNTI,lcCfg->crnti, "CRG LC config done for UE: lcId %d\n", lcCfg->lcId);
+ DU_LOG("\nINFO --> MAC : CRG LC config done for UE lcId %d\n", lcCfg->lcId);
return ROK;
} /* rgCFGCrgLcCfg */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGCrgCellRecfg
(
Inst inst,
CrgCellRecfg *cellRecfg,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGCrgCellRecfg(inst,cell, cellRecfg, errInfo)
-Inst inst;
-RgCellCb *cell;
-CrgCellRecfg *cellRecfg;
-RgErrInfo *errInfo;
-#endif
{
/* Store the given rachCfg */
cell->rachCfg = cellRecfg->rachRecfg;
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGCrgUeRecfg
(
Inst inst,
CrgUeRecfg *ueRecfg,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGCrgUeRecfg(inst,cell, ue, ueRecfg, errInfo)
-Inst inst;
-RgCellCb *cell;
-RgUeCb *ue;
-CrgUeRecfg *ueRecfg;
-RgErrInfo *errInfo;
-#endif
{
errInfo->errCause = RGERR_CFG_CRG_UE_RECFG;
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGCrgLcRecfg
(
Inst inst,
RgErrInfo *errInfo,
Bool *isCfmRqrd
)
-#else
-S16 rgCFGCrgLcRecfg(inst,cell, ue, ulLc, lcRecfg, errInfo, isCfmRqrd)
-Inst inst;
-RgCellCb *cell;
-RgUeCb *ue;
-RgUlLcCb *ulLc;
-CrgLchRecfg *lcRecfg;
-RgErrInfo *errInfo;
-Bool *isCfmRqrd;
-#endif
{
if (ulLc->lcgId != lcRecfg->ulRecfg.lcgId)
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGCrgUeReset
(
RgCellCb *cell,
CrgRst *reset,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGCrgUeReset(cell, ue, reset, errInfo)
-RgCellCb *cell;
-RgUeCb *ue;
-CrgRst *reset;
-RgErrInfo *errInfo;
-#endif
{
- RLOG_ARG1(L_DEBUG, DBG_CRNTI, ue->ueId, "UE: of cell %d Reset\n", cell->cellId);
+ DU_LOG("\nDEBUG --> MAC : UE of cell %d Reset\n", cell->cellId);
rgDHMUeReset(cell, &ue->dl.hqEnt);
errInfo->errCause = RGERR_NONE;
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGCrgCellDel
(
Inst inst,
CrgDel *cellDelInfo,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGCrgCellDel(inst,cellDelInfo, errInfo)
-Inst inst,
-CrgDel *cellDelInfo;
-RgErrInfo *errInfo;
-#endif
{
RgCellCb *cell;
uint8_t idx;
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellDelInfo->u.cellDel.cellId,"Cell does not exist");
+ DU_LOG("\nERROR --> MAC : Cell does not exist");
return RFAILED;
}
rgCb[inst].cell = NULLP;
errInfo->errCause = RGERR_NONE;
- RGDBGINFO(inst,(rgPBuf(inst), "Cell %d deleted\n", cellDelInfo->u.cellDel.cellId));
+ DU_LOG("\nINFO --> MAC : Cell %d deleted\n", cellDelInfo->u.cellDel.cellId);
return ROK;
} /* rgCFGCrgCellDel */
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGCrgUeDel
(
Inst inst,
CrgDel *ueDelInfo,
RgErrInfo *errInfo
)
-#else
-S16 rgCFGCrgUeDel(inst,ueDelInfo, errInfo)
-Inst inst;
-CrgDel *ueDelInfo;
-RgErrInfo *errInfo;
-#endif
{
errInfo->errCause = RGERR_CFG_CRG_UE_DEL;
- RLOG_ARG1(L_DEBUG, DBG_CRNTI, ueDelInfo->u.ueDel.crnti, "UE %d Deletion Req at MAC\n", \
+ DU_LOG("\nDEBUG --> MAC : UE %d Deletion Req at MAC\n", \
ueDelInfo->u.ueDel.crnti);
if ((rgCb[inst].cell == NULLP)
|| (rgCb[inst].cell->cellId != ueDelInfo->u.ueDel.cellId))
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,ueDelInfo->u.ueDel.crnti,"Cell does not exist %d",
+ DU_LOG("\nERROR --> MAC : Cell does not exist %d",
ueDelInfo->u.ueDel.cellId);
return RFAILED;
}
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgCFGCrgLcDel
(
Inst inst,
Bool *isCfmRqrd,
CrgCfgTransId transId
)
-#else
-S16 rgCFGCrgLcDel(inst,lcDelInfo, errInfo,isCfmRqrd,transId)
-Inst inst;
-CrgDel *lcDelInfo;
-RgErrInfo *errInfo;
-CrgCfgTransId transId;
-#endif
{
Bool dirVld = FALSE;
RgCellCb *cell;
if (((cell = rgCb[inst].cell) == NULLP) ||
(rgCb[inst].cell->cellId != lcDelInfo->u.lchDel.cellId))
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"Cell does not exist %d",
+ DU_LOG("\nERROR --> MAC : Cell does not exist %d",
lcDelInfo->u.lchDel.cellId);
return RFAILED;
}
/* Fetch the Ue */
if ((ue = rgDBMGetUeCb(cell, lcDelInfo->u.lchDel.crnti)) == NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,
- "UE does not exist for dedicated logical channel");
+ DU_LOG("\nERROR --> MAC : UE does not exist for dedicated logical channel");
return RFAILED;
}
if ((dlLc = rgDBMGetDlDedLcCb(ue, lcDelInfo->u.lchDel.lcId))
== NULLP)
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"DL LC %d does not exist",
+ DU_LOG("\nERROR --> MAC : DL LC %d does not exist",
lcDelInfo->u.lchDel.lcId);
return RFAILED;
}
if ((ulLc = rgDBMGetUlDedLcCb(ue, lcDelInfo->u.lchDel.lcId))
== NULLP)
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"UL LC %d does not exist",
+ DU_LOG("\nERROR --> MAC : UL LC %d does not exist",
lcDelInfo->u.lchDel.lcId);
return RFAILED;
}
if (!dirVld)
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcDelInfo->u.lchDel.crnti,"Invalid direction %d for LC Delete",
+ DU_LOG("\nERROR --> MAC : Invalid direction %d for LC Delete",
lcDelInfo->u.lchDel.dir);
return RFAILED;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PRIVATE S16 rgCFGVldtCrgDedLcCfg
+static S16 rgCFGVldtCrgDedLcCfg
(
Inst inst,
CrgLchCfg *lcCfg,
RgUeCb **ue,
RgErrInfo *errInfo
)
-#else
-PRIVATE S16 rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo)
-Inst inst;
-CrgLchCfg *lcCfg;
-RgCellCb **cell;
-RgUeCb **ue;
-RgErrInfo *errInfo;
-#endif
{
uint8_t dirVld = FALSE;
if (((*cell = rgCb[inst].cell) == NULLP)
|| ((*cell)->cellId != lcCfg->cellId))
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Active Cell does not exist: Cell %d",
+ DU_LOG("\nERROR --> MAC : Active Cell does not exist: Cell %d",
lcCfg->cellId);
return RFAILED;
}
/* Fetch the Ue */
if ((*ue = rgDBMGetUeCb(*cell, lcCfg->crnti)) == NULLP)
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE does not exist for dedicated logical channel %d",
+ DU_LOG("\nERROR --> MAC : UE does not exist for dedicated logical channel %d",
lcCfg->lcId);
return RFAILED;
}
if ((lcCfg->lcId < RG_DEDLC_MIN_LCID)
||(lcCfg->lcId > RG_DEDLC_MAX_LCID))
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid logical channel Id %d",
+ DU_LOG("\nERROR --> MAC : Invalid logical channel Id %d",
lcCfg->lcId);
return RFAILED;
}
{
if (rgDBMGetDlDedLcCb((*ue), lcCfg->lcId) != NULLP)
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE: Dedicated DL LC %d already configured",
+ DU_LOG("\nERROR --> MAC : UE Dedicated DL LC %d already configured",
lcCfg->lcId);
return RFAILED;
}
{
if (lcCfg->ulInfo.lcgId > (RG_MAX_LCG_PER_UE - 1))
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE: Invalid lcgId for uplink logical channel %d",
+ DU_LOG("\nERROR --> MAC : UE Invalid lcgId for uplink logical channel %d",
lcCfg->ulInfo.lcgId);
return RFAILED;
}
if (rgDBMGetUlDedLcCb((*ue), lcCfg->lcId) != NULLP)
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"UE: Dedicated UL LC %d already configured",
+ DU_LOG("\nERROR --> MAC : UE Dedicated UL LC %d already configured",
lcCfg->lcId);
return RFAILED;
}
if (!dirVld)
{
- RLOG_ARG1(L_ERROR,DBG_CRNTI,lcCfg->crnti,"Invalid Direction %d",
+ DU_LOG("\nERROR --> MAC : Invalid Direction %d",
lcCfg->dir);
return RFAILED;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg
+static S16 rgCFGVldtCrgCmnLcCfg
(
Inst inst,
CrgLchCfg *lcCfg,
RgCellCb **cell,
RgErrInfo *errInfo
)
-#else
-PRIVATE S16 rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo)
-Inst inst;
-CrgLchCfg *lcCfg;
-RgCellCb **cell;
-RgErrInfo *errInfo;
-#endif
{
uint8_t dirVld = FALSE;
if (((*cell = rgCb[inst].cell) != NULLP)
&& ((*cell)->cellId != lcCfg->cellId))
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"Active Cell exists for common channels");
+ DU_LOG("\nERROR --> MAC : Active Cell exists for common channels");
return RFAILED;
}
|| ((*cell)->cellId != lcCfg->cellId))
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"Inactive Cell does not exist for common channels");
+ DU_LOG("\nERROR --> MAC : Inactive Cell does not exist for common channels");
return RFAILED;
}
/* Validate downlink info */
{
if (rgDBMGetBcchOnDlsch(*cell,lcCfg->lcId) != NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"BCCH on DLSCH already configured for cell");
+ DU_LOG("\nERROR --> MAC : BCCH on DLSCH already configured for cell");
return RFAILED;
}
}
{
if (rgDBMGetBcchOnBch(*cell) != NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"BCCH on BCH already configured for cell %d");
+ DU_LOG("\nERROR --> MAC : BCCH on BCH already configured for cell ");
return RFAILED;
}
}
else
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid transport channel %d for cell",
+ DU_LOG("\nERROR --> MAC : Invalid transport channel %d for cell",
lcCfg->dlInfo.dlTrchType);
return RFAILED;
}
{
if (rgDBMGetPcch(*cell) != NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"PCCH already configured for cell");
+ DU_LOG("\nERROR --> MAC : PCCH already configured for cell");
return RFAILED;
}
}
else if (RG_DLCCCH_ISCFGD(*cell))
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"DL CCCH already configured for cell %d");
+ DU_LOG("\nERROR --> MAC : DL CCCH already configured for cell ");
return RFAILED;
}
dirVld = TRUE;
/* Uplink CCCH */
if (lcCfg->lcType != CM_LTE_LCH_CCCH)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid UL common lcType %d for cell ",
+ DU_LOG("\nERROR --> MAC : Invalid UL common lcType %d for cell ",
lcCfg->lcType);
return RFAILED;
}
if (RG_ULCCCH_ISCFGD(*cell))
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,lcCfg->cellId,"UL CCCH already configured for cell ");
+ DU_LOG("\nERROR --> MAC : UL CCCH already configured for cell ");
return RFAILED;
}
dirVld = TRUE;
/* Invalid direction */
if (!dirVld)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,lcCfg->cellId,"Invalid Direction %d", lcCfg->dir);
+ DU_LOG("\nERROR --> MAC : Invalid Direction %d", lcCfg->dir);
return RFAILED;
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PRIVATE S16 rgCFGCrgDedLcCfg
+static S16 rgCFGCrgDedLcCfg
(
RgCellCb *cell,
RgUeCb *ue,
CrgLchCfg *lcCfg,
RgErrInfo *errInfo
)
-#else
-PRIVATE S16 rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo)
-RgCellCb *cell;
-RgUeCb *ue;
-CrgLchCfg *lcCfg;
-RgErrInfo *errInfo;
-#endif
{
//Inst inst = cell->macInst - RG_INST_START;
errInfo->errCause = RGERR_CFG_CRG_DED_LC_CFG;
* File :
*
**********************************************************/
-#ifdef ANSI
-PRIVATE S16 rgCFGCrgCmnLcCfg
+static S16 rgCFGCrgCmnLcCfg
(
Inst inst,
RgCellCb *cell,
CrgLchCfg *lcCfg,
RgErrInfo *errInfo
)
-#else
-PRIVATE S16 rgCFGCrgCmnLcCfg(inst,cell, lcCfg, errInfo)
-Inst inst;
-RgCellCb *cell;
-CrgLchCfg *lcCfg;
-RgErrInfo *errInfo;
-#endif
{
errInfo->errCause = RGERR_CFG_CRG_CMN_LC_CFG;
{
rgCb[inst].cell = cell;
rgCb[inst].inactiveCell = NULLP;
- RLOG_ARG1(L_DEBUG, DBG_CELLID, cell->cellId, "Cell %d added to active list after common LC %d\
+ DU_LOG("\nDEBUG --> MAC : Cell added to active list after common LC %d\
config\n", lcCfg->lcId);
}
* File :
*
**********************************************************/
-#ifdef ANSI
-PRIVATE Void rgCFGFreeUeUlAlloc
-(
-RgCellCb *cell
-)
-#else
-PRIVATE Void rgCFGFreeUeUlAlloc(cell)
-RgCellCb *cell;
-#endif
+static Void rgCFGFreeUeUlAlloc(RgCellCb *cell)
{
uint8_t sfIdx;
Inst inst = cell->macInst - RG_INST_START;
* File :
*
**********************************************************/
-#ifdef ANSI
-Void rgCFGFreeCellCb
-(
-RgCellCb *cell
-)
-#else
-Void rgCFGFreeCellCb(cell)
-RgCellCb *cell;
-#endif
+Void rgCFGFreeCellCb(RgCellCb *cell)
{
Inst inst = cell->macInst - RG_INST_START;
rgFreeSBuf(inst,(Data **)&cell, sizeof(*cell));
- RGDBGINFO(inst,(rgPBuf(inst), "Cell freed\n"));
+ DU_LOG("\nINFO --> MAC : Cell freed\n");
/* Stack Crash Problem for TRACE5 Changes. Added return below */
return;
* File :
*
**********************************************************/
-#ifdef ANSI
-Void rgCFGFreeInactvCellCb
-(
-RgCellCb *cell
-)
-#else
-Void rgCFGFreeInactvCellCb(cell)
-RgCellCb *cell;
-#endif
+Void rgCFGFreeInactvCellCb(RgCellCb *cell)
{
Inst inst = cell->macInst - RG_INST_START;
/* De-initialize the Ue list */
* File :
*
**********************************************************/
-#ifdef ANSI
-Void rgCFGFreeUeCb
-(
-RgCellCb *cell,
-RgUeCb *ue
-)
-#else
-Void rgCFGFreeUeCb(cell, ue)
-RgCellCb *cell;
-RgUeCb *ue;
-#endif
+Void rgCFGFreeUeCb(RgCellCb *cell,RgUeCb *ue)
{
Inst inst = cell->macInst - RG_INST_START;
* File :
*
**********************************************************/
-#ifdef ANSI
-PRIVATE Void rgCFGFreeCmnLcLst
-(
-RgCellCb *cell
-)
-#else
-PRIVATE Void rgCFGFreeCmnLcLst(cell)
-RgCellCb *cell;
-#endif
+static Void rgCFGFreeCmnLcLst(RgCellCb *cell)
{
rgDBMFreeCmnLcLst(cell);
* File :
*
**********************************************************/
-#ifdef ANSI
-PRIVATE Void rgCFGFreeUeLst
-(
-RgCellCb *cell
-)
-#else
-PRIVATE Void rgCFGFreeUeLst(cell)
-RgCellCb *cell;
-#endif
+static Void rgCFGFreeUeLst(RgCellCb *cell)
{
RgUeCb *ue;
* File :
*
**********************************************************/
-#ifdef ANSI
-PRIVATE Void rgCFGFreeSpsUeLst
-(
-RgCellCb *cell
-)
-#else
-PRIVATE Void rgCFGFreeSpsUeLst(cell)
-RgCellCb *cell;
-#endif
+static Void rgCFGFreeSpsUeLst(RgCellCb *cell)
{
RgUeCb *ue;
* @return S16
* -# ROK
**/
-#ifdef ANSI
-S16 RgSchMacCellRegReq
-(
-Pst* pst,
-RgInfCellReg* regReq
-)
-#else
-S16 RgSchMacCellRegReq(pst, regReq)
-Pst* pst;
-RgInfCellReg* regReq;
-#endif
+S16 RgSchMacCellRegReq(Pst* pst,RgInfCellReg* regReq)
{
Inst inst;
RgCellCb *cell = NULLP;
/*LTE_L2_MEAS_PHASE2*/
S16 rgAddToL2MeasPerQci(RgCellCb *cell,uint8_t qci)
{
- S16 ret = ROK;
- CmLList *lnk;
- RgL2MeasCb *measCb;
- uint16_t idx;
-
- lnk = cell->l2mList.first;
- while(lnk != NULLP )
+ S16 ret = ROK;
+ CmLList *lnk;
+ RgL2MeasCb *measCb;
+ uint16_t idx;
+
+ lnk = cell->l2mList.first;
+ while(lnk != NULLP )
{
measCb = (RgL2MeasCb *)lnk->node;
if(measCb->measReq.measType & LRG_L2MEAS_AVG_PRB_PER_QCI_UL)
{
- for(idx = 0;idx< measCb->measReq.t.prbReq.numQci;idx++)
- {
- if(measCb->measReq.t.prbReq.qci[idx] == qci)
- {
- break; /*exit from for loop*/
- }
- }
- if(idx == measCb->measReq.t.prbReq.numQci)
- {
- cell->qciArray[qci].mask = TRUE;
- measCb->measReq.t.prbReq.qci[measCb->measReq.t.prbReq.numQci++] = qci;
- }
+ for(idx = 0;idx< measCb->measReq.t.prbReq.numQci;idx++)
+ {
+ if(measCb->measReq.t.prbReq.qci[idx] == qci)
+ {
+ break; /*exit from for loop*/
+ }
+ }
+ if(idx == measCb->measReq.t.prbReq.numQci)
+ {
+ cell->qciArray[qci].mask = TRUE;
+ measCb->measReq.t.prbReq.qci[measCb->measReq.t.prbReq.numQci++] = qci;
+ }
}
lnk = lnk->next;
} /* End of While*/
-
-
-
- return (ret);
+
+
+
+ return (ret);
}
Code Review / o-du / l2.git / blobdiff