X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_tmm_dl.c;h=26c5a3c039d1ec082184056b02a98519e64d308b;hb=9c929d38c3bc6ae39ed658d0a7297612e5525b00;hp=e144db0d1dcb4a88be45416a9e8648f606724755;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_tmm_dl.c b/src/5gnrrlc/kw_tmm_dl.c index e144db0d1..26c5a3c03 100755 --- a/src/5gnrrlc/kw_tmm_dl.c +++ b/src/5gnrrlc/kw_tmm_dl.c @@ -25,9 +25,9 @@ Desc: Source code for RLC Transparent mode assembly and reassembly.This file contains following functions - --kwTmmQSdu - --kwTmmSndToLi - --kwTmmRcvFrmLi + --rlcTmmQSdu + --rlcTmmSndToLi + --rlcTmmRcvFrmLi --kwTmmReEstablish File: kw_tmm_dl.c @@ -42,18 +42,7 @@ static int RLOG_FILE_ID=200; */ /* header (.h) include files */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ - -#include "gen.h" /* general */ -#include "ssi.h" /* system services */ -#include "cm5.h" /* common timer defines */ -#include "cm_tkns.h" /* common tokens defines */ -#include "cm_mblk.h" /* common memory allocation library defines */ -#include "cm_llist.h" /* common link list defines */ -#include "cm_hash.h" /* common hash list defines */ -#include "cm_lte.h" /* common LTE defines */ +#include "common_def.h" #include "lkw.h" /* LKW defines */ #include "ckw.h" /* CKW defines */ #include "kwu.h" /* KWU defines */ @@ -66,16 +55,6 @@ static int RLOG_FILE_ID=200; #include "kw_dl.h" /* extern (.x) include files */ -#include "gen.x" /* general */ -#include "ssi.x" /* system services */ - -#include "cm5.x" /* common timer library */ -#include "cm_tkns.x" /* common tokens */ -#include "cm_mblk.x" /* common memory allocation */ -#include "cm_llist.x" /* common link list */ -#include "cm_hash.x" /* common hash list */ -#include "cm_lte.x" /* common LTE includes */ -#include "cm_lib.x" /* common memory allocation library */ #include "lkw.x" /* LKW */ #include "ckw.x" /* CKW */ #include "kwu.x" /* KWU */ @@ -85,9 +64,9 @@ static int RLOG_FILE_ID=200; #include "kw_udx.x" #include "kw_dl.x" -#define KW_MODULE (KW_DBGMASK_TM | KW_DBGMASK_DL) +#define RLC_MODULE (RLC_DBGMASK_TM | RLC_DBGMASK_DL) -PRIVATE Void kwTmmSndStaRsp ARGS((KwCb *gCb, KwDlRbCb *rbCb, +PRIVATE Void rlcTmmSndStaRsp ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, MsgLen bo, KwuDatReqInfo *datReqInfo)); extern U32 rgMacGT ; /** @addtogroup tmmode */ @@ -112,27 +91,27 @@ extern U32 rgMacGT ; * -# RFAILED */ #ifdef ANSI -PUBLIC Void kwTmmQSdu +Void rlcTmmQSdu ( -KwCb *gCb, -KwDlRbCb *rbCb, +RlcCb *gCb, +RlcDlRbCb *rbCb, KwuDatReqInfo *datReqInfo, Buffer *mBuf ) #else -PUBLIC Void kwTmmQSdu(gCb,rbCb,datReqInfo,mBuf) -KwCb *gCb; -KwDlRbCb *rbCb; +Void rlcTmmQSdu(gCb,rbCb,datReqInfo,mBuf) +RlcCb *gCb; +RlcDlRbCb *rbCb; KwuDatReqInfo *datReqInfo; Buffer *mBuf; #endif { - KwSdu *sdu; + RlcSdu *sdu; - TRC2(kwTmmQSdu) + TRC2(rlcTmmQSdu) - KW_ALLOC(gCb,sdu,sizeof(KwSdu)); + RLC_ALLOC(gCb,sdu,sizeof(RlcSdu)); #if (ERRCLASS & ERRCLS_ADD_RES) if ( sdu == NULLP ) { @@ -168,7 +147,7 @@ Buffer *mBuf; cmLListAdd2Tail(&(rbCb->m.tm.sduQ), &(sdu->lstEnt)); sdu->lstEnt.node = (PTR)sdu; - kwTmmSndStaRsp(gCb, rbCb, sdu->sduSz, datReqInfo); + rlcTmmSndStaRsp(gCb, rbCb, sdu->sduSz, datReqInfo); RETVOID; } @@ -189,28 +168,28 @@ Buffer *mBuf; * -# RFAILED */ #ifdef ANSI -PUBLIC Void kwTmmSndToLi +Void rlcTmmSndToLi ( -KwCb *gCb, +RlcCb *gCb, SuId suId, -KwDlRbCb *rbCb, +RlcDlRbCb *rbCb, RguCStaIndInfo *staInd ) #else -PUBLIC Void kwTmmSndToLi(gCb, suId, rbCb, staInd) -KwCb *gCb; +Void rlcTmmSndToLi(gCb, suId, rbCb, staInd) +RlcCb *gCb; SuId suId; -KwDlRbCb *rbCb; +RlcDlRbCb *rbCb; RguCStaIndInfo *staInd; #endif { CmLList *node; /* Current Link List Node */ - KwSdu *sdu; /* SDU */ + RlcSdu *sdu; /* SDU */ RlcMacData *dlData; S16 timeDiff = 0; Ticks curTime = 0; - TRC2(kwTmmSndToLi) + TRC2(rlcTmmSndToLi) CM_LLIST_FIRST_NODE(&(rbCb->m.tm.sduQ), @@ -220,7 +199,7 @@ RguCStaIndInfo *staInd; * validated with alloted (sfn,slot)in the MAC layer */ while (node != NULLP) { - sdu = (KwSdu *)(node->node); + sdu = (RlcSdu *)(node->node); if ( rbCb->lch.lChType == CM_LTE_LCH_BCCH || rbCb->lch.lChType == CM_LTE_LCH_PCCH ) { @@ -276,8 +255,8 @@ RguCStaIndInfo *staInd; rbCb->rlcId.ueId, rbCb->rlcId.cellId); cmLListDelFrm(&(rbCb->m.tm.sduQ), &sdu->lstEnt); - KW_FREE_BUF(sdu->mBuf); - KW_FREE(gCb, sdu, sizeof(KwSdu)); + RLC_FREE_BUF(sdu->mBuf); + RLC_FREE(gCb, sdu, sizeof(RlcSdu)); } else { @@ -320,8 +299,8 @@ RguCStaIndInfo *staInd; rbCb->rlcId.ueId, rbCb->rlcId.cellId); cmLListDelFrm(&(rbCb->m.tm.sduQ), &sdu->lstEnt); - KW_FREE_BUF(sdu->mBuf); - KW_FREE(gCb, sdu, sizeof(KwSdu)); + RLC_FREE_BUF(sdu->mBuf); + RLC_FREE(gCb, sdu, sizeof(RlcSdu)); continue; } @@ -372,9 +351,9 @@ RguCStaIndInfo *staInd; rbCb->rlcId.cellId); RETVOID; } - sdu = (KwSdu *)node->node; + sdu = (RlcSdu *)node->node; - KW_ALLOC_SHRABL_BUF(gCb->u.dlCb->rguDlSap[suId].pst.region, + RLC_ALLOC_SHRABL_BUF(gCb->u.dlCb->rguDlSap[suId].pst.region, gCb->u.dlCb->rguDlSap[suId].pst.pool, dlData,(Size)sizeof(RlcMacData)); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -388,11 +367,11 @@ RguCStaIndInfo *staInd; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ - dlData->timeToTx.sfn = sdu->mode.tm.sfn; - dlData->timeToTx.slot = sdu->mode.tm.slot; + dlData->slotInfo.sfn = sdu->mode.tm.sfn; + dlData->slotInfo.slot = sdu->mode.tm.slot; dlData->cellId = rbCb->rlcId.cellId; dlData->rnti = sdu->mode.tm.rnti; - dlData->nmbPdu = 1; + dlData->numPdu = 1; dlData->pduInfo[0].commCh = TRUE; dlData->pduInfo[0].lcId = rbCb->lch.lChId; dlData->pduInfo[0].pduBuf = sdu->mBuf; @@ -401,19 +380,19 @@ RguCStaIndInfo *staInd; gCb->genSts.bytesSent += sdu->sduSz; gCb->genSts.pdusSent++; - kwUtlIncrementKwuStsSduTx(gCb->u.dlCb->kwuDlSap + rbCb->kwuSapId); + rlcUtlIncrementKwuStsSduTx(gCb->u.dlCb->rlcKwuDlSap + rbCb->k1wuSapId); /* remove SDU from queue */ sdu->mBuf = NULLP; cmLListDelFrm(&(rbCb->m.tm.sduQ), &sdu->lstEnt); - KW_FREE(gCb,sdu, sizeof(KwSdu)); + RLC_FREE(gCb,sdu, sizeof(RlcSdu)); /* If trace flag is enabled send the trace indication */ if(gCb->init.trc == TRUE) { /* Populate the trace params */ - kwLmmSendTrc(gCb,EVTRLCDLDAT, NULLP); + rlcLmmSendTrc(gCb,EVTRLCDLDAT, NULLP); } RlcMacSendDlData(&(gCb->u.dlCb->rguDlSap[suId].pst), @@ -438,24 +417,24 @@ RguCStaIndInfo *staInd; * -# ROK */ #ifdef ANSI -PUBLIC Void kwDlTmmReEstablish +Void rlcDlTmmReEstablish ( -KwCb *gCb, -KwDlRbCb *rbCb +RlcCb *gCb, +RlcDlRbCb *rbCb ) #else -PUBLIC Void kwDlTmmReEstablish(gCb,rbCb) -KwCb *gCb; -KwDlRbCb *rbCb; +Void rlcDlTmmReEstablish(gCb,rbCb) +RlcCb *gCb; +RlcDlRbCb *rbCb; #endif { - TRC2(kwDlTmmReEstablish) + TRC2(rlcDlTmmReEstablish) #ifdef LTE_L2_MEAS_RLC - kwUtlEmptySduQ(gCb, rbCb, &rbCb->m.tm.sduQ); + rlcUtlEmptySduQ(gCb, rbCb, &rbCb->m.tm.sduQ); #else - kwUtlEmptySduQ(gCb,&rbCb->m.tm.sduQ); + rlcUtlEmptySduQ(gCb,&rbCb->m.tm.sduQ); #endif RETVOID; @@ -480,31 +459,31 @@ KwDlRbCb *rbCb; */ #ifdef ANSI -PRIVATE Void kwTmmSndStaRsp +PRIVATE Void rlcTmmSndStaRsp ( -KwCb *gCb, -KwDlRbCb *rbCb, +RlcCb *gCb, +RlcDlRbCb *rbCb, MsgLen bo, KwuDatReqInfo *datReqInfo ) #else -PRIVATE Void kwTmmSndStaRsp(rbCb,bo,datReqInfo) -KwCb *gCb; -KwDlRbCb *rbCb; +PRIVATE Void rlcTmmSndStaRsp(rbCb,bo,datReqInfo) +RlcCb *gCb; +RlcDlRbCb *rbCb; MsgLen bo; KwuDatReqInfo *datReqInfo; #endif { // RguCStaRspInfo *staRspInfo; /* Status Response Information */ RlcMacBOStatus *boStatus; /* Buffer occupancy status information */ - KwRguSapCb *rguSap; /* SAP Information */ + RlcRguSapCb *rguSap; /* SAP Information */ - TRC3(kwTmmSndStaRsp) + TRC3(rlcTmmSndStaRsp) rguSap = &(gCb->u.dlCb->rguDlSap[rbCb->rguSapId]); - KW_ALLOC_SHRABL_BUF(gCb->u.dlCb->rguDlSap[rbCb->rguSapId].pst.region, + RLC_ALLOC_SHRABL_BUF(gCb->u.dlCb->rguDlSap[rbCb->rguSapId].pst.region, gCb->u.dlCb->rguDlSap[rbCb->rguSapId].pst.pool, boStatus, sizeof(RguCStaRspInfo)); #if (ERRCLASS & ERRCLS_ADD_RES) @@ -528,7 +507,7 @@ KwuDatReqInfo *datReqInfo; if(gCb->init.trc == TRUE) { /* Populate the trace params */ - kwLmmSendTrc(gCb, EVTRLCBOSTA, NULLP); + rlcLmmSendTrc(gCb, EVTRLCBOSTA, NULLP); } RlcMacSendBOStatus(&rguSap->pst, rguSap->spId, boStatus);