/* header/extern include files (.x) */
/* header include files (.h) */
-#include "envopt.h" /* environment options */
-#include "envdep.h" /* environment dependent */
-#include "envind.h" /* environment independent */
-#include "gen.h" /* general layer */
-#include "ssi.h" /* system services */
-#include "cm5.h" /* common timers defines */
-#include "cm_hash.h" /* common hash list defines */
-#include "cm_llist.h" /* common linked list defines */
-#include "cm_mblk.h" /* memory management */
-#include "cm_tkns.h" /* common tokens */
-#include "cm_lte.h"
+#include "common_def.h"
#include "crg.h" /* CRG defines */
#include "lrg.h" /* layer management defines for LTE-MAC */
#include "tfu.h"
/* header/extern include files (.x) */
-#include "gen.x" /* general layer typedefs */
-#include "ssi.x" /* system services typedefs */
-#include "cm5.x" /* common timers */
-#include "cm_hash.x" /* common hash list */
-#include "cm_lib.x" /* common library */
-#include "cm_llist.x" /* common linked list */
-#include "cm_mblk.x" /* memory management */
-#include "cm_tkns.x" /* common tokens */
-#include "cm_lte.x"
#include "crg.x" /* CRG types */
#include "lrg.x" /* layer management typedefs for MAC */
#include "tfu.x"
#include "rgu.x"
#include "rg_sch_inf.x"
#include "rg_prg.x" /* PRG interface typedefs*/
-#include "mac_interface.h"
+#include "du_app_mac_inf.h"
#include "rg.x" /* typedefs for MAC */
#include "ss_rbuf.h"
/* forward references */
#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
-PUBLIC S16 rgBatchProc(Void);
+S16 rgBatchProc(Void);
#endif
-PUBLIC U8 rgRguDlSap;
-PUBLIC U8 rgRguUlSap;
+U8 rgRguDlSap;
+U8 rgRguUlSap;
/**
* @brief Handler for Bind request.
*
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgUiRguBndReq
+S16 RgUiRguBndReq
(
Pst *pst,
SuId suId,
SpId spId
)
#else
-PUBLIC S16 RgUiRguBndReq(pst, suId, spId)
+S16 RgUiRguBndReq(pst, suId, spId)
Pst *pst;
SuId suId;
SpId spId;
/*T2K - Passing spId as it is required to access the SAP CB*/
ret = rgUIMRguBndCfm(inst,spId, CM_BND_NOK);
}
- RETVALUE(ret);
+ return (ret);
} /* RgUiRguBndReq */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgUiRguUbndReq
+S16 RgUiRguUbndReq
(
Pst *pst,
SpId spId,
Reason reason
)
#else
-PUBLIC S16 RgUiRguUbndReq(pst, spId, reason)
+S16 RgUiRguUbndReq(pst, spId, reason)
Pst *pst;
SpId spId;
Reason reason;
RGLOGERROR(inst,ERRCLS_INT_PAR, ERG011, (ErrVal)rgCb[inst].rguSap[spId].sapCfg.spId,
"Invalid SAP Id:RgUiRguUbndReq failed\n");
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* RgUiRguUbndReq */
/**
* @brief API for sending bind confirm from MAC to RLC
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgUIMRguBndCfm
+S16 rgUIMRguBndCfm
(
Inst inst,
SpId spId,
U8 status
)
#else
-PUBLIC S16 rgUIMRguBndCfm(inst,spId, status)
+S16 rgUIMRguBndCfm(inst,spId, status)
Inst inst;
SpId spId;
U8 status;
{
RLOG0(L_ERROR,"RgUiRguBndCfm Failed ");
- RETVALUE(ret);
+ return (ret);
}
- RETVALUE(ret);
+ return (ret);
} /* rgUIMRguBndCfm*/
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgUiRguDDatReq
+S16 RgUiRguDDatReq
(
Pst *pst,
SpId spId,
RguDDatReqInfo *datReq
)
#else
-PUBLIC S16 RgUiRguDDatReq(pst, spId, datReq)
+S16 RgUiRguDDatReq(pst, spId, datReq)
Pst *pst;
SpId spId;
RguDDatReqInfo *datReq;
if (datReq == NULLP)
{
RLOG0(L_ERROR,"Input Message Buffer is NULL");
- RETVALUE(RFAILED);
+ return RFAILED;
}
if(rgCb[inst].rguSap[spId].sapCfg.spId == spId)
RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[id3]);
}
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else
RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[id3]);
}
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Update RGU SAP statistics for received sdu count */
ret = rgROMDedDatReq(inst,datReq);
SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,sizeof(RguDDatReqInfo), SS_SHARABLE_MEMORY);
datReq = NULLP;
- RETVALUE(ret);
+ return (ret);
} /* RgUiRguDDatReq */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgUiRguCDatReq
+S16 RgUiRguCDatReq
(
Pst *pst,
SpId spId,
RguCDatReqInfo *datReq
)
#else
-PUBLIC S16 RgUiRguCDatReq(pst, spId, datReq)
+S16 RgUiRguCDatReq(pst, spId, datReq)
Pst *pst;
SpId spId;
RguCDatReqInfo *datReq;
if (datReq == NULLP)
{
RLOG0(L_ERROR,"Input Message Buffer is NULL");
- RETVALUE(RFAILED);
+ return RFAILED;
}
if(rgCb[inst].rguSap[spId].sapCfg.spId == spId)
RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguCDatReq failed",
rgCb[inst].rguSap[spId].sapSta.sapState);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else
#if (ERRCLASS & ERRCLS_ADD_RES)
RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguCDatReq failed ",spId);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
}
ret = SPutStaticBuffer(pst->region, pst->pool,(Data *)datReq,sizeof(RguCDatReqInfo) , SS_SHARABLE_MEMORY);
datReq = NULLP;
- RETVALUE(ret);
+ return (ret);
} /* RgUiRguCDatReq */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgUiRguDStaRsp
+S16 RgUiRguDStaRsp
(
Pst *pst,
SpId spId,
RguDStaRspInfo *staRsp
)
#else
-PUBLIC S16 RgUiRguDStaRsp(pst, spId, staRsp)
+S16 RgUiRguDStaRsp(pst, spId, staRsp)
Pst *pst;
SpId spId;
RguDStaRspInfo *staRsp;
/*stoping Task*/
SStopTask(startTime, PID_MAC_STA_RSP);
- RETVALUE(ret);
+ return (ret);
} /* RgUiRguDStaRsp */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgUiRguCStaRsp
+S16 RgUiRguCStaRsp
(
Pst *pst,
SpId spId,
RguCStaRspInfo *staRsp
)
#else
-PUBLIC S16 RgUiRguCStaRsp(pst, spId, staRsp)
+S16 RgUiRguCStaRsp(pst, spId, staRsp)
Pst *pst;
SpId spId;
RguCStaRspInfo *staRsp;
if (staRsp == NULLP)
{
RLOG0(L_ERROR,"Input Response Buffer is NULL");
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (spId == rgCb[inst].rguSap[spId].sapCfg.spId)
RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguCStaRsp failed",
rgCb[inst].rguSap[spId].sapSta.sapState);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else
#if (ERRCLASS & ERRCLS_ADD_RES)
RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguCStaRsp failed",spId);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
if (ret != ROK)
{
RLOG_ARG0(L_ERROR,DBG_CELLID,staRsp->cellId,"Processing Of Status Response Failed");
- RETVALUE(ret);
+ return (ret);
}
ret = SPutStaticBuffer(pst->region, pst->pool, (Data *)staRsp,sizeof(RguCStaRspInfo) , SS_SHARABLE_MEMORY);
staRsp = NULLP;
- RETVALUE(ret);
+ return (ret);
} /* RgUiRguCStaRsp */
#ifdef LTE_L2_MEAS
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgUiRguL2MUlThrpMeasReq
+S16 RgUiRguL2MUlThrpMeasReq
(
Pst *pst,
SpId spId,
RguL2MUlThrpMeasReqInfo *measReq
)
#else
-PUBLIC S16 RgUiRguL2MUlThrpMeasReq(pst, spId, measReq)
+S16 RgUiRguL2MUlThrpMeasReq(pst, spId, measReq)
Pst *pst;
SpId spId;
RguL2MUlThrpMeasReqInfo *measReq;
if (measReq == NULLP)
{
RLOG0(L_ERROR,"Input Response Buffer is NULL");
- RETVALUE(RFAILED);
+ return RFAILED;
}
if (spId == rgCb[inst].rguSap[spId].sapCfg.spId)
RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguL2MUlThrpMeasReq failed",
rgCb[inst].rguSap[spId].sapSta.sapState);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else
#if (ERRCLASS & ERRCLS_ADD_RES)
RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguL2MUlThrpMeasReq failed",spId);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
SPutStaticBuffer(pst->region, pst->pool, (Data *)measReq,sizeof(RguL2MUlThrpMeasReqInfo) , SS_SHARABLE_MEMORY);
measReq= NULLP;
- RETVALUE(ret);
+ return (ret);
} /* RgUiRguL2MUlThrpMeasReq */
#endif
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgUIMSndDedStaInd
+S16 rgUIMSndDedStaInd
(
Inst inst,
RgUpSapCb *rguSap,
RgRguDedStaInd *staInd
)
#else
-PUBLIC S16 rgUIMSndDedStaInd(inst,rguSap,staInd)
+S16 rgUIMSndDedStaInd(inst,rguSap,staInd)
Inst inst;
RgUpSapCb *rguSap;
RgRguDedStaInd *staInd;
if (ret != ROK)
{
RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"RgUiRguDStaInd Failed");
- RETVALUE(ret);
+ return (ret);
}
- RETVALUE(ret);
+ return (ret);
} /* rgUIMSndDedStaInd */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgUIMSndCmnStaInd
+S16 rgUIMSndCmnStaInd
(
Inst inst,
RgUpSapCb *rguDlSap,
RgRguCmnStaInd *staInd
)
#else
-PUBLIC S16 rgUIMSndCmnStaInd(inst,rguDlSap,staInd)
+S16 rgUIMSndCmnStaInd(inst,rguDlSap,staInd)
Inst inst,
RgUpSapCb *rguDlSap,
RgRguCmnStaInd *staInd;
if (ret != ROK)
{
RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"RgUiRguCStaInd Failed");
- RETVALUE(ret);
+ return (ret);
}
- RETVALUE(ret);
+ return (ret);
} /* rgUIMSndCmnStaInd */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgUIMSndDedDatInd
+S16 rgUIMSndDedDatInd
(
Inst inst,
RgUpSapCb *rguUlSap,
RgRguDedDatInd *datInd
)
#else
-PUBLIC S16 rgUIMSndDedDatInd(datInd)
+S16 rgUIMSndDedDatInd(datInd)
Inst inst;
RgUpSapCb *rguUlSap;
RgRguDedDatInd *datInd;
if (ret != ROK)
{
RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"RgUiRguDdatInd Failed");
- RETVALUE(ret);
+ return (ret);
}
#else
SRngIncrWIndx(SS_RNG_BUF_ULMAC_TO_ULRLC);
SsRngInfoTbl[SS_RNG_BUF_ULMAC_TO_ULRLC].pktRate++;
#endif
- RETVALUE(ret);
+ return (ret);
} /* rgUIMSndDedDatInd */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgUIMSndCmnDatInd
+S16 rgUIMSndCmnDatInd
(
Inst inst,
RgUpSapCb *rguUlSap,
RgRguCmnDatInd *datInd
)
#else
-PUBLIC S16 rgUIMSndCmnDatInd(datInd)
+S16 rgUIMSndCmnDatInd(datInd)
Inst inst;
RgUpSapCb *rguUlSap;
RgRguCmnDatInd *datInd;
{
RGDBGERRNEW(inst,(rgPBuf(inst),"RgUiRguCDatInd Failed\n"));
RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"RgUiRguCDatInd Failed");
- RETVALUE(ret);
+ return (ret);
}
- RETVALUE(ret);
+ return (ret);
} /* rgUIMSndCmnDatInd */
/**
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgUiCrgBndReq
+S16 RgUiCrgBndReq
(
Pst *pst,
SuId suId,
SpId spId
)
#else
-PUBLIC S16 RgUiCrgBndReq(pst, suId, spId)
+S16 RgUiCrgBndReq(pst, suId, spId)
Pst *pst;
SuId suId;
SpId spId;
#endif
ret = rgUIMCrgBndCfm(inst,suId, CM_BND_NOK);
}
- RETVALUE(ret);
+ return (ret);
} /* RgUiCrgBndReq */
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgUiCrgUbndReq
+S16 RgUiCrgUbndReq
(
Pst *pst,
SpId spId,
Reason reason
)
#else
-PUBLIC S16 RgUiCrgUbndReq(pst, spId, reason)
+S16 RgUiCrgUbndReq(pst, spId, reason)
Pst *pst;
SpId spId;
Reason reason;
RLOG1(L_ERROR,"Invalid SAP State:%d RgUiCrgUbndReq failed",
rgCb[inst].crgSap.sapSta.sapState);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else
RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiCrgUbndReq failed",
rgCb[inst].crgSap.sapCfg.spId);
#endif
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* RgUiCrgUbndReq */
/**
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgUIMCrgBndCfm
+S16 rgUIMCrgBndCfm
(
Inst inst,
SuId suId,
U8 status
)
#else
-PUBLIC S16 rgUIMCrgBndCfm(inst,suId, status)
+S16 rgUIMCrgBndCfm(inst,suId, status)
Inst inst;
SuId suId;
U8 status;
if(RgUiCrgBndCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, status) != ROK)
{
RLOG0(L_ERROR,"RgUiCrgBndCfm Failed ");
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* rgUIMCrgBndCfm*/
/**
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 RgUiCrgCfgReq
+S16 RgUiCrgCfgReq
(
Pst *pst,
SpId spId,
CrgCfgReqInfo *cfgReqInfo
)
#else
-PUBLIC S16 RgUiCrgCfgReq(pst, spId, transId, cfgReqInfo)
+S16 RgUiCrgCfgReq(pst, spId, transId, cfgReqInfo)
Pst *pst;
SpId spId;
CrgCfgTransId transId;
{
RLOG0(L_ERROR,"Input Param crgReqInfo is NULL ");
rgUIMCrgCfgCfm(inst,transId, cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
/* Upper SAP Id and State validation */
cfgReqInfo = NULLP;
rgUIMCrgCfgCfm(inst,transId, cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
}
else
sizeof(CrgCfgReqInfo));
cfgReqInfo = NULLP;
rgUIMCrgCfgCfm(inst,transId, cfmStatus);
- RETVALUE(RFAILED);
+ return RFAILED;
}
ret = rgCOMCfgReq(inst,transId, cfgReqInfo);
SPutSBuf (pst->region, pst->pool, (Data *)cfgReqInfo,
if (ret != ROK)
{
RLOG0(L_ERROR,"Configuration Request Handling Failed ");
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
} /* RgUiCrgCfgReq */
/**
* -# RFAILED
**/
#ifdef ANSI
-PUBLIC S16 rgUIMCrgCfgCfm
+S16 rgUIMCrgCfgCfm
(
Inst inst,
CrgCfgTransId transId,
U8 status
)
#else
-PUBLIC S16 rgUIMCrgCfgCfm(inst,transId, status)
+S16 rgUIMCrgCfgCfm(inst,transId, status)
Inst inst;
CrgCfgTransId transId;
U8 status;
if (ret != ROK)
{
RLOG0(L_ERROR,"RgUiCrgCfgCfm Failed ");
- RETVALUE(ret);
+ return (ret);
}
- RETVALUE(ret);
+ return (ret);
} /* rgUIMCrgCfgCfm */
#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
#ifdef ANSI
-PUBLIC S16 rgBatchProc
+S16 rgBatchProc
(
Void
)
#else
-PUBLIC S16 rgBatchProc()
+S16 rgBatchProc()
Void;
#endif
{
/* Fill pst */
pst.srcProcId = 1;
pst.dstProcId = 1;
- pst.dstEnt = ENTRG;
+ pst.dstEnt = ENTMAC;
pst.dstInst = 0;
- pst.srcEnt = ENTKW;
+ pst.srcEnt = ENTRLC;
pst.srcInst = 1;
pst.prior = PRIOR0;
pst.route = RTESPEC;
if((elmIndx = (U32)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC)) == NULLP)
break;
}
- RETVALUE(ROK);
+ return ROK;
}
#endif