X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_uim.c;h=9dccc593b29556048e54c7f11a0cd98188c77576;hb=f78bb742344bb919e27f38c2d7bc2d11fc37b184;hp=e99696c60c666384f53ed8ff3a8e3ae47985e7f6;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_uim.c b/src/5gnrmac/rg_uim.c index e99696c60..9dccc593b 100755 --- a/src/5gnrmac/rg_uim.c +++ b/src/5gnrmac/rg_uim.c @@ -33,9 +33,6 @@ manages Pst and Sap related information for upper interface APIs. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -static int RLOG_FILE_ID=178; /* header include files -- defines (.h) */ @@ -50,6 +47,7 @@ static int RLOG_FILE_ID=178; #include "rg_env.h" /* customizable defines and macros for MAC */ #include "rg.h" /* defines and macros for MAC */ #include "rg_err.h" /* RG error defines */ +#include "mac_utils.h" /* header/extern include files (.x) */ @@ -73,11 +71,8 @@ static int RLOG_FILE_ID=178; /* forward references */ -#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) -PUBLIC S16 rgBatchProc(Void); -#endif -PUBLIC U8 rgRguDlSap; -PUBLIC U8 rgRguUlSap; +uint8_t rgRguDlSap; +uint8_t rgRguUlSap; /** * @brief Handler for Bind request. * @@ -95,28 +90,18 @@ PUBLIC U8 rgRguUlSap; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiRguBndReq +S16 RgUiRguBndReq ( Pst *pst, SuId suId, SpId spId ) -#else -PUBLIC S16 RgUiRguBndReq(pst, suId, spId) -Pst *pst; -SuId suId; -SpId spId; -#endif { Inst inst; S16 ret = ROK; Pst tmpPst; /* Temporary Post Structure */ RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC3(RgUiRguBndReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -139,15 +124,14 @@ SpId spId; switch (rgCb[inst].rguSap[spId].sapSta.sapState) { case LRG_NOT_CFG: /* SAP Not configured */ - RGDBGINFO(inst,(rgPBuf(inst), "SAP Not Configured\n")); rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM); ret = rgLMMStaInd(inst,LCM_CATEGORY_INTERFACE,LRG_NOT_CFG, LCM_CAUSE_INV_SAP, &dgn); - RLOG0(L_DEBUG,"SAP Not Configured"); + DU_LOG("\nDEBUG --> MAC : SAP Not Configured"); ret = RgUiRguBndCfm(&tmpPst, suId, CM_BND_NOK); break; case LRG_UNBND: /* SAP is not bound */ - RLOG0(L_DEBUG,"SAP Not yet bound"); + DU_LOG("\nDEBUG --> MAC : SAP Not yet bound"); rgCb[inst].rguSap[spId].sapSta.sapState = LRG_BND; rgCb[inst].rguSap[spId].sapCfg.suId = suId; /* Send Bind Confirm with status as SUCCESS */ @@ -159,14 +143,13 @@ SpId spId; LCM_CAUSE_UNKNOWN, &dgn); break; case LRG_BND: /* SAP is already bound*/ - RLOG0(L_DEBUG,"SAP already bound"); + DU_LOG("\nDEBUG --> MAC : SAP already bound"); /*T2K - Passing spId as it is required to access the SAP CB*/ ret = rgUIMRguBndCfm(inst,spId, CM_BND_OK); break; default: /* Should Never Enter here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RGLOGERROR(inst,ERRCLS_INT_PAR, ERG008, (ErrVal)rgCb[inst].rguSap[spId].sapSta.sapState, - "Invalid SAP State:RgUiRguBndReq failed\n"); + DU_LOG("\nERROR --> MAC : Invalid SAP State:RgUiRguBndReq failed\n"); #endif /*T2K - Passing spId as it is required to access the SAP CB*/ ret = rgUIMRguBndCfm(inst,spId, CM_BND_NOK); @@ -176,8 +159,7 @@ SpId spId; else { #if (ERRCLASS & ERRCLS_ADD_RES) - RGLOGERROR(inst,ERRCLS_INT_PAR, ERG009, (ErrVal)rgCb[inst].rguSap[spId].sapCfg.spId, - "Invalid SAP Id:RgUiRguBndReq failed\n"); + DU_LOG("\nERROR --> MAC : Invalid SAP Id:RgUiRguBndReq failed\n"); #endif /*T2K - Passing spId as it is required to access the SAP CB*/ ret = rgUIMRguBndCfm(inst,spId, CM_BND_NOK); @@ -203,23 +185,14 @@ SpId spId; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiRguUbndReq +S16 RgUiRguUbndReq ( Pst *pst, SpId spId, Reason reason ) -#else -PUBLIC S16 RgUiRguUbndReq(pst, spId, reason) -Pst *pst; -SpId spId; -Reason reason; -#endif { Inst inst; - TRC3(RgUiRguUbndReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -229,13 +202,13 @@ Reason reason; switch(rgCb[inst].rguSap[spId].sapSta.sapState) { case LRG_BND: /* SAP is already bound*/ - RLOG0(L_DEBUG,"SAP already bound"); + DU_LOG("\nDEBUG --> MAC : SAP already bound"); /* setting SAP state to UN BOUND */ rgCb[inst].rguSap[spId].sapSta.sapState = LRG_UNBND; break; default: #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguUbndReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiRguUbndReq failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif @@ -245,8 +218,7 @@ Reason reason; else { #if (ERRCLASS & ERRCLS_ADD_RES) - RGLOGERROR(inst,ERRCLS_INT_PAR, ERG011, (ErrVal)rgCb[inst].rguSap[spId].sapCfg.spId, - "Invalid SAP Id:RgUiRguUbndReq failed\n"); + DU_LOG("\nERROR --> MAC : Invalid SAP Id:RgUiRguUbndReq failed\n"); #endif return RFAILED; } @@ -265,394 +237,26 @@ Reason reason; * * @param[in] Inst inst * @param[in] SuId suId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMRguBndCfm -( -Inst inst, -SpId spId, -U8 status -) -#else -PUBLIC S16 rgUIMRguBndCfm(inst,spId, status) -Inst inst; -SpId spId; -U8 status; -#endif +S16 rgUIMRguBndCfm(Inst inst,SpId spId,uint8_t status) { S16 ret = ROK; - TRC2(rgUIMRguBndCfm) - - ret = RgUiRguBndCfm(&rgCb[inst].rguSap[spId].sapCfg.sapPst, rgCb[inst].rguSap[spId].sapCfg.suId, status); if (ret != ROK) { - RLOG0(L_ERROR,"RgUiRguBndCfm Failed "); + DU_LOG("\nERROR --> MAC : RgUiRguBndCfm Failed "); return (ret); } return (ret); } /* rgUIMRguBndCfm*/ - -/** - * @brief Handler for dedicated DatReq from RGU - * - * @details - * - * Function : RgUiRguDDatReq - * - * This function validates SAP and invokes ROM for further processing - * - * @param[in] Pst *pst - * @param[in] SpId spId - * @param[in] RguDDatReqInfo *datReq - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -PUBLIC S16 RgUiRguDDatReq -( -Pst *pst, -SpId spId, -RguDDatReqInfo *datReq -) -#else -PUBLIC S16 RgUiRguDDatReq(pst, spId, datReq) -Pst *pst; -SpId spId; -RguDDatReqInfo *datReq; -#endif -{ - S16 ret = ROK; - Inst inst; -#ifndef NO_ERRCLS - U32 id; - U32 id1; - U32 id2; - U32 id3; -#endif - - TRC3(RgUiRguDDatReq) - - - RG_IS_INST_VALID(pst->dstInst); - inst = pst->dstInst - RG_INST_START; -#ifndef NO_ERRCLS - if (datReq == NULLP) - { - RLOG0(L_ERROR,"Input Message Buffer is NULL"); - return RFAILED; - } - - if(rgCb[inst].rguSap[spId].sapCfg.spId == spId) - { - switch (rgCb[inst].rguSap[spId].sapSta.sapState) - { - case LRG_BND: /* SAP is bound */ - RLOG0(L_DEBUG,"SAP is already bound"); - break; - default: /* Should never reach here */ -#if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguDDatReq failed", - rgCb[inst].rguSap[spId].sapSta.sapState); -#endif -#ifndef L2_OPTMZ - for(id3 = 0; id3 < datReq->nmbOfUeGrantPerTti; id3++) - { - RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[id3]); - } -#endif - return RFAILED; - } - } - else - { -#if (ERRCLASS & ERRCLS_ADD_RES) - RGLOGERROR(inst,ERRCLS_INT_PAR, ERG013, (ErrVal)spId, - "Invalid SAP Id:RgUiRguDDatReq failed\n"); -#endif -#ifndef L2_OPTMZ - for(id3 = 0; id3 < datReq->nmbOfUeGrantPerTti; id3++) - { - RG_DROP_RGUDDATREQ_MBUF(datReq->datReq[id3]); - } -#endif - return RFAILED; - } - - /* Update RGU SAP statistics for received sdu count */ - /*ccpu00118201 - ADD - Send trace only when its enabled*/ - if(rgCb[inst].rgInit.trc) - { - for(id3 = 0; id3 < datReq->nmbOfUeGrantPerTti; id3++) - { - RguDDatReqPerUe *datReqPerUe = &datReq->datReq[id3]; - for (id = 0; id < datReqPerUe->nmbOfTbs; id++) - { - for (id1 = 0; id1 < datReqPerUe->datReqTb[id].nmbLch; id1++) - { - /* rgCb.rguSap.sapSts.numPduRcvd is updated by - * rgROMDedDatReq -> rgUpdtRguDedSts function - * So numPduRcvd updation is commented here */ - /* rgCb.rguSap.sapSts.numPduRcvd += - datReq->datReqTb[id].lchData[id1].pdu.numPdu; */ - for (id2 = 0; id2 < datReqPerUe->datReqTb[id].lchData[id1].pdu.numPdu; id2++) - { - RG_SEND_TRC_IND(inst,datReqPerUe->datReqTb[id]. - lchData[id1].pdu.mBuf[id2], EVTRGUDDATREQ); - } - } - } - } - } -#endif - - /* Call Ownership module for further processing */ - ret = rgROMDedDatReq(inst,datReq); - SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,sizeof(RguDDatReqInfo), SS_SHARABLE_MEMORY); - datReq = NULLP; - return (ret); -} /* RgUiRguDDatReq */ - - -/** - * @brief Handler for common DatReq from RGU - * - * @details - * - * Function : RgUiRguCDatReq - * - * This function validates SAP invokes ROM for further processing - * - * @param[in] Pst *pst - * @param[in] SpId spId - * @param[in] RguCDatReqInfo *datReq - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -PUBLIC S16 RgUiRguCDatReq -( -Pst *pst, -SpId spId, -RguCDatReqInfo *datReq -) -#else -PUBLIC S16 RgUiRguCDatReq(pst, spId, datReq) -Pst *pst; -SpId spId; -RguCDatReqInfo *datReq; -#endif -{ - Inst inst; - S16 ret = ROK; - - TRC3(RgUiRguCDatReq) - - - RG_IS_INST_VALID(pst->dstInst); - inst = pst->dstInst - RG_INST_START; -#ifndef NO_ERRCLS - if (datReq == NULLP) - { - RLOG0(L_ERROR,"Input Message Buffer is NULL"); - return RFAILED; - } - - if(rgCb[inst].rguSap[spId].sapCfg.spId == spId) - { - switch (rgCb[inst].rguSap[spId].sapSta.sapState) - { - case LRG_BND: /* SAP is bound */ - RLOG0(L_DEBUG,"SAP is already bound"); - break; - default: /* Should never reach here */ -#if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguCDatReq failed", - rgCb[inst].rguSap[spId].sapSta.sapState); -#endif - return RFAILED; - } - } - else - { -#if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguCDatReq failed ",spId); -#endif - return RFAILED; - } -#endif - - /* Update RGU SAP statistics for received sdu count */ - /* rgCb.rguSap.sapSts.numPduRcvd is updated by - * rgROMCmnDatReq ->rgUpdtRguCmnSts function - * So numPduRcvd updation is commented here */ - /* rgCb.rguSap.sapSts.numPduRcvd++; */ - - ret = rgROMCmnDatReq(inst,datReq); - /*ccpu00118201 - ADD - Send trace only when its enabled*/ - if(rgCb[inst].rgInit.trc) - { - RG_SEND_TRC_IND(inst,datReq->pdu, EVTRGUCDATREQ); - } - if (ret == RFAILED) - { - RG_DROP_RGUCDATREQ_MBUF(datReq); - } - ret = SPutStaticBuffer(pst->region, pst->pool,(Data *)datReq,sizeof(RguCDatReqInfo) , SS_SHARABLE_MEMORY); - datReq = NULLP; - return (ret); -} /* RgUiRguCDatReq */ - - -/** - * @brief Handler for dedicated StaRsp from RGU - * - * @details - * - * Function : RgUiRguDStaRsp - * - * This function validates SAP and invokes ROM for further processing - * - * @param[in] Pst *pst - * @param[in] SpId spId - * @param[in] RguDStaRspInfo *staRsp - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -PUBLIC S16 RgUiRguDStaRsp -( -Pst *pst, -SpId spId, -RguDStaRspInfo *staRsp -) -#else -PUBLIC S16 RgUiRguDStaRsp(pst, spId, staRsp) -Pst *pst; -SpId spId; -RguDStaRspInfo *staRsp; -#endif -{ - Inst inst; - - S16 ret = ROK; - VOLATILE U32 startTime = 0; - - TRC3(RgUiRguDStaRsp) - - RG_IS_INST_VALID(pst->dstInst); - inst = pst->dstInst - RG_INST_START; - /*starting Task*/ - SStartTask(&startTime, PID_MAC_STA_RSP); - - ret = rgROMDedStaRsp(inst,staRsp); - if (ret != ROK) - { - RLOG_ARG0(L_ERROR,DBG_CELLID,staRsp->cellId, - "Processing Of Status Response Failed"); - } - - - /*stoping Task*/ - SStopTask(startTime, PID_MAC_STA_RSP); - return (ret); -} /* RgUiRguDStaRsp */ - - -/** - * @brief Handler for common StaRsp from RGU - * - * @details - * - * Function : RgUiRguCStaRsp - * - * This function validates SAP and invokes ROM - * for further processing - * - * - * @param[in] Pst *pst - * @param[in] SpId spId - * @param[in] RguCStaRspInfo *staRsp - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -PUBLIC S16 RgUiRguCStaRsp -( -Pst *pst, -SpId spId, -RguCStaRspInfo *staRsp -) -#else -PUBLIC S16 RgUiRguCStaRsp(pst, spId, staRsp) -Pst *pst; -SpId spId; -RguCStaRspInfo *staRsp; -#endif -{ - Inst inst; - S16 ret = ROK; - - TRC3(RgUiRguCStaRsp) - - - RG_IS_INST_VALID(pst->dstInst); - inst = pst->dstInst - RG_INST_START; -#ifndef NO_ERRCLS - if (staRsp == NULLP) - { - RLOG0(L_ERROR,"Input Response Buffer is NULL"); - return RFAILED; - } - - if (spId == rgCb[inst].rguSap[spId].sapCfg.spId) - { - switch (rgCb[inst].rguSap[spId].sapSta.sapState) - { - case LRG_BND: /* SAP is bound */ - RLOG0(L_DEBUG,"SAP is already bound"); - break; - default: /* Should never reach here */ -#if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguCStaRsp failed", - rgCb[inst].rguSap[spId].sapSta.sapState); -#endif - return RFAILED; - } - } - else - { -#if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguCStaRsp failed",spId); -#endif - return RFAILED; - } -#endif - - ret = rgROMCmnStaRsp(inst,staRsp); - if (ret != ROK) - { - RLOG_ARG0(L_ERROR,DBG_CELLID,staRsp->cellId,"Processing Of Status Response Failed"); - return (ret); - } - - ret = SPutStaticBuffer(pst->region, pst->pool, (Data *)staRsp,sizeof(RguCStaRspInfo) , SS_SHARABLE_MEMORY); - staRsp = NULLP; - return (ret); -} /* RgUiRguCStaRsp */ - #ifdef LTE_L2_MEAS /** @@ -671,33 +275,23 @@ RguCStaRspInfo *staRsp; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiRguL2MUlThrpMeasReq +S16 RgUiRguL2MUlThrpMeasReq ( Pst *pst, SpId spId, RguL2MUlThrpMeasReqInfo *measReq ) -#else -PUBLIC S16 RgUiRguL2MUlThrpMeasReq(pst, spId, measReq) -Pst *pst; -SpId spId; -RguL2MUlThrpMeasReqInfo *measReq; -#endif { Inst inst; S16 ret = ROK; - TRC3(RgUiRguL2MUlThrpMeasReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; #ifndef NO_ERRCLS if (measReq == NULLP) { - RLOG0(L_ERROR,"Input Response Buffer is NULL"); + DU_LOG("\nERROR --> MAC : Input Response Buffer is NULL"); return RFAILED; } @@ -706,11 +300,11 @@ RguL2MUlThrpMeasReqInfo *measReq; switch (rgCb[inst].rguSap[spId].sapSta.sapState) { case LRG_BND: /* SAP is bound */ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nERROR --> MAC : SAP is already bound"); break; default: /* Should never reach here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguL2MUlThrpMeasReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiRguL2MUlThrpMeasReq failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif return RFAILED; @@ -719,7 +313,7 @@ RguL2MUlThrpMeasReqInfo *measReq; else { #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguL2MUlThrpMeasReq failed",spId); + DU_LOG("\nERROR --> MAC : Invalid SAP Id:%d RgUiRguL2MUlThrpMeasReq failed",spId); #endif return RFAILED; } @@ -728,11 +322,10 @@ RguL2MUlThrpMeasReqInfo *measReq; ret = rgROML2MUlThrpMeasReq(inst,measReq); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,measReq->cellId,"Processing Of Meas Request Failed"); + DU_LOG("\nERROR --> MAC : Processing Of Meas Request Failed"); } - SPutStaticBuffer(pst->region, pst->pool, (Data *)measReq,sizeof(RguL2MUlThrpMeasReqInfo) , SS_SHARABLE_MEMORY); - measReq= NULLP; + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, (Data *)measReq,sizeof(RguL2MUlThrpMeasReqInfo)); return (ret); } /* RgUiRguL2MUlThrpMeasReq */ #endif @@ -755,31 +348,22 @@ RguL2MUlThrpMeasReqInfo *measReq; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMSndDedStaInd +S16 rgUIMSndDedStaInd ( Inst inst, RgUpSapCb *rguSap, RgRguDedStaInd *staInd ) -#else -PUBLIC S16 rgUIMSndDedStaInd(inst,rguSap,staInd) -Inst inst; -RgUpSapCb *rguSap; -RgRguDedStaInd *staInd; -#endif { S16 ret = ROK; - TRC2(rgUIMSndDedStaInd) - - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndDedStaInd(): staInd = %p;\n", (void *)staInd)); + DU_LOG("\nINFO --> MAC : rgUIMSndDedStaInd(): staInd = %p;\n", (void *)staInd); ret = RgUiRguDStaInd(&(rguSap->sapCfg.sapPst), rguSap->sapCfg.suId, staInd); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"RgUiRguDStaInd Failed"); + DU_LOG("\nERROR --> MAC : RgUiRguDStaInd Failed"); return (ret); } return (ret); @@ -804,31 +388,20 @@ RgRguDedStaInd *staInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMSndCmnStaInd +S16 rgUIMSndCmnStaInd ( Inst inst, RgUpSapCb *rguDlSap, RgRguCmnStaInd *staInd ) -#else -PUBLIC S16 rgUIMSndCmnStaInd(inst,rguDlSap,staInd) -Inst inst, -RgUpSapCb *rguDlSap, -RgRguCmnStaInd *staInd; -#endif { S16 ret = ROK; - - TRC2(rgUIMSndCmnStaInd) - - ret = RgUiRguCStaInd(&(rguDlSap->sapCfg.sapPst), rguDlSap->sapCfg.suId, staInd); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"RgUiRguCStaInd Failed"); + DU_LOG("\nERROR --> MAC : RgUiRguCStaInd Failed"); return (ret); } return (ret); @@ -853,33 +426,22 @@ RgRguCmnStaInd *staInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMSndDedDatInd +S16 rgUIMSndDedDatInd ( Inst inst, RgUpSapCb *rguUlSap, RgRguDedDatInd *datInd ) -#else -PUBLIC S16 rgUIMSndDedDatInd(datInd) -Inst inst; -RgUpSapCb *rguUlSap; -RgRguDedDatInd *datInd; -#endif { S16 ret = ROK; - - TRC2(rgUIMSndDedDatInd) - - rguUlSap->sapSts.numPduTxmit += datInd->numLch; #ifndef SS_RBUF ret = RgUiRguDDatInd(&(rguUlSap->sapCfg.sapPst), rguUlSap->sapCfg.suId, datInd); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"RgUiRguDdatInd Failed"); + DU_LOG("\nERROR --> MAC : RgUiRguDdatInd Failed"); return (ret); } #else @@ -908,36 +470,20 @@ RgRguDedDatInd *datInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMSndCmnDatInd -( -Inst inst, -RgUpSapCb *rguUlSap, -RgRguCmnDatInd *datInd -) -#else -PUBLIC S16 rgUIMSndCmnDatInd(datInd) -Inst inst; -RgUpSapCb *rguUlSap; -RgRguCmnDatInd *datInd; -#endif +S16 rgUIMSndCmnDatInd(Inst inst,RgUpSapCb *rguUlSap,RgRguCmnDatInd *datInd) { S16 ret = ROK; - TRC2(rgUIMSndCmnDatInd) - - - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndCmnDatInd(): staInd = %p;\n", (void *)datInd)); + DU_LOG("\nDEBUG --> MAC : rgUIMSndCmnDatInd(): staInd = %p;\n", (void *)datInd); rguUlSap->sapSts.numPduTxmit++; - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndCmnDatInd suId = %d\n", rguUlSap->sapCfg.suId)); + DU_LOG("\nDEBUG --> MAC : rgUIMSndCmnDatInd suId = %d\n", rguUlSap->sapCfg.suId); ret = RgUiRguCDatInd(&(rguUlSap->sapCfg.sapPst), rguUlSap->sapCfg.suId, datInd); if (ret != ROK) { - RGDBGERRNEW(inst,(rgPBuf(inst),"RgUiRguCDatInd Failed\n")); - RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"RgUiRguCDatInd Failed"); + DU_LOG("\nERROR --> MAC : RgUiRguCDatInd Failed"); return (ret); } return (ret); @@ -962,28 +508,13 @@ RgRguCmnDatInd *datInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiCrgBndReq -( -Pst *pst, -SuId suId, -SpId spId -) -#else -PUBLIC S16 RgUiCrgBndReq(pst, suId, spId) -Pst *pst; -SuId suId; -SpId spId; -#endif +S16 RgUiCrgBndReq(Pst *pst, SuId suId,SpId spId) { S16 ret = ROK; Pst tmpPst; /* Temporary Post Structure */ RgUstaDgn dgn; /* Alarm diagnostics structure */ Inst inst; - TRC3(RgUiCrgBndReq) - - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -1011,11 +542,11 @@ SpId spId; rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM); ret = rgLMMStaInd(inst,LCM_CATEGORY_INTERFACE,LRG_NOT_CFG, LCM_CAUSE_INV_SAP, &dgn); - RLOG0(L_DEBUG,"SAP Not Configured"); + DU_LOG("\nDEBUG --> MAC : SAP Not Configured"); ret = RgUiCrgBndCfm(&tmpPst, suId, CM_BND_NOK); break; case LRG_UNBND: /* SAP is not bound */ - RLOG0(L_DEBUG,"SAP Not yet bound"); + DU_LOG("\nERROR --> MAC : SAP Not yet bound"); rgCb[inst].crgSap.sapSta.sapState = LRG_BND; rgCb[inst].crgSap.sapCfg.suId = suId; @@ -1027,13 +558,13 @@ SpId spId; LCM_CAUSE_UNKNOWN, &dgn); break; case LRG_BND: /* SAP is already bound*/ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nDEBUG --> MAC : SAP is already bound"); ret = rgUIMCrgBndCfm(inst,suId, CM_BND_OK); break; default: /* Should Never Enter here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiCrgBndReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiCrgBndReq failed", rgCb[inst].crgSap.sapSta.sapState); #endif ret = rgUIMCrgBndCfm(inst,suId, CM_BND_NOK); @@ -1043,7 +574,7 @@ SpId spId; else { #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiCrgBndReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP Id:%d RgUiCrgBndReq failed", rgCb[inst].crgSap.sapCfg.spId); #endif ret = rgUIMCrgBndCfm(inst,suId, CM_BND_NOK); @@ -1070,23 +601,9 @@ SpId spId; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 RgUiCrgUbndReq -( -Pst *pst, -SpId spId, -Reason reason -) -#else -PUBLIC S16 RgUiCrgUbndReq(pst, spId, reason) -Pst *pst; -SpId spId; -Reason reason; -#endif +S16 RgUiCrgUbndReq(Pst *pst,SpId spId,Reason reason) { Inst inst; - TRC3(RgUiCrgUbndReq) - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -1097,13 +614,13 @@ Reason reason; { case LRG_BND: /* SAP is already bound*/ /* setting SAP state to UN BOUND */ - RLOG0(L_DEBUG, "SAP is already bound"); + DU_LOG("\nDEBUG --> MAC : SAP is already bound"); rgCb[inst].crgSap.sapSta.sapState = LRG_UNBND; break; default: #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiCrgUbndReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiCrgUbndReq failed", rgCb[inst].crgSap.sapSta.sapState); #endif return RFAILED; @@ -1112,7 +629,7 @@ Reason reason; else { #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiCrgUbndReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP Id:%d RgUiCrgUbndReq failed", rgCb[inst].crgSap.sapCfg.spId); #endif return RFAILED; @@ -1133,141 +650,23 @@ Reason reason; * * @param[in] Inst inst * @param[in] SuId suId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMCrgBndCfm -( -Inst inst, -SuId suId, -U8 status -) -#else -PUBLIC S16 rgUIMCrgBndCfm(inst,suId, status) -Inst inst; -SuId suId; -U8 status; -#endif +S16 rgUIMCrgBndCfm(Inst inst,SuId suId,uint8_t status) { - TRC2(rgUIMCrgBndCfm) - if(RgUiCrgBndCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, status) != ROK) { - RLOG0(L_ERROR,"RgUiCrgBndCfm Failed "); + DU_LOG("\nERROR --> MAC : RgUiCrgBndCfm Failed "); return RFAILED; } return ROK; } /* rgUIMCrgBndCfm*/ -/** - * @brief API for configuration request from RRC towards MAC. - * - * @details - * - * Function: RgUiCrgCfgReq - * - * This API is invoked by RRC towards MAC to configure MAC. - * These API validates the Pst, spId, suId and transfers the config request - * specific information to corresponding ownership module (COM) API. - * - * - * @param[in] Pst *pst - * @param[in] SpId spId - * @param[in] CrgCfgTransId transId - * @param[in] CrgCfgReqInfo *cfgReqInfo - * @return S16 - * -# ROK - * -# RFAILED - **/ -#ifdef ANSI -PUBLIC S16 RgUiCrgCfgReq -( -Pst *pst, -SpId spId, -CrgCfgTransId transId, -CrgCfgReqInfo *cfgReqInfo -) -#else -PUBLIC S16 RgUiCrgCfgReq(pst, spId, transId, cfgReqInfo) -Pst *pst; -SpId spId; -CrgCfgTransId transId; -CrgCfgReqInfo *cfgReqInfo; -#endif -{ - Inst inst; - S16 ret = ROK; - U8 cfmStatus = 0x00ff; - U8 prntTrans[CRG_CFG_TRANSID_SIZE+1]; - - TRC3(RgUiCrgCfgReq); - - RG_IS_INST_VALID(pst->dstInst); - inst = pst->dstInst - RG_INST_START; - /* Ensuring transId is always Null terminated. */ - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, CRG_CFG_TRANSID_SIZE); - prntTrans[CRG_CFG_TRANSID_SIZE] = '\0'; - - - /* CrgCfgReqInfo Validation for NULLP */ - if (cfgReqInfo == NULLP) - { - RLOG0(L_ERROR,"Input Param crgReqInfo is NULL "); - rgUIMCrgCfgCfm(inst,transId, cfmStatus); - return RFAILED; - } - - /* Upper SAP Id and State validation */ - if (spId == rgCb[inst].crgSap.sapCfg.spId) - { - switch(rgCb[inst].crgSap.sapSta.sapState) - { - case LRG_BND: /* SAP is already bound */ - RLOG0(L_DEBUG,"SAP is already bound"); - break; - default: /* Should never reach here */ -#if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiCrgCfgReq failed", - rgCb[inst].crgSap.sapSta.sapState); -#endif - SPutSBuf (pst->region, pst->pool, (Data *)cfgReqInfo, - sizeof(CrgCfgReqInfo)); - cfgReqInfo = NULLP; - - rgUIMCrgCfgCfm(inst,transId, cfmStatus); - return RFAILED; - } - } - else - { -#if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiCrgCfgReq failed", - rgCb[inst].crgSap.sapCfg.spId); -#endif - SPutSBuf (pst->region, pst->pool, (Data *)cfgReqInfo, - sizeof(CrgCfgReqInfo)); - cfgReqInfo = NULLP; - rgUIMCrgCfgCfm(inst,transId, cfmStatus); - return RFAILED; - } - ret = rgCOMCfgReq(inst,transId, cfgReqInfo); - SPutSBuf (pst->region, pst->pool, (Data *)cfgReqInfo, - sizeof(CrgCfgReqInfo)); - cfgReqInfo = NULLP; - if (ret != ROK) - { - RLOG0(L_ERROR,"Configuration Request Handling Failed "); - return RFAILED; - } - - return ROK; -} /* RgUiCrgCfgReq */ - /** * @brief API for sending configuration confirm from MAC to RRC * @@ -1281,96 +680,34 @@ CrgCfgReqInfo *cfgReqInfo; * * @param[in] Inst inst * @param[in] CrgCfgTransId transId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -PUBLIC S16 rgUIMCrgCfgCfm +S16 rgUIMCrgCfgCfm ( Inst inst, CrgCfgTransId transId, -U8 status +uint8_t status ) -#else -PUBLIC S16 rgUIMCrgCfgCfm(inst,transId, status) -Inst inst; -CrgCfgTransId transId; -U8 status; -#endif { S16 ret = ROK; - U8 prntTrans[CRG_CFG_TRANSID_SIZE+1]; + uint8_t prntTrans[CRG_CFG_TRANSID_SIZE+1]; - TRC2(rgUIMCrgCfgCfm) - - cmMemcpy((U8 *)prntTrans, (U8 *)transId.trans, CRG_CFG_TRANSID_SIZE); + memcpy(prntTrans, transId.trans, CRG_CFG_TRANSID_SIZE); prntTrans[CRG_CFG_TRANSID_SIZE] = '\0'; ret = RgUiCrgCfgCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, transId, status); if (ret != ROK) { - RLOG0(L_ERROR,"RgUiCrgCfgCfm Failed "); + DU_LOG("\nERROR --> MAC : RgUiCrgCfgCfm Failed "); return (ret); } return (ret); } /* rgUIMCrgCfgCfm */ -#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) - -#ifdef ANSI -PUBLIC S16 rgBatchProc -( -Void -) -#else -PUBLIC S16 rgBatchProc() -Void; -#endif -{ -/* Read from Ring Buffer and process RLC BO Update */ - Pst pst = {0}; - SpId spId = 0; - RguDStaRspInfo *staRsp; - U32 elmIndx = 0; -#ifndef LTE_ADV -/* Fill pst */ - pst.srcProcId = 1; - pst.dstProcId = 1; - pst.dstEnt = ENTRG; - pst.dstInst = 0; - pst.srcEnt = ENTKW; - pst.srcInst = 1; - pst.prior = PRIOR0; - pst.route = RTESPEC; - pst.event = EVTRGUDSTARSP; - pst.region = 0; - pst.pool = 0; - pst.selector = 2; /*SM_SELECTOR_LC */ -#else -#endif - - elmIndx = (U32)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC); - while(NULLP != elmIndx) - { - staRsp = (RguDStaRspInfo *)elmIndx; -#ifdef LTE_ADV - pst = staRsp->post; -#endif - RgUiRguDStaRsp(&pst, spId, staRsp); - - elmIndx = NULLP; - staRsp = NULLP; - SRngIncrRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC); - - if((elmIndx = (U32)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC)) == NULLP) - break; - } - return ROK; -} -#endif /**********************************************************************