The functions for the configuration, control, status and statistics
request primitives are defined here.
*/
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_FILE_ID=220;
-static int RLOG_MODULE_ID=4096;
/* header include files (.h) */
#include "common_def.h"
- RG_DIAG_LVL0(inst,0x0a0b0001, RG_DIAG_NA, SS_DIAG_INV_ARG,\
- "Received CfgReq for MAC layer, Entity = %d, Instance = %d\n", pst->srcEnt, pst->srcInst,0,0);
+ DU_LOG("\nINFO --> MAC : Received CfgReq for MAC layer, Entity = %d, Instance = %d\n", pst->srcEnt, pst->srcInst,0,0);
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
default:
ret = LCM_PRIM_NOK;
reason = LCM_REASON_INVALID_ELMNT;
- RLOG1(L_ERROR, "Invalid Elmnt=%d",
+ DU_LOG("\nERROR --> MAC : Invalid Elmnt=%d",
cfg->hdr.elmId.elmnt);
break;
}
cfm.cfm.status = LCM_PRIM_NOK;
cfm.cfm.reason = LCM_REASON_GENCFG_NOT_DONE;
RgMiLrgStsCfm(&cfmPst,&cfm);
- RLOG0(L_ERROR, "Gen Cfg not done");
+ DU_LOG("\nERROR --> MAC : Gen Cfg not done");
return ROK;
}
default:
cfm.cfm.status = LCM_PRIM_NOK;
cfm.cfm.reason = LCM_REASON_INVALID_ELMNT;
- RLOG1(L_ERROR, "Invalid Elmnt = %d",sts->hdr.elmId.elmnt);
+ DU_LOG("\nERROR --> MAC : Invalid Elmnt = %d",sts->hdr.elmId.elmnt);
break;
}
RgMiLrgStsCfm(&cfmPst,&cfm);
(Data **)&(cfm.t.ssta.s.sysId.ptNmb), LRG_MAX_PT_NUM_SIZE)
!= ROK)
{
- RLOG0(L_ERROR, "Memory Unavailable for Confirmation");
+ DU_LOG("\nERROR --> MAC : Memory Unavailable for Confirmation");
return ROK;
}
memset((cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE);
cfm.cfm.reason = LCM_REASON_GENCFG_NOT_DONE;
cfm.hdr.elmId.elmnt = sta->hdr.elmId.elmnt;
RgMiLrgStaCfm(&cfmPst, &cfm);
- RLOG0(L_ERROR, "Gen Cfg not done");
+ DU_LOG("\nERROR --> MAC : Gen Cfg not done");
return ROK;
}
(Data **)&(cfm.t.ssta.s.sysId.ptNmb), LRG_MAX_PT_NUM_SIZE)
!= ROK)
{
- RLOG0(L_ERROR, "Memory Unavailable for Confirmation");
+ DU_LOG("\nERROR --> MAC : Memory Unavailable for Confirmation");
return ROK;
}
memset((cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE);
cfm.cfm.status = LCM_PRIM_NOK;
cfm.cfm.reason = LCM_REASON_INVALID_ELMNT;
RgMiLrgStaCfm(&cfmPst, &cfm);
- RLOG1(L_ERROR, "Invalid elmnt=%d",sta->hdr.elmId.elmnt);
+ DU_LOG("\nERROR --> MAC : Invalid elmnt=%d",sta->hdr.elmId.elmnt);
break;
}
return ROK;
cfm.cfm.reason = LCM_REASON_GENCFG_NOT_DONE;
cfm.hdr.elmId.elmnt = cntrl->hdr.elmId.elmnt;
RgMiLrgCntrlCfm(&cfmPst, &cfm);
- RLOG0(L_ERROR, "Gen Cfg not done");
+ DU_LOG("\nERROR --> MAC : Gen Cfg not done");
return ROK;
}
cfm.cfm.status = LCM_PRIM_NOK;
cfm.cfm.reason = LCM_REASON_INVALID_PAR_VAL;
RgMiLrgCntrlCfm(&cfmPst, &cfm);
- RLOG1(L_ERROR, "invalid elmnt=%d",cntrl->hdr.elmId.elmnt);
+ DU_LOG("\nERROR --> MAC : invalid elmnt=%d",cntrl->hdr.elmId.elmnt);
break;
}
return (ret);
(cfg->s.rguSap.selector != ODU_SELECTOR_LC))
{
ret = LCM_REASON_INVALID_PAR_VAL;
- RLOG0(L_ERROR, "unsupported Selector value for RGU");
+ DU_LOG("\nERROR --> MAC : unsupported Selector value for RGU");
break;
}
upSapCb = &(rgCb[inst].rguSap[cfg->s.rguSap.spId]);
(cfg->s.crgSap.selector != ODU_SELECTOR_LC))
{
ret = LCM_REASON_INVALID_PAR_VAL;
- RLOG0(L_ERROR, "unsupported Selector value for CRG");
+ DU_LOG("\nERROR --> MAC : unsupported Selector value for CRG");
break;
}
if(rgCb[inst].crgSap.sapSta.sapState == LRG_NOT_CFG)
(cfg->s.tfuSap.selector != ODU_SELECTOR_LC))
{
ret = LCM_REASON_INVALID_PAR_VAL;
- RLOG0(L_ERROR, "unsupported Selector value for TFU");
+ DU_LOG("\nERROR --> MAC : unsupported Selector value for TFU");
break;
}
#endif
if ((cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_TC) &&
(cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_LC))
{
- RLOG0(L_ERROR, "unsupported Selector value for RGU");
+ DU_LOG("\nERROR --> MAC : unsupported Selector value for RGU");
return (LCM_REASON_INVALID_PAR_VAL);
}
/* Update the Pst structure for LM interface */
if(cfg->s.genCfg.numRguSaps == 0)
{
- RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgGenCfg(): Invalid numRguSap.\n"));
+ DU_LOG("\nERROR --> MAC : rgGenCfg(): Invalid numRguSap.\n");
return RFAILED;
}
(Data **)&rgCb[inst].rguSap,
(sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps)) != ROK)
{
- RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgGenCfg(): Failed to allocate mem for RGU SAP's.\n"));
+ DU_LOG("\nERROR --> MAC : rgGenCfg(): Failed to allocate mem for RGU SAP's.\n");
return RFAILED;
}
rgCb[inst].numRguSaps = cfg->s.genCfg.numRguSaps;
(S16)rgCb[inst].genCfg.tmrRes, rgActvTmr) != ROK)
{
- RLOG0(L_ERROR, "Failed to register timer");
+ DU_LOG("\nERROR --> MAC : Failed to register timer");
SPutSBuf(rgCb[inst].rgInit.region,
rgCb[inst].rgInit.pool,
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
- RLOG1(L_ERROR, "invalid subaction=%d",cntrl->t.cntrl.subAction);
+ DU_LOG("\nERROR --> MAC : invalid subaction=%d",cntrl->t.cntrl.subAction);
break;
}
break;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
- RLOG1(L_ERROR, "invalid subaction=%d",cntrl->t.cntrl.subAction);
+ DU_LOG("\nERROR --> MAC : invalid subaction=%d",cntrl->t.cntrl.subAction);
break;
}
break;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
- RLOG1(L_ERROR, "invalid action=%d",cntrl->t.cntrl.action);
+ DU_LOG("\nERROR --> MAC : invalid action=%d",cntrl->t.cntrl.action);
break;
}
RgMiLrgCntrlCfm(cfmPst, cfm);
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
- RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgLMMSapCntrl(): invalid action=%d",
- cntrl->t.cntrl.action));
+ DU_LOG("\nERROR --> MAC : rgLMMSapCntrl(): invalid action=%d",
+ cntrl->t.cntrl.action);
break;
}
break;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
- RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgLMMSapCntrl(): invalid action=%d",
- cntrl->t.cntrl.action));
+ DU_LOG("\nERROR --> MAC : rgLMMSapCntrl(): invalid action=%d",
+ cntrl->t.cntrl.action);
break;
}
break;
default:
cfm->cfm.status = LCM_PRIM_NOK;
cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
- RLOG1(L_ERROR, "invalid action=%d",cntrl->t.cntrl.action);
+ DU_LOG("\nERROR --> MAC : invalid action=%d",cntrl->t.cntrl.action);
break;
}
}
break;
default:
- RLOG1(L_ERROR, "Invalid tmrEvnt=%d",tmrEvnt);
+ DU_LOG("\nERROR --> MAC : Invalid tmrEvnt=%d",tmrEvnt);
ret = RFAILED;
break;
}
if ((rgCb[inst].trcLen == LRG_NO_TRACE) || (srcMbuf == NULLP))
{
- RLOG0(L_ERROR, "Trace Disabled.");
+ DU_LOG("\nERROR --> MAC : Trace Disabled.");
return;
}
if (SCpyMsgMsg(srcMbuf, pst.region, pst.pool, &dstMbuf)
!= ROK)
{
- RLOG0(L_ERROR, "SCpyMsgMsg Failed.");
+ DU_LOG("\nERROR --> MAC : SCpyMsgMsg Failed.");
return;
}
trc.cfm.status = LCM_PRIM_OK;
/* Get the length of the recvd message buffer */
if (SFndLenMsg(srcMbuf, &bufLen) != ROK)
{
- RLOG0(L_ERROR, "SFndLenMsg Failed.");
+ DU_LOG("\nERROR --> MAC : SFndLenMsg Failed.");
return;
}
/* Check if the recvd buffer size is less than request trace len */
if (SCpyMsgMsg(srcMbuf, pst.region, pst.pool, &dstMbuf)
!= ROK)
{
- RLOG0(L_ERROR, "SCpyMsgMsg Failed.");
+ DU_LOG("\nERROR --> MAC : SCpyMsgMsg Failed.");
return;
}
/* Get a temporary buffer to store the msg */
if (rgAllocSBuf(inst,&tempBuf, rgCb[inst].trcLen) != ROK)
{
- RLOG0(L_ERROR, "rgAllocSBuf Failed.");
+ DU_LOG("\nERROR --> MAC : rgAllocSBuf Failed.");
return;
}
/* Copy trcLen nos of bytes from the recvd message */
if (SCpyMsgFix(srcMbuf,0,rgCb[inst].trcLen,tempBuf,&tempCnt) != ROK)
{
- RLOG0(L_ERROR, "SCpyMsgFix Failed.");
+ DU_LOG("\nERROR --> MAC : SCpyMsgFix Failed.");
return;
}
if (SGetMsg(pst.region, pst.pool, &dstMbuf) != ROK)
{
- RLOG0(L_ERROR, "dstMbuf Allocation Failed");
+ DU_LOG("\nERROR --> MAC : dstMbuf Allocation Failed");
return;
}
/* Copy the tempBuf data to dst mBuf */
if (SCpyFixMsg(tempBuf,dstMbuf,0,rgCb[inst].trcLen,&tempCnt) != ROK)
{
- RLOG0(L_ERROR, "SCpyFixMsg Failed.");
+ DU_LOG("\nERROR --> MAC : SCpyFixMsg Failed.");
return;
}
/* Check if the suId is valid */
if(rgCb[inst].tfuSap.sapCfg.suId != suId)
{
- RLOG0(L_ERROR, "Invalid SuId");
+ DU_LOG("\nERROR --> MAC : Invalid SuId");
return RFAILED;
}
**********************************************************************/
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_FILE_ID=237;
-static int RLOG_MODULE_ID=4096;
/** @file rg_tom.c
@brief This module does processing related to handling of lower interface APIs
invoked by PHY towards MAC
{
S16 ret;
TfuDatReqPduInfo *datReq=NULLP;
- /* Moving node declaration to limited scope for optimization */
+ /* Moving node declaration to limited scope for optimization */
RgDlHqProcCb *hqCb;
uint8_t idx;
Inst inst = cellCb->macInst - RG_INST_START;
- /* first lets send the BCCH data down to PHY */
+ /* first lets send the BCCH data down to PHY */
if (dlSf->bcch.tb != NULLP)
{
if ((ret = rgGetEventMem(inst,(Ptr *)&datReq, sizeof(TfuDatReqPduInfo),
- &(datInfo->memCp))) != ROK)
+ &(datInfo->memCp))) != ROK)
{
- err->errCause = RGERR_TOM_MEM_EXHAUST;
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"Memory Exhaustion ");
- return (ret);
+ err->errCause = RGERR_TOM_MEM_EXHAUST;
+ DU_LOG("\nERROR --> MAC : Memory Exhaustion ");
+ return (ret);
}
#ifdef TFU_ALLOC_EVENT_NO_INIT
#ifndef L2_OPTMZ
datReq->mBuf[1] = 0;
#else
- datReq->tbInfo[0].lchInfo[0].mBuf[0]=NULLP;
+ datReq->tbInfo[0].lchInfo[0].mBuf[0]=NULLP;
#endif
#endif
datReq->rnti = RG_SI_RNTI;
if (dlSf->pcch.tb != NULLP)
{
if ((ret = rgGetEventMem(inst,(Ptr *)&datReq, sizeof(TfuDatReqPduInfo),
- &(datInfo->memCp))) != ROK)
+ &(datInfo->memCp))) != ROK)
{
- err->errCause = RGERR_TOM_MEM_EXHAUST;
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Memory Exhaustion CRNTI:%d",datReq->rnti);
- return (ret);
+ err->errCause = RGERR_TOM_MEM_EXHAUST;
+ DU_LOG("\nERROR --> MAC : Memory Exhaustion CRNTI:%d",datReq->rnti);
+ return (ret);
}
#ifdef TFU_ALLOC_EVENT_NO_INIT
#ifndef L2_OPTMZ
for(idx=0; idx < dlSf->numRaRsp; idx++)
{
if ((ret = rgGetEventMem(inst,(Ptr *)&datReq, sizeof(TfuDatReqPduInfo),
- &(datInfo->memCp))) != ROK)
+ &(datInfo->memCp))) != ROK)
{
- err->errCause = RGERR_TOM_MEM_EXHAUST;
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Memory Exhaustion CRNTI:%d",
- datReq->rnti);
- return (ret);
+ err->errCause = RGERR_TOM_MEM_EXHAUST;
+ DU_LOG("\nERROR --> MAC : Memory Exhaustion CRNTI:%d",
+ datReq->rnti);
+ return (ret);
}
#ifdef TFU_ALLOC_EVENT_NO_INIT
#ifndef L2_OPTMZ
#endif
datReq->tbInfo[0].numLch = 1;
datReq->tbInfo[0].lchInfo[0].numPdu = 1;
- // prc_trace_format_string(0x40,3,"UE Id=(%d) tbSz=(%d)",datReq->rnti, datReq->tbInfo[0].tbSize);
+ // prc_trace_format_string(0x40,3,"UE Id=(%d) tbSz=(%d)",datReq->rnti, datReq->tbInfo[0].tbSize);
#endif
cmLListAdd2Tail(&datInfo->pdus, &(datReq->lnk));
datReq->lnk.node = (PTR)datReq;
CmLList *node;
while (dlSf->tbs.first)
{
- node = dlSf->tbs.first;
- hqCb = (RgDlHqProcCb*)node->node;
- if ((ret = rgDHMSndDatReq (cellCb, dlSf, datInfo, hqCb, err)) != ROK)
- {
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,
- "DHM unable to fill DATA request");
- err->errType = RGERR_TOM_TTIIND;
- continue;
- }
+ node = dlSf->tbs.first;
+ hqCb = (RgDlHqProcCb*)node->node;
+ if ((ret = rgDHMSndDatReq (cellCb, dlSf, datInfo, hqCb, err)) != ROK)
+ {
+ DU_LOG("\nERROR --> MAC : DHM unable to fill DATA request");
+ err->errType = RGERR_TOM_TTIIND;
+ continue;
+ }
} /* end of while */
}
/* Fill Data Request Info from scheduler to PHY */
if ((ret = rgAllocEventMem(inst,(Ptr *)&datInfo,
- sizeof(TfuDatReqInfo))) != ROK)
+ sizeof(TfuDatReqInfo))) != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to Allocate TfuDatReqInfo");
+ DU_LOG("\nERROR --> MAC : Unable to Allocate TfuDatReqInfo");
return (ret);
}
else
datInfo->cellId = cellCb->cellId;
if((0 == (datInfo->timingInfo.sfn % 30)) && (0 == datInfo->timingInfo.slot))
{
- //printf("5GTF_CHECK rgTOMUtlProcDlSf dat (%d : %d)\n", datInfo->timingInfo.sfn, datInfo->timingInfo.slot);
+ //DU_LOG("5GTF_CHECK rgTOMUtlProcDlSf dat (%d : %d)\n", datInfo->timingInfo.sfn, datInfo->timingInfo.slot);
}
#ifdef TFU_ALLOC_EVENT_NO_INIT
datInfo->bchDat.pres = 0;
/* Fill BCH data */
if (dlSf->bch.tb != NULLP)
{
- datInfo->bchDat.pres = PRSNT_NODEF;
- datInfo->bchDat.val = dlSf->bch.tb;
- dlSf->bch.tb = NULLP;
+ datInfo->bchDat.pres = PRSNT_NODEF;
+ datInfo->bchDat.val = dlSf->bch.tb;
+ dlSf->bch.tb = NULLP;
}
#ifdef EMTC_ENABLE
/* Fill the DLSCH PDUs of BCCH, PCCH and Dedicated Channels */
if ((ret = rgTOMEmtcUtlFillDatReqPdus(datInfo, dlSf, cellCb, err)) != ROK)
{
- RG_FREE_MEM(datInfo);
- return (ret);
+ RG_FREE_MEM(datInfo);
+ return (ret);
}
#endif
/* Fill the DLSCH PDUs of BCCH, PCCH and Dedicated Channels */
if ((ret = rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err)) != ROK)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to send data for cell");
- RG_FREE_MEM(datInfo);
- return (ret);
+ DU_LOG("\nERROR --> MAC : Unable to send data for cell");
+ RG_FREE_MEM(datInfo);
+ return (ret);
}
if((datInfo->pdus.count) || (datInfo->bchDat.pres == TRUE))
{
- /* sending the data to Phy */
- //if (rgLIMTfuDatReq(inst,datInfo) != ROK)
- {
- RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to send data info for cell");
- }
+ /* sending the data to Phy */
+ //if (rgLIMTfuDatReq(inst,datInfo) != ROK)
+ {
+ DU_LOG("\nERROR --> MAC : Unable to send data info for cell");
+ }
}
else
{
- /* Nothing to send: free the allocated datInfo */
- RG_FREE_MEM(datInfo);
+ /* Nothing to send: free the allocated datInfo */
+ RG_FREE_MEM(datInfo);
}
}
return ROK;
{
rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM);
rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_DMEM_ALLOC_FAIL,
- LCM_CAUSE_MEM_ALLOC_FAIL, &dgn);
- RLOG0(L_ERROR,"Allocation of DUX event failed");
+ LCM_CAUSE_MEM_ALLOC_FAIL, &dgn);
+ DU_LOG("\nERROR --> MAC : Allocation of DUX event failed");
return RFAILED;
}
node = pdu->sduLst.first;
while (node)
{
- sdu = (RgMacSdu*)node->node;
- RG_FREE_MSG(sdu->mBuf);
- node = node->next;
+ sdu = (RgMacSdu*)node->node;
+ RG_FREE_MSG(sdu->mBuf);
+ node = node->next;
}
}
RG_FREE_MEM(pdu);
{
rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM);
rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_DMEM_ALLOC_FAIL,
- LCM_CAUSE_MEM_ALLOC_FAIL, &dgn);
- RLOG0(L_ERROR,"Allocation failed");
+ LCM_CAUSE_MEM_ALLOC_FAIL, &dgn);
+ DU_LOG("\nERROR --> MAC : Allocation failed");
return RFAILED;
}
lcId=dDatInd->lchData[loop].lcId;
if (lcId)
{
- lcgId = ueCb->ul.lcCb[lcId - 1].lcgId;
- if(ueCb->ul.lcgArr[lcgId].lcgBsInfo.outStndngBs > 0)
- {
- dDatInd->burstInd = RGU_L2M_UL_BURST_START;
- break;
- }
- }
+ lcgId = ueCb->ul.lcCb[lcId - 1].lcgId;
+ if(ueCb->ul.lcgArr[lcgId].lcgBsInfo.outStndngBs > 0)
+ {
+ dDatInd->burstInd = RGU_L2M_UL_BURST_START;
+ break;
+ }
+ }
}
return ROK;
* -# ROK
* -# RFAILED
*/
- RgUeCb *glblueCb4;
- RgUeCb *glblueCb5;
+RgUeCb *glblueCb4;
+RgUeCb *glblueCb5;
#ifdef LTEMAC_SPS
-static S16 rgTOMUtlProcMsg
+ static S16 rgTOMUtlProcMsg
(
-RgCellCb *cellCb,
-RgUeCb *ueCb,
-RgMacPdu *pdu,
-Bool isSpsRnti,
-Bool *spsToBeActvtd,
-uint16_t *sduSize,
-uint16_t slot,
-uint32_t *lcgBytes
-)
+ RgCellCb *cellCb,
+ RgUeCb *ueCb,
+ RgMacPdu *pdu,
+ Bool isSpsRnti,
+ Bool *spsToBeActvtd,
+ uint16_t *sduSize,
+ uint16_t slot,
+ uint32_t *lcgBytes
+ )
#else /* LTEMAC_SPS */
-static S16 rgTOMUtlProcMsg
+ static S16 rgTOMUtlProcMsg
(
-RgCellCb *cellCb,
-RgUeCb *ueCb,
-RgMacPdu *pdu,
-uint16_t slot,
-uint32_t *lcgBytes
-)
+ RgCellCb *cellCb,
+ RgUeCb *ueCb,
+ RgMacPdu *pdu,
+ uint16_t slot,
+ uint32_t *lcgBytes
+ )
#endif
{
Inst inst = cellCb->macInst - RG_INST_START;
MsgLen cpySz;
#ifdef LTEMAC_SPS
Pst schPst1;
-// RgInfSpsRelInfo relInfo;
+ // RgInfSpsRelInfo relInfo;
#endif
#ifdef LTE_L2_MEAS
uint8_t lcgId;
MsgLen bufSz;
- /* Moved outside of LTE_L2_MEAS
+ /* Moved outside of LTE_L2_MEAS
* scope as this pointer will now be used to
* check for valid Logical Channel ID
- */
+ */
RgUlLcCb *ulLcCb;
-
+
cDatInd = NULLP;
dDatInd = NULLP;
#ifdef LTE_L2_MEAS
#ifdef SS_RBUF
Void *elem = NULLP;
#endif
-
+
ulLcCb = NULLP;
-
+
#ifndef LTE_L2_MEAS
- UNUSED(slot);
+ UNUSED(slot);
#endif
if(pdu->sduLst.first)
{
sdu = (RgMacSdu*)(pdu->sduLst.first->node);
- glblueCb4 = ueCb;
+ glblueCb4 = ueCb;
if ((sdu->lcId == RG_CCCH_LCID))
{
- /* code for common channel dat indications */
- if ((ret = rgAllocShrablSBuf (inst,(Data**)&cDatInd, sizeof(RgRguCmnDatInd))) != ROK)
- {
- return RFAILED;
- }
- cDatInd->cellId = cellCb->cellId;
- cDatInd->rnti = ueCb->ueId;
- /* rg001.101: Corrected lcId value for common data indication */
- cDatInd->lcId = cellCb->ulCcchId;
- cDatInd->pdu = sdu->mBuf;
- SFndLenMsg (sdu->mBuf, &ccchSz);
- /* Fix : syed Contention resolution ID copy should consider only
- * 6 bytes of information from sdu->mBuf. Incase of CCCH sdu for reest
- * message/psuedo reest message, ccchSz can go beyond 6 and can corrupt
- * other fields of ueCb. */
- if (ccchSz >= RG_CRES_LEN)
- {
- SCpyMsgFix (sdu->mBuf, (MsgLen)0, RG_CRES_LEN, ueCb->contResId.resId,
- &cpySz);
- }
+ /* code for common channel dat indications */
+ if ((ret = rgAllocShrablSBuf (inst,(Data**)&cDatInd, sizeof(RgRguCmnDatInd))) != ROK)
+ {
+ return RFAILED;
+ }
+ cDatInd->cellId = cellCb->cellId;
+ cDatInd->rnti = ueCb->ueId;
+ /* rg001.101: Corrected lcId value for common data indication */
+ cDatInd->lcId = cellCb->ulCcchId;
+ cDatInd->pdu = sdu->mBuf;
+ SFndLenMsg (sdu->mBuf, &ccchSz);
+ /* Fix : syed Contention resolution ID copy should consider only
+ * 6 bytes of information from sdu->mBuf. Incase of CCCH sdu for reest
+ * message/psuedo reest message, ccchSz can go beyond 6 and can corrupt
+ * other fields of ueCb. */
+ if (ccchSz >= RG_CRES_LEN)
+ {
+ SCpyMsgFix (sdu->mBuf, (MsgLen)0, RG_CRES_LEN, ueCb->contResId.resId,
+ &cpySz);
+ }
#ifdef XEON_SPECIFIC_CHANGES
- CM_LOG_DEBUG(CM_LOG_ID_MAC, "CCCH SDU of size(%d) received for UE(%d) CRES[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x] Time[%d %d]\n", ((S16)ccchSz), ueCb->ueId,ueCb->contResId.resId[0], ueCb->contResId.resId[1], ueCb->contResId.resId[2], ueCb->contResId.resId[3], ueCb->contResId.resId[4], ueCb->contResId.resId[5], cellCb->crntTime.sfn, cellCb->crntTime.slot);
+ CM_LOG_DEBUG(CM_LOG_ID_MAC, "CCCH SDU of size(%d) received for UE(%d) CRES[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x] Time[%d %d]\n", ((S16)ccchSz), ueCb->ueId,ueCb->contResId.resId[0], ueCb->contResId.resId[1], ueCb->contResId.resId[2], ueCb->contResId.resId[3], ueCb->contResId.resId[4], ueCb->contResId.resId[5], cellCb->crntTime.sfn, cellCb->crntTime.slot);
#endif
- sdu->mBuf = NULLP;
- rgUIMSndCmnDatInd(inst,cellCb->rguUlSap,cDatInd);
- return ROK;
+ sdu->mBuf = NULLP;
+ rgUIMSndCmnDatInd(inst,cellCb->rguUlSap,cDatInd);
+ return ROK;
} /* end of common channel processing */
#ifndef SS_RBUF
if ((ret = rgAllocShrablSBuf (inst,(Data**)&dDatInd, sizeof(RgRguDedDatInd))) != ROK)
{
- return RFAILED;
+ return RFAILED;
}
#else
- glblueCb5 = ueCb;
+ glblueCb5 = ueCb;
elem = SRngGetWIndx(SS_RNG_BUF_ULMAC_TO_ULRLC);
if (NULLP == elem)
{
- return RFAILED;
+ return RFAILED;
}
dDatInd = (RgRguDedDatInd *)elem;
memset(dDatInd, 0x00, sizeof(RgRguDedDatInd));
ulSf = &cellCb->ulSf[(slot % RG_NUM_SUB_FRAMES)];
if(ulSf->ueUlAllocInfo != NULLP)
{
- for(idx1 = 0; idx1 < ulSf->numUe; idx1++)
- {
- if(ulSf->ueUlAllocInfo[idx1].rnti == ueCb->ueId)
- {
- numPrb = ulSf->ueUlAllocInfo[idx1].numPrb;
- break;
- }
- }
+ for(idx1 = 0; idx1 < ulSf->numUe; idx1++)
+ {
+ if(ulSf->ueUlAllocInfo[idx1].rnti == ueCb->ueId)
+ {
+ numPrb = ulSf->ueUlAllocInfo[idx1].numPrb;
+ break;
+ }
+ }
}
#endif
node = pdu->sduLst.first;
while (node)
{
sdu = (RgMacSdu*)node->node;
-
+
ulLcCb = rgDBMGetUlDedLcCb (ueCb, sdu->lcId);
-
+
if(ulLcCb == NULLP)
{
- RLOG_ARG2(L_ERROR,DBG_CELLID,cellCb->cellId,"Unconfigured LCID:%d CRNTI:%d"
- ,sdu->lcId,ueCb->ueId);
- /* ccpu00128443: Fix for memory leak */
- /* Fix : syed Neccessary to set sdu->mBuf = NULLP */
- RG_FREE_MSG(sdu->mBuf);
- node = node->next;
- continue;
+ DU_LOG("\nERROR --> MAC : Unconfigured LCID:%d CRNTI:%d"
+ ,sdu->lcId,ueCb->ueId);
+ /* ccpu00128443: Fix for memory leak */
+ /* Fix : syed Neccessary to set sdu->mBuf = NULLP */
+ RG_FREE_MSG(sdu->mBuf);
+ node = node->next;
+ continue;
}
#ifdef RLC_STA_PROC_IN_MAC/* RLC Status PDU Processing */
{
- S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId,
- CmLteCellId cellId,CmLteRnti rnti,CmLteLcId lcId,Buffer *rlcSdu);
-
- if(ROK == rlcProcDlStatusPdu(&(cellCb->rguDlSap->sapCfg.sapPst),
- cellCb->rguDlSap->sapCfg.suId,
- cellCb->cellId,ueCb->ueId,sdu->lcId,sdu->mBuf))
- {
- RG_FREE_MSG(sdu->mBuf);
- node = node->next;
- continue;
- }
+ S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId,
+ CmLteCellId cellId,CmLteRnti rnti,CmLteLcId lcId,Buffer *rlcSdu);
+
+ if(ROK == rlcProcDlStatusPdu(&(cellCb->rguDlSap->sapCfg.sapPst),
+ cellCb->rguDlSap->sapCfg.suId,
+ cellCb->cellId,ueCb->ueId,sdu->lcId,sdu->mBuf))
+ {
+ RG_FREE_MSG(sdu->mBuf);
+ node = node->next;
+ continue;
+ }
}
#endif
* of the freed memory */
if (dDatInd->numLch >= RGU_MAX_LC)
{
- if ((ret = rgUIMSndDedDatInd(inst,ueCb->rguUlSap,dDatInd)) != ROK)
- {
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,
- "Failed to send datIndication to RGU CRNTI:%d",ueCb->ueId);
- return (ret);
- }
+ if ((ret = rgUIMSndDedDatInd(inst,ueCb->rguUlSap,dDatInd)) != ROK)
+ {
+ DU_LOG("\nERROR --> MAC : Failed to send datIndication to RGU CRNTI:%d",ueCb->ueId);
+ return (ret);
+ }
#ifndef SS_RBUF
- if ((ret = rgAllocShrablSBuf (inst,(Data**)&dDatInd, sizeof(RgRguDedDatInd))) != ROK)
- {
- return RFAILED;
- }
+ if ((ret = rgAllocShrablSBuf (inst,(Data**)&dDatInd, sizeof(RgRguDedDatInd))) != ROK)
+ {
+ return RFAILED;
+ }
#else
- elem = SRngGetWIndx(SS_RNG_BUF_ULMAC_TO_ULRLC);
- if (NULLP == elem)
- {
- return RFAILED;
- }
- dDatInd = (RgRguDedDatInd *)elem;
- memset(dDatInd, 0x00, sizeof(RgRguDedDatInd));
+ elem = SRngGetWIndx(SS_RNG_BUF_ULMAC_TO_ULRLC);
+ if (NULLP == elem)
+ {
+ return RFAILED;
+ }
+ dDatInd = (RgRguDedDatInd *)elem;
+ memset(dDatInd, 0x00, sizeof(RgRguDedDatInd));
#endif
- dDatInd->cellId = cellCb->cellId;
- dDatInd->rnti = ueCb->ueId;
- dDatInd->numLch = 0;
+ dDatInd->cellId = cellCb->cellId;
+ dDatInd->rnti = ueCb->ueId;
+ dDatInd->numLch = 0;
}
dDatInd->lchData[dDatInd->numLch].lcId = sdu->lcId;
dDatInd->lchData[dDatInd->numLch].pdu.mBuf[dDatInd->lchData[dDatInd->numLch].pdu.numPdu] = sdu->mBuf;
#ifdef LTE_L2_MEAS
if(ulLcCb->measOn)
{
- ueCb->ul.lcgArr[lcgId].lcgBsInfo.outStndngBs -= bufSz;
+ ueCb->ul.lcgArr[lcgId].lcgBsInfo.outStndngBs -= bufSz;
}
#endif
//if ((lcgBytes != NULLP) && (ueCb->ul.lcgArr[lcgId].isGbr == TRUE))
if (lcgBytes != NULLP)
{
- lcgBytes[lcgId] += bufSz;
+ lcgBytes[lcgId] += bufSz;
}
sdu->mBuf = NULLP;
dDatInd->numLch++;
/* KWORK_FIX: Modified the index from lcId to lcId-1 for handling lcId 10 properly */
if (ueCb->ul.spsLcId[sdu->lcId-1] == TRUE)
{
- ueCb->ul.spsDatRcvd++;
+ ueCb->ul.spsDatRcvd++;
}
-
+
if(isSpsRnti)
{
- /* Data rcvd on CRNTI*/
- /* Retrieve the LCG ID of the LCID*/
- /* SPS LCG has data whose size > SID Size */
- /* Activate SPS if data recvd on SPS LCID and size > SID Packet Size */
- if((ueCb->ul.spsLcId[sdu->lcId-1] == TRUE) &&
- (sdu->len > RG_SPS_SID_PACKET_SIZE))
- {
- *spsToBeActvtd = TRUE;
- *sduSize = sdu->len;
- }
+ /* Data rcvd on CRNTI*/
+ /* Retrieve the LCG ID of the LCID*/
+ /* SPS LCG has data whose size > SID Size */
+ /* Activate SPS if data recvd on SPS LCID and size > SID Packet Size */
+ if((ueCb->ul.spsLcId[sdu->lcId-1] == TRUE) &&
+ (sdu->len > RG_SPS_SID_PACKET_SIZE))
+ {
+ *spsToBeActvtd = TRUE;
+ *sduSize = sdu->len;
+ }
}
-
+
#endif
#ifdef LTE_L2_MEAS
if(cellCb->qciArray[ulLcCb->qci].mask == TRUE)
{
- sduLen[ulLcCb->qci] = sdu->len;
- totalBytesRcvd += sdu->len;
- qciVal[ulLcCb->qci] = ulLcCb->qci;
+ sduLen[ulLcCb->qci] = sdu->len;
+ totalBytesRcvd += sdu->len;
+ qciVal[ulLcCb->qci] = ulLcCb->qci;
}
#endif
node = node->next;
for(idx2 = 0; idx2 < RGU_MAX_LC; idx2++)
{
if((cellCb->qciArray[qciVal[idx2]].mask == TRUE) &&
- totalBytesRcvd > 0)
+ totalBytesRcvd > 0)
{
- cellCb->qciArray[qciVal[idx2]].prbCount +=
- ((numPrb * sduLen[idx2]) / totalBytesRcvd);
+ cellCb->qciArray[qciVal[idx2]].prbCount +=
+ ((numPrb * sduLen[idx2]) / totalBytesRcvd);
}
-
+
/* RRM_RBC_X */
if(totalBytesRcvd > 0 && qciVal[idx2] > 0)
{
- RG_UPD_GBR_PRB(cellCb, qciVal[idx2], ((numPrb * sduLen[idx2])/totalBytesRcvd));
+ RG_UPD_GBR_PRB(cellCb, qciVal[idx2], ((numPrb * sduLen[idx2])/totalBytesRcvd));
}
/* RRM_RBC_Y */
}
#endif
-/*Added for explicit release - start*/
+ /*Added for explicit release - start*/
#ifdef LTEMAC_SPS
if(isSpsRnti && dDatInd && dDatInd->numLch)
{
if(ueCb->ul.spsDatRcvd != 0)
{
- ueCb->ul.explRelCntr = 0;
- ueCb->ul.spsDatRcvd = 0;
+ ueCb->ul.explRelCntr = 0;
+ ueCb->ul.spsDatRcvd = 0;
}
else
{
- ueCb->ul.explRelCntr++;
- if (ueCb->ul.explRelCntr == ueCb->ul.explRelCnt)
- {
- ueCb->ul.explRelCntr = 0;
- /* Indicate scheduler for explicit release */
- memset(&schPst1, 0, sizeof(Pst));
- rgGetPstToInst(&schPst1,inst, cellCb->schInstMap.schInst);
- //TODO: commented for compilation without SCH
+ ueCb->ul.explRelCntr++;
+ if (ueCb->ul.explRelCntr == ueCb->ul.explRelCnt)
+ {
+ ueCb->ul.explRelCntr = 0;
+ /* Indicate scheduler for explicit release */
+ memset(&schPst1, 0, sizeof(Pst));
+ rgGetPstToInst(&schPst1,inst, cellCb->schInstMap.schInst);
+ //TODO: commented for compilation without SCH
#if 0
- relInfo.cellSapId = cellCb->schInstMap.cellSapId;
- relInfo.cRnti = ueCb->ueId;
- relInfo.isExplRel = TRUE;
- /* Release indicator is called now through the matrix in the function below */
- //TODO: commented for compilation without SCH RgMacSchSpsRel( &schPst1, &relInfo );
-#endif
- ueCb->ul.implRelCntr = 0;
- }
+ relInfo.cellSapId = cellCb->schInstMap.cellSapId;
+ relInfo.cRnti = ueCb->ueId;
+ relInfo.isExplRel = TRUE;
+ /* Release indicator is called now through the matrix in the function below */
+ //TODO: commented for compilation without SCH RgMacSchSpsRel( &schPst1, &relInfo );
+#endif
+ ueCb->ul.implRelCntr = 0;
+ }
}
}
else
/* SPS_FIX */
if(ueCb->ul.spsDatRcvd != 0)
{
- //ueCb->ul.implRelCntr = 0;
- ueCb->ul.explRelCntr = 0;
- ueCb->ul.spsDatRcvd = 0;
+ //ueCb->ul.implRelCntr = 0;
+ ueCb->ul.explRelCntr = 0;
+ ueCb->ul.spsDatRcvd = 0;
}
}
#endif
#endif
if ((ret = rgUIMSndDedDatInd(inst,ueCb->rguUlSap,dDatInd)) != ROK)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,
- "Failed to send datIndication to RGU CRNTI:%d",ueCb->ueId);
- return (ret);
+ DU_LOG("\nERROR --> MAC : Failed to send datIndication to RGU CRNTI:%d",ueCb->ueId);
+ return (ret);
}
}
#ifndef SS_RBUF
* @return
*/
#ifdef LTEMAC_SPS
-static S16 rgTOMUtlInsSchInfo
+ static S16 rgTOMUtlInsSchInfo
(
-RgMacPdu *pdu,
-RgInfSfDatInd *sfInfo,
-RgInfCeInfo *ceInfo,
-CmLteRnti rnti,
-Bool spsToBeActvtd,
-uint16_t sduSize,
-uint32_t *lcgBytes
-)
+ RgMacPdu *pdu,
+ RgInfSfDatInd *sfInfo,
+ RgInfCeInfo *ceInfo,
+ CmLteRnti rnti,
+ Bool spsToBeActvtd,
+ uint16_t sduSize,
+ uint32_t *lcgBytes
+ )
#else
-static S16 rgTOMUtlInsSchInfo
+ static S16 rgTOMUtlInsSchInfo
(
-RgMacPdu *pdu,
-RgInfSfDatInd *sfInfo,
-RgInfCeInfo *ceInfo,
-CmLteRnti rnti,
-uint32_t *lcgBytes
-)
+ RgMacPdu *pdu,
+ RgInfSfDatInd *sfInfo,
+ RgInfCeInfo *ceInfo,
+ CmLteRnti rnti,
+ uint32_t *lcgBytes
+ )
#endif
{
S16 ret;
}
ueInfo->rnti = rnti;
-
+
ueInfo->ceInfo = *ceInfo;
ueInfo->ueLstEnt.node = (PTR)ueInfo;
for (lcgId = 1, idx = 0; lcgId < RGINF_MAX_LCG_PER_UE; lcgId++)
{
if (lcgBytes[lcgId] != 0)
{
- /* Only GBR bytes */
- ueInfo->lcgInfo[idx].lcgId = lcgId;
- ueInfo->lcgInfo[idx++].bytesRcvd = lcgBytes[lcgId];
- lcgBytes[lcgId] = 0;
+ /* Only GBR bytes */
+ ueInfo->lcgInfo[idx].lcgId = lcgId;
+ ueInfo->lcgInfo[idx++].bytesRcvd = lcgBytes[lcgId];
+ lcgBytes[lcgId] = 0;
}
}
cmLListAdd2Tail(&sfInfo->ueLst, &ueInfo->ueLstEnt);
#ifdef LTEMAC_SPS
Bool isSpsRnti=FALSE;
Pst schPst1;
- // RgInfSpsRelInfo relInfo;
+ // RgInfSpsRelInfo relInfo;
Bool spsToBeActvtd = FALSE;
uint16_t sduSize = 0;
#endif
{
datInfo = (TfuDatInfo*)node->node;
{
- MsgLen len;
- SFndLenMsg(datInfo->mBuf, &len);
- rgUlrate_tfu += len;
- if (rgUlrate_tfu > 100000)
- {
- printf("Sowmya:rgTOMDatInd datInfo->mBuf len =%d rgUlrate_tfu=%d",len,rgUlrate_tfu);
- rgUlrate_tfu = 0;
- }
+ MsgLen len;
+ SFndLenMsg(datInfo->mBuf, &len);
+ rgUlrate_tfu += len;
+ if (rgUlrate_tfu > 100000)
+ {
+ DU_LOG("\nINFO --> MAC : rgTOMDatInd datInfo->mBuf len =%d rgUlrate_tfu=%d",len,rgUlrate_tfu);
+ rgUlrate_tfu = 0;
+ }
}
}
- return(RFAILED);
+ return(RFAILED);
#endif
memset(&lcgBytes, 0, sizeof(lcgBytes));
ueCb = NULLP;
cellCb = rgCb[inst].cell;
if((cellCb == NULLP) ||
- (cellCb->cellId != datInd->cellId))
+ (cellCb->cellId != datInd->cellId))
{
-
- RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"Unable to get the cellCb for cell");
+
+ DU_LOG("\nERROR --> MAC : Unable to get the cellCb for cell");
return RFAILED;
}
/* Avoiding memset as all the fields are getting initialized further */
if (rgTOMInfAllocPduEvnt (inst,&sfInfo) != ROK)
{
err.errType = RGERR_TOM_DATIND;
- RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"Unable to Allocate PDU for DUX cell");
+ DU_LOG("\nERROR --> MAC : Unable to Allocate PDU for DUX cell");
node = datInd->datIndLst.first;
return RFAILED;
}
{
datInfo = (TfuDatInfo*)node->node;
{
- //uint32_t ulrate_tfu;
- MsgLen len;
- SFndLenMsg(datInfo->mBuf, &len);
+ //uint32_t ulrate_tfu;
+ MsgLen len;
+ SFndLenMsg(datInfo->mBuf, &len);
#ifdef STUB_TTI_HANDLING_5GTF
- // printf("Sowmya:rgTOMDatInd datInfo->mBuf len =%d",len);
+ // DU_LOG(":rgTOMDatInd datInfo->mBuf len =%d",len);
#endif
- rgUlrate_tfu += len;
+ rgUlrate_tfu += len;
#ifdef EMTC_ENABLE
- grgUlrate_tfu += len;
+ grgUlrate_tfu += len;
#endif
}
#ifdef STUB_TTI_HANDLING_5GTF
/* Lets allocate the event that needs to be passed to DUX */
if (rgTOMUtlAllocPduEvnt (inst,&pdu) != ROK)
{
- err.errType = RGERR_TOM_DATIND;
- RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"Unable to Allocate PDU for DUX cell");
- rgTOMInfFreePduEvnt (sfInfo);
- return RFAILED;
+ err.errType = RGERR_TOM_DATIND;
+ DU_LOG("\nERROR --> MAC : Unable to Allocate PDU for DUX cell");
+ rgTOMInfFreePduEvnt (sfInfo);
+ return RFAILED;
}
if ((ret = rgDUXDemuxData (inst,pdu, &ceInfo,
- &datInfo->mBuf, &err)) != ROK)
+ &datInfo->mBuf, &err)) != ROK)
{
- //exit(1);
- /* Fix: sriky memory corruption precautions */
- rgTOMUtlFreePduEvnt (pdu, TRUE);
- err.errType = RGERR_TOM_DATIND;
- RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"DUX processing failed");
- tfuSap->sapSts.numPduDrop++;
- continue;
+ //exit(1);
+ /* Fix: sriky memory corruption precautions */
+ rgTOMUtlFreePduEvnt (pdu, TRUE);
+ err.errType = RGERR_TOM_DATIND;
+ DU_LOG("\nERROR --> MAC : DUX processing failed");
+ tfuSap->sapSts.numPduDrop++;
+ continue;
}
/* It could be that a non-msg3 pdu contains a CRNTI Control element. We
* should check for CRNTI CE and if it exists the UECb must exist, also an
if (ceInfo.bitMask & RG_CCCH_SDU_PRSNT)
{
- ret = rgTOMProcCCCHSduInDatInd(pdu, prevUeCb, \
- cellCb, datInfo, &ceInfo, slot);
- if (ret == RFAILED)
- {
- rgTOMUtlFreePduEvnt (pdu, TRUE);
- err.errType = RGERR_TOM_DATIND;
- tfuSap->sapSts.numPduDrop++;
- continue;
- }
+ ret = rgTOMProcCCCHSduInDatInd(pdu, prevUeCb, \
+ cellCb, datInfo, &ceInfo, slot);
+ if (ret == RFAILED)
+ {
+ rgTOMUtlFreePduEvnt (pdu, TRUE);
+ err.errType = RGERR_TOM_DATIND;
+ tfuSap->sapSts.numPduDrop++;
+ continue;
+ }
} /* end of Msg3 processing */
else if (ceInfo.bitMask & RG_CRNTI_CE_PRSNT)
{
- ret = rgTOMProcCrntiCEInDatInd(pdu, prevUeCb, \
- cellCb, datInfo, &ceInfo, slot);
- if (ret == RFAILED)
- {
- rgTOMUtlFreePduEvnt (pdu, TRUE);
- err.errType = RGERR_TOM_DATIND;
- tfuSap->sapSts.numPduDrop++;
- continue;
- }
+ ret = rgTOMProcCrntiCEInDatInd(pdu, prevUeCb, \
+ cellCb, datInfo, &ceInfo, slot);
+ if (ret == RFAILED)
+ {
+ rgTOMUtlFreePduEvnt (pdu, TRUE);
+ err.errType = RGERR_TOM_DATIND;
+ tfuSap->sapSts.numPduDrop++;
+ continue;
+ }
} /* end of CRNTI based message */
else
{
- ueCb = rgDBMGetUeCb (cellCb, datInfo->rnti);
- if (ueCb == NULLP)
- {
+ ueCb = rgDBMGetUeCb (cellCb, datInfo->rnti);
+ if (ueCb == NULLP)
+ {
#ifdef LTEMAC_SPS
- /* Try getting the UE using SPS-RNTI. */
- ueCb = rgDBMGetSpsUeCb (cellCb, datInfo->rnti);
- if (ueCb != NULLP)
- {
- isSpsRnti = TRUE;
- /* Increment implrelCntr for an empty transmission */
- if (pdu->sduLst.count == 0)
- {
- ueCb->ul.implRelCntr++;
- if (ueCb->ul.implRelCntr == ueCb->ul.implRelCnt)
- {
- /* Indicate scheduler for implicit release */
- memset(&schPst1, 0, sizeof(Pst));
- rgGetPstToInst(&schPst1,inst, cellCb->schInstMap.schInst);
-
- ueCb->ul.implRelCntr = 0;
- ueCb->ul.explRelCntr = 0;
+ /* Try getting the UE using SPS-RNTI. */
+ ueCb = rgDBMGetSpsUeCb (cellCb, datInfo->rnti);
+ if (ueCb != NULLP)
+ {
+ isSpsRnti = TRUE;
+ /* Increment implrelCntr for an empty transmission */
+ if (pdu->sduLst.count == 0)
+ {
+ ueCb->ul.implRelCntr++;
+ if (ueCb->ul.implRelCntr == ueCb->ul.implRelCnt)
+ {
+ /* Indicate scheduler for implicit release */
+ memset(&schPst1, 0, sizeof(Pst));
+ rgGetPstToInst(&schPst1,inst, cellCb->schInstMap.schInst);
+
+ ueCb->ul.implRelCntr = 0;
+ ueCb->ul.explRelCntr = 0;
#if 0
- relInfo.cellSapId = cellCb->schInstMap.cellSapId;
- relInfo.cRnti = ueCb->ueId;
- relInfo.isExplRel= FALSE;
- //TODO: commented for compilation without SCH RgMacSchSpsRel(&schPst1, &relInfo);
+ relInfo.cellSapId = cellCb->schInstMap.cellSapId;
+ relInfo.cRnti = ueCb->ueId;
+ relInfo.isExplRel= FALSE;
+ //TODO: commented for compilation without SCH RgMacSchSpsRel(&schPst1, &relInfo);
#endif
- }
- }
- else
- {
- /* Reset the implrelCntr */
- ueCb->ul.implRelCntr = 0;
- }
- }
- else
+ }
+ }
+ else
+ {
+ /* Reset the implrelCntr */
+ ueCb->ul.implRelCntr = 0;
+ }
+ }
+ else
#endif
- {
- /* Perform failure if ueCb is still NULLP */
- rgTOMUtlFreePduEvnt (pdu, TRUE);
- err.errType = RGERR_TOM_DATIND;
- RLOG_ARG1(L_ERROR,DBG_CELLID,datInd->cellId,"RNTI:%d Unable to get the UE CB",
- datInfo->rnti);
- tfuSap->sapSts.numPduDrop++;
- continue;
- }
- }
+ {
+ /* Perform failure if ueCb is still NULLP */
+ rgTOMUtlFreePduEvnt (pdu, TRUE);
+ err.errType = RGERR_TOM_DATIND;
+ DU_LOG("\nERROR --> MAC : RNTI:%d Unable to get the UE CB",
+ datInfo->rnti);
+ tfuSap->sapSts.numPduDrop++;
+ continue;
+ }
+ }
#ifdef LTE_L2_MEAS
- rgTOMUtlL2MStoreBufSz(ueCb, &ceInfo);
- rgTOML2MCompileActiveLCs (cellCb, ueCb, pdu, &ceInfo);
+ rgTOMUtlL2MStoreBufSz(ueCb, &ceInfo);
+ rgTOML2MCompileActiveLCs (cellCb, ueCb, pdu, &ceInfo);
#endif
#ifdef LTEMAC_SPS
- if ((ret = rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,&spsToBeActvtd,&sduSize, slot, (uint32_t *)&lcgBytes)) != ROK)
+ if ((ret = rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,&spsToBeActvtd,&sduSize, slot, (uint32_t *)&lcgBytes)) != ROK)
#else
- if ((ret = rgTOMUtlProcMsg (cellCb, ueCb, pdu, slot, (uint32_t *)&lcgBytes)) != ROK)
+ if ((ret = rgTOMUtlProcMsg (cellCb, ueCb, pdu, slot, (uint32_t *)&lcgBytes)) != ROK)
#endif /* LTEMAC_SPS */
- {
- rgTOMUtlFreePduEvnt (pdu, TRUE);
- err.errType = RGERR_TOM_DATIND;
- RLOG_ARG1(L_ERROR,DBG_CELLID,datInd->cellId,
- "Unable to handle Data Indication CRNTI:%d",ueCb->ueId);
- tfuSap->sapSts.numPduDrop++;
- continue;
- }
+ {
+ rgTOMUtlFreePduEvnt (pdu, TRUE);
+ err.errType = RGERR_TOM_DATIND;
+ DU_LOG("\nERROR --> MAC : Unable to handle Data Indication CRNTI:%d",ueCb->ueId);
+ tfuSap->sapSts.numPduDrop++;
+ continue;
+ }
}
-
+
#ifdef LTEMAC_SPS
if(rgTOMUtlInsSchInfo(pdu, sfInfo, &ceInfo, datInfo->rnti,spsToBeActvtd,sduSize, (uint32_t *)&lcgBytes) != ROK)
#else
- if(rgTOMUtlInsSchInfo(pdu, sfInfo, &ceInfo, datInfo->rnti, (uint32_t *)&lcgBytes) != ROK)
+ if(rgTOMUtlInsSchInfo(pdu, sfInfo, &ceInfo, datInfo->rnti, (uint32_t *)&lcgBytes) != ROK)
#endif
-
- {
- rgTOMInfFreePduEvnt (sfInfo);
- rgTOMUtlFreePduEvnt (pdu, FALSE);
- return RFAILED;
- }
+
+ {
+ rgTOMInfFreePduEvnt (sfInfo);
+ rgTOMUtlFreePduEvnt (pdu, FALSE);
+ return RFAILED;
+ }
/* free up the PDU memory */
rgTOMUtlFreePduEvnt (pdu, FALSE);
}
if(cellCb->ulSf[(slot % RG_NUM_SUB_FRAMES)].ueUlAllocInfo != NULLP)
{
/*ccpu00117052 - MOD - Passing double for proper NULLP
- assignment */
+ assignment */
rgFreeSBuf(inst,(Data **)&(cellCb->ulSf[(slot % RG_NUM_SUB_FRAMES)].ueUlAllocInfo),
- ((cellCb->ulSf[(slot % RG_NUM_SUB_FRAMES)].numUe) * sizeof(RgUeUlAlloc)));
+ ((cellCb->ulSf[(slot % RG_NUM_SUB_FRAMES)].numUe) * sizeof(RgUeUlAlloc)));
}
#endif
/* RRM_RBC_X */
/* Update PRB used for all GBR QCIs to scheduler */
- memcpy( &sfInfo->qcisUlPrbCnt[0],
- &cellCb->qcisUlPrbCnt[0],
- (RGM_MAX_QCI_REPORTS * sizeof(uint32_t)));
- /* clear the cellCb ul prb value */
- memset(&cellCb->qcisUlPrbCnt[0], 0,
- (RGM_MAX_QCI_REPORTS * sizeof(uint32_t)));
+ memcpy( &sfInfo->qcisUlPrbCnt[0],
+ &cellCb->qcisUlPrbCnt[0],
+ (RGM_MAX_QCI_REPORTS * sizeof(uint32_t)));
+ /* clear the cellCb ul prb value */
+ memset(&cellCb->qcisUlPrbCnt[0], 0,
+ (RGM_MAX_QCI_REPORTS * sizeof(uint32_t)));
/* RRM_RBC_Y */
* -# ROK
* -# RFAILED
**/
-static S16 rgHndlCmnChnl
+ static S16 rgHndlCmnChnl
(
-RgCellCb *cell,
-CmLteTimingInfo timingInfo,
-RgInfCmnLcInfo *cmnLcInfo,
-RgErrInfo *err
-)
+ RgCellCb *cell,
+ CmLteTimingInfo timingInfo,
+ RgInfCmnLcInfo *cmnLcInfo,
+ RgErrInfo *err
+ )
{
- #if (ERRCLASS & ERRCLS_DEBUG)
+#if (ERRCLASS & ERRCLS_DEBUG)
RgPcchLcCb *pcch;
- #endif
+#endif
#ifndef RGR_SI_SCH
RgBcchDlschLcCb *bcch;
#if (ERRCLASS & ERRCLS_DEBUG)
if(cmnLcInfo->bitMask & RGINF_BCH_INFO)
{
#ifndef RGR_SI_SCH
- #if (ERRCLASS & ERRCLS_DEBUG)
+#if (ERRCLASS & ERRCLS_DEBUG)
if(NULLP == (bch = rgDBMGetBcchOnBch(cell)))
{
- return RFAILED;
+ return RFAILED;
}
if(cmnLcInfo->bchInfo.lcId != bch->lcId)
{
- return RFAILED;
+ return RFAILED;
}
- #endif
+#endif
if (rgAllocShrablSBuf (inst,(Data**)&staInd, sizeof(RguCStaIndInfo)) != ROK)
{
- err->errCause = RGERR_TOM_MEM_EXHAUST;
- return RFAILED;
+ err->errCause = RGERR_TOM_MEM_EXHAUST;
+ return RFAILED;
}
staInd->cellId = cell->cellId;
staInd->rnti = RG_INVALID_RNTI;
staInd->lcId = cmnLcInfo->bchInfo.lcId;
staInd->transId = (timingInfo.sfn << 8) | (timingInfo.slot);
-/* ADD Changes for Downlink UE Timing Optimization */
+ /* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
dlSf->remDatReqCnt++;
#endif
if (rgUIMSndCmnStaInd (inst,cell->rguDlSap,staInd) != ROK)
{
- return RFAILED;
+ return RFAILED;
}
#else
/*Store the received BCH Data in the scheduled subframe*/
if(cmnLcInfo->bitMask & RGINF_PCCH_INFO)
{
- #if (ERRCLASS & ERRCLS_DEBUG)
+#if (ERRCLASS & ERRCLS_DEBUG)
if(NULLP == (pcch = rgDBMGetPcch(cell)))
{
- return RFAILED;
+ return RFAILED;
}
if(cmnLcInfo->pcchInfo.lcId != pcch->lcId)
{
- return RFAILED;
+ return RFAILED;
}
- #endif
+#endif
dlSf->pcch.pdcch.rnti =
- cmnLcInfo->pcchInfo.rnti;
+ cmnLcInfo->pcchInfo.rnti;
dlSf->pcch.pdcch.dci =
- cmnLcInfo->pcchInfo.dciInfo;
+ cmnLcInfo->pcchInfo.dciInfo;
#ifdef TFU_UPGRADE
/* ccpu00132314-ADD-Fill the tx Pwr offset from scheduler */
dlSf->pcch.txPwrOffset = cmnLcInfo->pcchInfo.txPwrOffset;
#endif
if (rgAllocShrablSBuf (inst,(Data**)&staInd, sizeof(RguCStaIndInfo)) != ROK)
{
- err->errCause = RGERR_TOM_MEM_EXHAUST;
- return RFAILED;
+ err->errCause = RGERR_TOM_MEM_EXHAUST;
+ return RFAILED;
}
staInd->cellId = cell->cellId;
staInd->rnti = RG_INVALID_RNTI;
staInd->lcId = cmnLcInfo->pcchInfo.lcId;
staInd->transId = (timingInfo.sfn << 8) | (timingInfo.slot);
-/* ADD Changes for Downlink UE Timing Optimization */
+ /* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
dlSf->remDatReqCnt++;
#endif
*/
if (rgUIMSndCmnStaInd (inst,cell->rguDlSap,staInd) != ROK)
{
- return RFAILED;
+ return RFAILED;
}
}
if(cmnLcInfo->bitMask & RGINF_BCCH_INFO)
{
dlSf->bcch.pdcch.rnti =
- cmnLcInfo->bcchInfo.rnti;
+ cmnLcInfo->bcchInfo.rnti;
dlSf->bcch.pdcch.dci =
- cmnLcInfo->bcchInfo.dciInfo;
+ cmnLcInfo->bcchInfo.dciInfo;
#ifdef TFU_UPGRADE
/* ccpu00132314-ADD-Fill the tx Pwr offset from scheduler */
dlSf->bcch.txPwrOffset = cmnLcInfo->bcchInfo.txPwrOffset;
#endif
#ifndef RGR_SI_SCH
if(NULLP ==
- (bcch=rgDBMGetBcchOnDlsch(cell,cmnLcInfo->bcchInfo.lcId)))
+ (bcch=rgDBMGetBcchOnDlsch(cell,cmnLcInfo->bcchInfo.lcId)))
{
- return RFAILED;
+ return RFAILED;
}
if(TRUE == cmnLcInfo->bcchInfo.sndStatInd)
{
- RG_FREE_MSG(bcch->tb);
- if (rgAllocShrablSBuf (inst,(Data**)&staInd,
- sizeof(RguCStaIndInfo)) != ROK)
- {
- err->errCause = RGERR_TOM_MEM_EXHAUST;
- return RFAILED;
- }
- staInd->cellId = cell->cellId;
- staInd->rnti = RG_INVALID_RNTI;
- staInd->lcId = cmnLcInfo->bcchInfo.lcId;
- staInd->transId = (timingInfo.sfn << 8) | (timingInfo.slot);
-/* ADD Changes for Downlink UE Timing Optimization */
+ RG_FREE_MSG(bcch->tb);
+ if (rgAllocShrablSBuf (inst,(Data**)&staInd,
+ sizeof(RguCStaIndInfo)) != ROK)
+ {
+ err->errCause = RGERR_TOM_MEM_EXHAUST;
+ return RFAILED;
+ }
+ staInd->cellId = cell->cellId;
+ staInd->rnti = RG_INVALID_RNTI;
+ staInd->lcId = cmnLcInfo->bcchInfo.lcId;
+ staInd->transId = (timingInfo.sfn << 8) | (timingInfo.slot);
+ /* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
- dlSf->remDatReqCnt++;
+ dlSf->remDatReqCnt++;
#endif
- if (rgUIMSndCmnStaInd (inst,cell->rguDlSap,staInd) != ROK)
- {
- return RFAILED;
- }
+ if (rgUIMSndCmnStaInd (inst,cell->rguDlSap,staInd) != ROK)
+ {
+ return RFAILED;
+ }
}
else
{
- SCpyMsgMsg(bcch->tb, RG_GET_MEM_REGION(rgCb[inst]),
- RG_GET_MEM_POOL(rgCb[inst]), &dlSf->bcch.tb);
+ SCpyMsgMsg(bcch->tb, RG_GET_MEM_REGION(rgCb[inst]),
+ RG_GET_MEM_POOL(rgCb[inst]), &dlSf->bcch.tb);
}
#else
/*Store the received BCCH Data in the scheduled subframe*/
* -# ROK
* -# RFAILED
**/
-static S16 rgHndlSchdUe
+ static S16 rgHndlSchdUe
(
-RgCellCb *cell,
-CmLteTimingInfo timingInfo,
-RgInfUeInfo *ueInfo,
-RgErrInfo *err
-)
+ RgCellCb *cell,
+ CmLteTimingInfo timingInfo,
+ RgInfUeInfo *ueInfo,
+ RgErrInfo *err
+ )
{
* -# ROK
* -# RFAILED
**/
-static S16 rgHndlUlUeInfo
+ static S16 rgHndlUlUeInfo
(
-RgCellCb *cell,
-CmLteTimingInfo timingInfo,
-RgInfUlUeInfo *ueInfo
-)
+ RgCellCb *cell,
+ CmLteTimingInfo timingInfo,
+ RgInfUlUeInfo *ueInfo
+ )
{
Inst inst = cell->macInst - RG_INST_START;
uint8_t idx;
RgUlSf *ulSf;
S16 ret;
-
+
ulSf = &cell->ulSf[(timingInfo.slot % RGSCH_NUM_SUB_FRAMES)];
/* rg003.301-MOD- Corrected the purifier memory leak */
{
if (ulSf->ueUlAllocInfo)
{
- rgFreeSBuf(inst,(Data **)&(ulSf->ueUlAllocInfo),
- ulSf->numUe * sizeof(RgUeUlAlloc));
+ rgFreeSBuf(inst,(Data **)&(ulSf->ueUlAllocInfo),
+ ulSf->numUe * sizeof(RgUeUlAlloc));
}
}
#ifdef XEON_SPECIFIC_CHANGES
ulSf->numUe = ueInfo->numUes;
if((ulSf->ueUlAllocInfo == NULLP) && (ueInfo->numUes > 0))
{
- /* Allocate memory for ulAllocInfo */
- if((ret = rgAllocSBuf(inst,(Data**)&(cell->ulSf[(timingInfo.slot % RGSCH_NUM_SUB_FRAMES)].
- ueUlAllocInfo), ueInfo->numUes * sizeof(RgUeUlAlloc))) != ROK)
- {
- return (ret);
- }
+ /* Allocate memory for ulAllocInfo */
+ if((ret = rgAllocSBuf(inst,(Data**)&(cell->ulSf[(timingInfo.slot % RGSCH_NUM_SUB_FRAMES)].
+ ueUlAllocInfo), ueInfo->numUes * sizeof(RgUeUlAlloc))) != ROK)
+ {
+ return (ret);
+ }
}
#ifdef XEON_SPECIFIC_CHANGES
CM_MEAS_TIME((cell->crntTime.slot % RGSCH_NUM_SUB_FRAMES), CM_DBG_MAC_TTI_IND, CM_DBG_MEAS_ALLOC);
{
for(idx = 0; idx < ueInfo->numUes; idx++)
{
- ulSf->ueUlAllocInfo[idx].rnti = ueInfo->ulAllocInfo[idx].rnti;
- ulSf->ueUlAllocInfo[idx].numPrb = ueInfo->ulAllocInfo[idx].numPrb;
+ ulSf->ueUlAllocInfo[idx].rnti = ueInfo->ulAllocInfo[idx].rnti;
+ ulSf->ueUlAllocInfo[idx].numPrb = ueInfo->ulAllocInfo[idx].numPrb;
}
}
RGCPYTIMEINFO(timingInfo, ulSf->schdTime);
if(dlSf->txDone == FALSE)
{
- RLOG0(L_ERROR, "SUBFRAME Not pushed to the PHY");
+ DU_LOG("\nERROR --> MAC : SUBFRAME Not pushed to the PHY");
if (dlSf->bch.tb != NULLP)
{
- RG_FREE_MSG(dlSf->bch.tb);
+ RG_FREE_MSG(dlSf->bch.tb);
}
if (dlSf->bcch.tb != NULLP)
{
- RG_FREE_MSG(dlSf->bcch.tb);
+ RG_FREE_MSG(dlSf->bcch.tb);
}
if (dlSf->pcch.tb != NULLP)
{
- RG_FREE_MSG(dlSf->pcch.tb);
+ RG_FREE_MSG(dlSf->pcch.tb);
}
#ifdef EMTC_ENABLE
rgTOMEmtcRlsSf(dlSf);
#endif
for(idx=0; idx < dlSf->numRaRsp; idx++)
{
- RG_FREE_MSG(dlSf->raRsp[idx].rar);
+ RG_FREE_MSG(dlSf->raRsp[idx].rar);
}
}
-/* ADD Changes for Downlink UE Timing Optimization */
+ /* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
dlSf->remDatReqCnt = 0;
/* Fix[ccpu00126310]: Tracks Data Requests from RLC for both loosely and tight coupled
uint8_t i;
CmLList *node;
RgDlHqProcCb *hqP;
- RGDBGERRNEW(inst, (rgPBuf(inst),
- "Error Stale TBs in Subframes TBS list\n"));
+ DU_LOG("\nERROR --> MAC : Error Stale TBs in Subframes TBS list\n");
node = dlSf->tbs.first;
while(node)
{
- hqP = (RgDlHqProcCb*)node->node;
- node = node->next;
- if (hqP)
- {
- for(i=0;i< RG_MAX_TB_PER_UE;i++)
- {
- if (hqP->tbInfo[i].sfLnkInfo[dlSf->schdTime.slot % 2].sf == dlSf)
- {
- cmLListDelFrm(&dlSf->tbs, &(hqP->tbInfo[i].sfLnkInfo[dlSf->schdTime.slot % 2].sfLnk));
- hqP->tbInfo[i].sfLnkInfo[dlSf->schdTime.slot % 2].sfLnk.node = NULLP;
- printf("\n rgTOMRlsSf:: hqP %p \n", (Void *)hqP);
- }
- hqP->tbInfo[i].sfLnkInfo[dlSf->schdTime.slot % 2].sf = NULLP;
- }
- }
+ hqP = (RgDlHqProcCb*)node->node;
+ node = node->next;
+ if (hqP)
+ {
+ for(i=0;i< RG_MAX_TB_PER_UE;i++)
+ {
+ if (hqP->tbInfo[i].sfLnkInfo[dlSf->schdTime.slot % 2].sf == dlSf)
+ {
+ cmLListDelFrm(&dlSf->tbs, &(hqP->tbInfo[i].sfLnkInfo[dlSf->schdTime.slot % 2].sfLnk));
+ hqP->tbInfo[i].sfLnkInfo[dlSf->schdTime.slot % 2].sfLnk.node = NULLP;
+ DU_LOG("\nERROR --> MAC : rgTOMRlsSf:: hqP %p \n", (Void *)hqP);
+ }
+ hqP->tbInfo[i].sfLnkInfo[dlSf->schdTime.slot % 2].sf = NULLP;
+ }
}
- }
- /*arjun: check if dlSf laaTb list has to be freed???*/
+ }
+ }
+ /*arjun: check if dlSf laaTb list has to be freed???*/
cmLListInit(&dlSf->tbs);
dlSf->txDone = FALSE;
dlSf->numRaRsp = 0;
flowCntrlInd = cell->flowCntrlInd;
flowCntrlInd->cellId = sfInfo->cellId;
flowCntrlInd->numUes = sfInfo->flowCntrlInfo.numUes;
-
+
for (ueIdx = 0; ueIdx < sfInfo->flowCntrlInfo.numUes; ueIdx++)
{
flowCntrlInd->ueFlowCntrlInfo[ueIdx].ueId = sfInfo->flowCntrlInfo.ueFlowCntrlInfo[ueIdx].ueId;
flowCntrlInd->ueFlowCntrlInfo[ueIdx].numLcs = sfInfo->flowCntrlInfo.ueFlowCntrlInfo[ueIdx].numLcs;
-
+
for (lcIdx = 0; lcIdx < RGINF_MAX_NUM_DED_LC; lcIdx++)
{
- flowCntrlInd->ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].lcId =
- sfInfo->flowCntrlInfo.ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].lcId;
- flowCntrlInd->ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].pktAdmitCnt =
- sfInfo->flowCntrlInfo.ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].pktAdmitCnt;
-
- flowCntrlInd->ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].maxBo4FlowCtrl =
- sfInfo->flowCntrlInfo.ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].maxBo4FlowCtrl;
+ flowCntrlInd->ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].lcId =
+ sfInfo->flowCntrlInfo.ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].lcId;
+ flowCntrlInd->ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].pktAdmitCnt =
+ sfInfo->flowCntrlInfo.ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].pktAdmitCnt;
+
+ flowCntrlInd->ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].maxBo4FlowCtrl =
+ sfInfo->flowCntrlInfo.ueFlowCntrlInfo[ueIdx].lcInfo[lcIdx].maxBo4FlowCtrl;
}
}
RgUiRguFlowCntrlInd(pst, cell->rguDlSap->sapCfg.spId,flowCntrlInd); /* TODO: Rishi confirm if the suId and pst pointer is correct */
if((cell = rgCb[inst].cell) == NULLP)
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,sfInfo->cellId, "No cellCb found with cell");
+ DU_LOG("\nERROR --> MAC : No cellCb found with cell");
return RFAILED;
}
/* Fix : syed Ignore Failure Returns and continue processing.
* Incomplete processing results in state sync loss between MAC-SCH. */
#ifdef EMTC_ENABLE
- if(TRUE == cell->emtcEnable)
- {
- rgEmtcHndl(cell, sfInfo);
- }
+ if(TRUE == cell->emtcEnable)
+ {
+ rgEmtcHndl(cell, sfInfo);
+ }
#endif
rgHndlCmnChnl(cell, sfInfo->timingInfo, &sfInfo->cmnLcInfo, &err);
#ifdef LTE_L2_MEAS
if(rgHndlUlUeInfo(cell, sfInfo->ulUeInfo.timingInfo,
- &sfInfo->ulUeInfo) != ROK)
+ &sfInfo->ulUeInfo) != ROK)
{
return RFAILED;
}
RLC-MAC */
if(!(dlSf->txDone) &&
#ifdef LTE_ADV
- (TRUE == rgLaaChkAllRxTbs(dlSf)) &&
+ (TRUE == rgLaaChkAllRxTbs(dlSf)) &&
#endif
- (0 == dlSf->remDatReqCnt) && (dlSf->statIndDone) &&
- (RG_TIMEINFO_SAME(cell->crntTime, dlSf->schdTime)))
+ (0 == dlSf->remDatReqCnt) && (dlSf->statIndDone) &&
+ (RG_TIMEINFO_SAME(cell->crntTime, dlSf->schdTime)))
{
/*This is the case of rettransmission, so no need
* to wait for TTI Ind to push TFU Data Request. Send
* it right away.*/
if (ROK != rgTOMUtlProcDlSf (dlSf, cell, &err))
{
- RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to process downlink subframe for cell");
- err.errType = RGERR_ROM_DEDDATREQ;
+ DU_LOG("\nERROR --> MAC : Unable to process downlink subframe for cell");
+ err.errType = RGERR_ROM_DEDDATREQ;
}
/* Mark this frame as sent */
dlSf->txDone = TRUE;
#endif
if (sfInfo->flowCntrlInfo.numUes > 0)
{
- rgHndlFlowCntrl(cell,sfInfo);
+ rgHndlFlowCntrl(cell,sfInfo);
}
/*stoping Task*/
SStopTask(startTime, PID_MAC_SF_ALLOC_REQ);
* -# ROK
* -# RFAILED
**/
-static S16 rgTOMProcCrntiCEInDatInd
+ static S16 rgTOMProcCrntiCEInDatInd
(
-RgMacPdu *pdu,
-RgUeCb *prevUeCb,
-RgCellCb *cellCb,
-TfuDatInfo *datInfo,
-RgInfCeInfo *ceInfo,
-uint16_t slot
-)
+ RgMacPdu *pdu,
+ RgUeCb *prevUeCb,
+ RgCellCb *cellCb,
+ TfuDatInfo *datInfo,
+ RgInfCeInfo *ceInfo,
+ uint16_t slot
+ )
{
RgUeCb *ueCb = NULLP;
Inst inst = cellCb->macInst - RG_INST_START;
#ifndef LTE_L2_MEAS
- UNUSED(slot);
+ UNUSED(slot);
#endif
ueCb = rgDBMGetUeCbFromRachLst (cellCb, datInfo->rnti);
if (ueCb == NULLP)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,
- "RNTI:%d Received MSG3 with CRNTI,unable to find ueCb", ceInfo->ces.cRnti);
- return RFAILED;
+ DU_LOG("\nERROR --> MAC : RNTI:%d Received MSG3 with CRNTI,unable to find ueCb", ceInfo->ces.cRnti);
+ return RFAILED;
}
prevUeCb = rgDBMGetUeCb (cellCb, ceInfo->ces.cRnti);
if (prevUeCb == NULLP)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,
- "RNTI:%d Received MSG3 with CRNTI,unable to find ueCb", ceInfo->ces.cRnti);
- return RFAILED;
+ DU_LOG("\nERROR --> MAC : RNTI:%d Received MSG3 with CRNTI,unable to find ueCb", ceInfo->ces.cRnti);
+ return RFAILED;
}
- RLOG_ARG2(L_DEBUG,DBG_CELLID,cellCb->cellId,
- "CRNTI CE(%d) received through tmpCrnti(%d)",
- ceInfo->ces.cRnti, datInfo->rnti);
+ DU_LOG("\nERROR --> MAC : CRNTI CE(%d) received through tmpCrnti(%d)",
+ ceInfo->ces.cRnti, datInfo->rnti);
rgDBMDelUeCbFromRachLst(cellCb, ueCb);
rgRAMFreeUeCb(inst,ueCb);
ueCb = prevUeCb;
#ifdef LTEMAC_SPS
if ((rgTOMUtlProcMsg(cellCb, ueCb, pdu, FALSE,&spsToBeActvtd,&sduSize, slot, NULLP)) != ROK)
#else
- if ((rgTOMUtlProcMsg (cellCb, ueCb, pdu, slot, NULLP)) != ROK)
+ if ((rgTOMUtlProcMsg (cellCb, ueCb, pdu, slot, NULLP)) != ROK)
#endif /* LTEMAC_SPS */
- {
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,
- "RNTI:%d Processing for MSG3 failed",datInfo->rnti);
- return RFAILED;
- }
+ {
+ DU_LOG("\nERROR --> MAC : RNTI:%d Processing for MSG3 failed",datInfo->rnti);
+ return RFAILED;
+ }
return ROK;
}
/**
* -# ROK
* -# RFAILED
**/
-static S16 rgTOMProcCCCHSduInDatInd
+ static S16 rgTOMProcCCCHSduInDatInd
(
-RgMacPdu *pdu,
-RgUeCb *prevUeCb,
-RgCellCb *cellCb,
-TfuDatInfo *datInfo,
-RgInfCeInfo *ceInfo,
-uint16_t slot
-)
+ RgMacPdu *pdu,
+ RgUeCb *prevUeCb,
+ RgCellCb *cellCb,
+ TfuDatInfo *datInfo,
+ RgInfCeInfo *ceInfo,
+ uint16_t slot
+ )
{
RgUeCb *ueCb = NULLP;
Inst inst = cellCb->macInst - RG_INST_START;
#ifndef LTE_L2_MEAS
- UNUSED(slot);
+ UNUSED(slot);
#endif
if (ceInfo->bitMask & RG_CRNTI_CE_PRSNT)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,
- "CRNTI:%d Received MSG3 with CCCH",ceInfo->ces.cRnti);
- return RFAILED;
+ DU_LOG("\nERROR --> MAC : CRNTI:%d Received MSG3 with CCCH",ceInfo->ces.cRnti);
+ return RFAILED;
}
-
+
ueCb = rgDBMGetUeCbFromRachLst (cellCb, datInfo->rnti);
-
+
if (ueCb == NULLP)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,
- "RNTI:%d Processing for MSG3 failed", datInfo->rnti);
- return RFAILED;
+ DU_LOG("\nERROR --> MAC : RNTI:%d Processing for MSG3 failed", datInfo->rnti);
+ return RFAILED;
}
/* Fix: syed Drop any duplicate Msg3(CCCH Sdu) */
if (ueCb->dl.hqEnt.numHqProcs)
{
/* HqE is already initialized by a previuos Msg3 */
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"RNTI:%d Processing for MSG3 failed. Duplicate "
- "MSG3 received. Dropping", datInfo->rnti);
- return RFAILED;
+ DU_LOG("\nERROR --> MAC : RNTI:%d Processing for MSG3 failed. Duplicate "
+ "MSG3 received. Dropping", datInfo->rnti);
+ return RFAILED;
}
-
+
if(rgDHMHqEntInit(inst,&ueCb->dl.hqEnt,
- cellCb->maxDlHqProcPerUe) != ROK)
+ cellCb->maxDlHqProcPerUe) != ROK)
{
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"RNTI:%d Harq Initialization failed ",
- datInfo->rnti);
- return RFAILED;
+ DU_LOG("\nERROR --> MAC : RNTI:%d Harq Initialization failed ",
+ datInfo->rnti);
+ return RFAILED;
}
- RLOG_ARG1(L_DEBUG,DBG_CELLID,cellCb->cellId,
- "CCCH SDU received through tmpCrnti(%d)",datInfo->rnti);
+ DU_LOG("\nDEBUG --> MAC : CCCH SDU received through tmpCrnti(%d)",datInfo->rnti);
#ifdef LTEMAC_SPS
if ((rgTOMUtlProcMsg(cellCb, ueCb, pdu, FALSE,&spsToBeActvtd,&sduSize, slot, NULLP)) != ROK)
#else
- if ((rgTOMUtlProcMsg (cellCb, ueCb, pdu, slot, NULLP)) != ROK)
+ if ((rgTOMUtlProcMsg (cellCb, ueCb, pdu, slot, NULLP)) != ROK)
#endif /* LTEMAC_SPS */
- {
- RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"RNTI:%d Processing for MSG3 failed",
- datInfo->rnti);
- return RFAILED;
- }
+ {
+ DU_LOG("\nERROR --> MAC : RNTI:%d Processing for MSG3 failed",
+ datInfo->rnti);
+ return RFAILED;
+ }
return ROK;
}
while (node)
{
sdu = (RgMacSdu*)node->node;
-
+
if ((ulLcCb = rgDBMGetUlDedLcCb(ueCb, sdu->lcId)), ulLcCb != NULLP)
{
- if (ulLcCb->lcgId != 0)
- {
- ceInfo->bitMask |= RG_ACTIVE_LC_PRSNT;
- ceInfo->ulActLCs[ulLcCb->lcId - 1] = TRUE;
- }
+ if (ulLcCb->lcgId != 0)
+ {
+ ceInfo->bitMask |= RG_ACTIVE_LC_PRSNT;
+ ceInfo->ulActLCs[ulLcCb->lcId - 1] = TRUE;
+ }
}
node = node->next;
}
#endif
/**********************************************************************
-
- End of file
-**********************************************************************/
+
+ End of file
+ **********************************************************************/
Code Review / o-du / l2.git / commitdiff