static int RLOG_FILE_ID=179;
/* header include files (.h) */
-#include "envopt.h" /* environment options */
-#include "envdep.h" /* environment dependent */
-#include "envind.h" /* environment independent */
-
-#include "gen.h" /* general */
-#include "ssi.h" /* system services */
-#include "cm_tkns.h" /* Common Token Defines */
-#include "cm_llist.h" /* Common Link List Defines */
-#include "cm_hash.h" /* Common Hash List Defines */
-#include "cm_mblk.h" /* common memory link list library */
-#include "cm_lte.h" /* Common LTE */
-
+#include "common_def.h"
#include "rg_env.h" /* MAC Environment Defines */
#include "crg.h" /* CRG Interface defines */
#include "rgu.h" /* RGU Interface defines */
#include "rg_err.h" /* MAC error defines */
/* header/extern include files (.x) */
-#include "gen.x" /* general */
-#include "ssi.x" /* system services */
#include "cm5.x" /* Timer */
-#include "cm_tkns.x" /* Common Token Definitions */
-#include "cm_llist.x" /* Common Link List Definitions */
-#include "cm_lib.x" /* Common Library Definitions */
-#include "cm_hash.x" /* Common Hash List Definitions */
-#include "cm_mblk.x" /* common memory link list library */
-#include "cm_lte.x" /* Common LTE */
#include "crg.x" /* CRG Interface includes */
#include "rgu.x" /* RGU Interface includes */
#include "lrg.x" /* LRG Interface includes */
#include "rg_prg.x" /* PRG(MAC-MAC) Interface includes */
+#include "du_app_mac_inf.h"
#include "rg.x" /* MAC includes */
/* local defines */
RgInfRlsRnti *rlsRnti
));
-PUBLIC S16 rgDelUeFrmAllSCell ARGS((
+S16 rgDelUeFrmAllSCell ARGS((
RgCellCb *cell,
RgUeCb *ue
));
*
**********************************************************/
#ifdef ANSI
-PUBLIC S16 rgAllocShrablSBuf
+S16 rgAllocShrablSBuf
(
Inst inst,
Data **pData, /* Pointer of the data to be returned */
Size size /* size */
)
#else
-PUBLIC S16 rgAllocShrablSBuf(inst,pData, size)
+S16 rgAllocShrablSBuf(inst,pData, size)
Inst inst;
Data **pData; /* Pointer of the data to be returned */
Size size; /* size */
if (size == 0)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* allocate buffer */
rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_SMEM_ALLOC_FAIL,
LCM_CAUSE_MEM_ALLOC_FAIL, &dgn);
RGLOGERROR(inst,ERRCLS_DEBUG, ERG028, 0, "Unable to Allocate Buffer");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#ifndef ALIGN_64BIT
/* zero out the allocated memory */
cmMemset((U8 *)*pData, 0x00, size);
- RETVALUE(ROK);
+ return ROK;
} /* end of rgAllocSBuf */
*
**********************************************************/
#ifdef ANSI
-PUBLIC S16 rgAllocSBuf
+S16 rgAllocSBuf
(
Inst inst,
Data **pData, /* Pointer of the data to be returned */
Size size /* size */
)
#else
-PUBLIC S16 rgAllocSBuf(inst,pData, size)
+S16 rgAllocSBuf(inst,pData, size)
Inst inst;
Data **pData; /* Pointer of the data to be returned */
Size size; /* size */
if (size == 0)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* allocate buffer */
rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_SMEM_ALLOC_FAIL,
LCM_CAUSE_MEM_ALLOC_FAIL, &dgn);
RGLOGERROR(inst,ERRCLS_DEBUG, ERG028, 0, "Unable to Allocate Buffer");
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* zero out the allocated memory */
cmMemset((U8 *)*pData, 0x00, size);
- RETVALUE(ROK);
+ return ROK;
} /* end of rgAllocSBuf */
* File: rg_utl.c
*/
#ifdef ANSI
-PUBLIC Void rgFreeSharableSBuf
+Void rgFreeSharableSBuf
(
Inst inst,
Data **data, /* address of pointer to data */
Size size /* size */
)
#else
-PUBLIC Void rgFreeSharableSBuf(inst,data, size)
+Void rgFreeSharableSBuf(inst,data, size)
Inst inst;
Data **data; /* address of pointer to data */
Size size; /* size */
* File: rg_utl.c
*/
#ifdef ANSI
-PUBLIC Void rgFreeSBuf
+Void rgFreeSBuf
(
Inst inst,
Data **data, /* address of pointer to data */
Size size /* size */
)
#else
-PUBLIC Void rgFreeSBuf(inst,data, size)
+Void rgFreeSBuf(inst,data, size)
Inst inst;
Data **data; /* address of pointer to data */
Size size; /* size */
*
**********************************************************/
#ifdef ANSI
-PUBLIC S16 rgGetMsg
+S16 rgGetMsg
(
Inst inst,
Buffer **mBuf /* Message Buffer pointer be returned */
)
#else
-PUBLIC S16 rgGetMsg(inst,mBuf)
+S16 rgGetMsg(inst,mBuf)
Inst inst;
Buffer **mBuf; /* Message Buffer pointer be returned */
#endif
rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_DMEM_ALLOC_FAIL,
LCM_CAUSE_MEM_ALLOC_FAIL, &dgn);
RGLOGERROR(inst,ERRCLS_DEBUG, ERG030, 0, "Unable to Allocate Buffer");
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* end of rgGetMsg */
*
**********************************************************/
#ifdef ANSI
-PUBLIC Void rgFillDgnParams
+Void rgFillDgnParams
(
Inst inst,
RgUstaDgn *dgn,
U8 dgnType
)
#else
-PUBLIC Void rgFillDgnParams(inst,dgn, dgnType)
+Void rgFillDgnParams(inst,dgn, dgnType)
Inst inst;
RgUstaDgn *dgn;
U8 dgnType;
*
**********************************************************/
#ifdef ANSI
-PUBLIC Void rgUpdtRguDedSts
+Void rgUpdtRguDedSts
(
Inst inst,
RgUpSapCb *rguDlSap,
RgRguDedDatReq *datReq /* DatReq pointer */
)
#else
-PUBLIC Void rgUpdtRguDedSts(inst,rguDlSap,stsType, datReq)
+Void rgUpdtRguDedSts(inst,rguDlSap,stsType, datReq)
Inst inst;
RgUpSapCb *rguDlSap;
U8 stsType; /* Statistics type to update */
*
**********************************************************/
#ifdef ANSI
-PUBLIC Void rgUpdtRguCmnSts
+Void rgUpdtRguCmnSts
(
Inst inst,
RgUpSapCb *rguDlSap,
U8 stsType /* Statistics type to update */
)
#else
-PUBLIC Void rgUpdtRguCmnSts(inst,rguDlSap,stsType)
+Void rgUpdtRguCmnSts(inst,rguDlSap,stsType)
Inst inst;
RgUpSapCb *rguDlSap;
U8 stsType; /* Statistics type to update */
*
**********************************************************/
#ifdef ANSI
-PUBLIC Void rgUpdtCellCnt
+Void rgUpdtCellCnt
(
Inst inst,
U8 updtType
)
#else
-PUBLIC Void rgUpdtCellCnt(inst,updtType)
+Void rgUpdtCellCnt(inst,updtType)
Inst inst;
U8 updtType;
#endif
*
**********************************************************/
#ifdef ANSI
-PUBLIC Void rgUpdtUeCnt
+Void rgUpdtUeCnt
(
Inst inst,
U8 updtType
)
#else
-PUBLIC Void rgUpdtUeCnt (inst,updtType)
+Void rgUpdtUeCnt (inst,updtType)
Inst inst;
U8 updtType;
#endif
*
*/
#ifdef ANSI
-PUBLIC S16 rgAllocEventMem
+S16 rgAllocEventMem
(
Inst inst,
Ptr *memPtr,
Size memSize
)
#else
-PUBLIC S16 rgAllocEventMem(inst,memPtr, memSize)
+S16 rgAllocEventMem(inst,memPtr, memSize)
Inst inst;
Ptr *memPtr;
Size memSize;
{
RGLOGERROR(inst,ERRCLS_INT_PAR, ERG031, memSize,
"rgAllocEventMem(): memSize invalid\n");
- RETVALUE (RFAILED);
+ return (RFAILED);
}
#endif /* ERRCLASS & ERRCLS_DEBUG */
#endif /* */
{
RLOG0(L_ERROR,"cmAllocEvnt Failed");
- RETVALUE(RFAILED);
+ return RFAILED;
}
/*stoping Task*/
SStopTask(startTime, PID_MACUTL_CMALLCEVT);
- RETVALUE(ROK);
+ return ROK;
} /* end of rgAllocEventMem*/
/*
*
*/
#ifdef ANSI
-PUBLIC S16 rgGetEventMem
+S16 rgGetEventMem
(
Inst inst,
Ptr *ptr,
Ptr memCp
)
#else
-PUBLIC S16 rgGetEventMem(inst,ptr, len, memCp)
+S16 rgGetEventMem(inst,ptr, len, memCp)
Inst inst;
Ptr *ptr;
Size len;
#else
ret = cmGetMem(memCp, len, (Ptr *)ptr);
#endif /* */
- RETVALUE(ret);
+ return (ret);
} /* end of rgGetEventMem*/
/***********************************************************
*
**********************************************************/
#ifdef ANSI
-PUBLIC Void rgGetPstToInst
+Void rgGetPstToInst
(
Pst *pst,
Inst srcInst,
Inst dstInst
)
#else
-PUBLIC Void rgGetPstToInst (pst, srcInst, dstInst)
+Void rgGetPstToInst (pst, srcInst, dstInst)
Pst *pst;
Inst srcInst;
Inst dstInst;
*
**********************************************************/
#ifdef ANSI
-PUBLIC S16 RgSchMacLcgRegReq
+S16 RgSchMacLcgRegReq
(
Pst *pst,
RgInfLcgRegReq *lcgRegReq
)
#else
-PUBLIC S16 RgSchMacLcgRegReq (pst, lcgRegReq)
+S16 RgSchMacLcgRegReq (pst, lcgRegReq)
Pst *pst;
RgInfLcgRegReq *lcgRegReq;
#endif
{
RLOG_ARG0(L_ERROR,DBG_CELLID,lcgRegReq->cellId,"Cell does not exist ");
- RETVALUE(RFAILED);
+ return RFAILED;
}
if ((ue = rgDBMGetUeCb(cell, lcgRegReq->crnti)) == NULLP)
{
RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist",
lcgRegReq->crnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
ue->ul.lcgArr[lcgRegReq->lcgId].isGbr = lcgRegReq->isGbr;
- RETVALUE(ROK);
+ return ROK;
} /* end of RgSchMacLcgRegReq */
#ifdef LTEMAC_SPS
*
**********************************************************/
#ifdef ANSI
-PUBLIC S16 RgSchMacUlSpsResetReq
+S16 RgSchMacUlSpsResetReq
(
Pst *pst,
RgInfUlSpsReset *ulSpsResetInfo
)
#else
-PUBLIC S16 RgSchMacUlSpsResetReq (pst, lcInfo)
+S16 RgSchMacUlSpsResetReq (pst, lcInfo)
Pst *pst;
RgInfUlSpsReset *ulSpsResetInfo;
#endif
{
RLOG_ARG0(L_ERROR, DBG_CELLID,ulSpsResetInfo->cellId,"Cell does not exist ");
- RETVALUE(RFAILED);
+ return RFAILED;
}
if ((ue = rgDBMGetUeCb(cell, ulSpsResetInfo->crnti)) == NULLP)
{
RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist",
ulSpsResetInfo->crnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
ue->ul.implRelCntr = 0;
ue->ul.explRelCntr = 0;
- RETVALUE(ROK);
+ return ROK;
} /* end of RgSchMacUlSpsResetReq */
*
**********************************************************/
#ifdef ANSI
-PUBLIC S16 RgSchMacSpsLcRegReq
+S16 RgSchMacSpsLcRegReq
(
Pst *pst,
RgInfSpsLcInfo *lcInfo
)
#else
-PUBLIC S16 RgSchMacSpsLcRegReq (pst, lcInfo)
+S16 RgSchMacSpsLcRegReq (pst, lcInfo)
Pst *pst;
RgInfSpsLcInfo *lcInfo;
#endif
{
RLOG_ARG0(L_ERROR,DBG_CELLID,lcInfo->cellId, "Cell does not exist ");
- RETVALUE(RFAILED);
+ return RFAILED;
}
if ((ue = rgDBMGetUeCb(cell, lcInfo->crnti)) == NULLP)
{
RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist",
lcInfo->crnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Store the sps-rnti and SPS LC information in the UE */
{
RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
"Ue insertion into SPS list failed SPS CRNTI:%d", ue->spsRnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* end of RgSchMacSpsLcRegReq */
*
**********************************************************/
#ifdef ANSI
-PUBLIC S16 RgSchMacSpsLcDeregReq
+S16 RgSchMacSpsLcDeregReq
(
Pst *pst,
CmLteCellId cellId,
CmLteRnti crnti
)
#else
-PUBLIC S16 RgSchMacSpsLcDeregReq (pst, cellId, crnti)
+S16 RgSchMacSpsLcDeregReq (pst, cellId, crnti)
Pst *pst;
CmLteCellId cellId;
CmLteRnti crnti;
{
RLOG_ARG0(L_ERROR,DBG_CELLID,cellId, "Cell does not exist ");
- RETVALUE(RFAILED);
+ return RFAILED;
}
if ((ue = rgDBMGetUeCb(cell, crnti)) == NULLP)
{
RLOG_ARG1(L_ERROR, DBG_CELLID,cellId,"CRNTI:%d Ue does not exist", crnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* No need to reset the SPS LC Ids as they will not be looked at*/
/* Delete UE from the SPS UE List */
rgDBMDelSpsUeCb(cell, ue);
- RETVALUE(ROK);
+ return ROK;
} /* end of RgSchMacSpsLcDeregReq */
#endif /* LTEMAC_SPS */
RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId,
"RNTI:%d Failed to get UECB[%lu:%lu] or NEW RNTI:%d",
rnti, ((PTR)ue), ((PTR)newUe), newRnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
#ifdef XEON_SPECIFIC_CHANGES
CM_LOG_DEBUG(CM_LOG_ID_MAC, "MAC:UE[%d] id changed to %d\n", rnti, newRnti);
rgDBMDelUeCbFromRachLst(cell, newUe);
rgFreeSBuf(inst,(Data **)&newUe, sizeof(*newUe));
- RETVALUE(ROK);
+ return ROK;
} /* end of rgUtlHndlCrntiChng */
#ifdef LTE_ADV
* @return ROK is SUCCESS
**/
#ifdef ANSI
-PUBLIC S16 rgDelUeFrmAllSCell
+S16 rgDelUeFrmAllSCell
(
RgCellCb *cell,
RgUeCb *ue
)
#else
-PUBLIC S16 rgDelUeFrmAllSCell(cell, ue)
+S16 rgDelUeFrmAllSCell(cell, ue)
RgCellCb *cell;
RgUeCb *ue;
#endif
} /* loop of if */
} /* loop of for */
- RETVALUE(ROK);
+ return ROK;
} /* rgDelUeFrmAllSCell */
/**
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 rgUtlVltdAddSCellCfg
+S16 rgUtlVltdAddSCellCfg
(
RgPrgUeSCellCfgInfo *ueSCellCb,
RgCellCb *cell,
Inst inst
)
#else
-PUBLIC S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst)
+S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst)
RgPrgUeSCellCfgInfo *ueSCellCb;
RgCellCb *cell;
Inst inst;
ret = RFAILED;
}
#endif
- RETVALUE(ret);
+ return (ret);
} /* rgUtlVltdAddSCellCfg */
/**
{
RGDBGERRNEW(inst,(rgPBuf(inst),"[%d]RNTI:Failed to get ueCb \
newRnti=%d\n", rnti, newRnti));
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* For all added SCells, prepare and send ueIdChngReq */
for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++)
} /* loop of if */
} /* loop of for */
- RETVALUE(ROK);
+ return ROK;
} /* rgUtlSndCrntiChngReq2AllSMacs */
#endif /* LTE_ADV */
* -# ROK
**/
#ifdef ANSI
-PUBLIC S16 RgSchMacRlsRntiReq
+S16 RgSchMacRlsRntiReq
(
Pst *pst,
RgInfRlsRnti *rlsRnti
)
#else
-PUBLIC S16 RgSchMacRlsRntiReq(pst, rlsRnti)
+S16 RgSchMacRlsRntiReq(pst, rlsRnti)
Pst *pst;
RgInfRlsRnti *rlsRnti;
#endif
{
- Pst schPst;
- RgInfUeDelInd ueDelInd;
+// Pst schPst;
+// RgInfUeDelInd ueDelInd;
Inst macInst;
RgCellCb *cell;
#ifdef L2_OPTMZ
if(NULLP == rlsRnti)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
if((cell == NULLP) ||
RLOG_ARG1(L_ERROR,DBG_CELLID,rlsRnti->cellId,
"No cellCb found with cellId for RNTI:%d",
rlsRnti->rnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Fix : syed Clearing UE context when SCH indicates to do so
* UE DEL from CRG interface is now dummy. */
RLOG_ARG2(L_ERROR,DBG_CELLID,rlsRnti->cellId,
"CRNTI change failed for RNTI:%d new RNTI:%d",
rlsRnti->rnti,rlsRnti->newRnti);
- RETVALUE(RFAILED);
+ return RFAILED;
}
#ifdef LTE_ADV
if(rgUtlSndCrntiChngReq2AllSMacs(cell, rlsRnti->rnti, rlsRnti->newRnti) != ROK)
{
/* TODO: do we need to send DelInd to SCH in failure case*/
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
#ifdef L2_OPTMZ
if(FALSE == rlsRnti->isUeSCellDel)
#endif
{
+ //TODO: commented for compilation without SCH
+#if 0
ueDelInd.cellSapId = cell->schInstMap.cellSapId;
ueDelInd.cellId = rlsRnti->cellId;
ueDelInd.rnti = rlsRnti->rnti;
rgGetPstToInst(&schPst,macInst, cell->schInstMap.schInst);
RgMacSchUeDel(&schPst, &ueDelInd);
+#endif
}
- RETVALUE(ROK);
+ return ROK;
} /* end of RgSchMacRlsRntiReq */
#ifdef L2_OPTMZ
#ifdef ANSI
-PUBLIC Bool RgUtlIsTbMuxed
+Bool RgUtlIsTbMuxed
(
TfuDatReqTbInfo *tb
)
#else
-PUBLIC Bool RgUtlIsTbMuxed()
+Bool RgUtlIsTbMuxed()
TfuDatReqTbInfo *tb
#endif
{
MsgLen len = 0;
SFndLenMsg(tb->macHdr, &len);
- RETVALUE(len?TRUE : FALSE);
+ return (len?TRUE : FALSE);
}
#endif
Code Review / o-du / l2.git / blobdiff