X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrrlc%2Fkw_tmm_dl.c;h=1b7aae7a0ebe4b733e28f500ea9144de02f8632f;hb=d75d1b078091768f45b83f2a745a25917e03b39d;hp=98655d96ebe294de4a319526504f55bd61aca69b;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_tmm_dl.c b/src/5gnrrlc/kw_tmm_dl.c index 98655d96e..1b7aae7a0 100755 --- a/src/5gnrrlc/kw_tmm_dl.c +++ b/src/5gnrrlc/kw_tmm_dl.c @@ -66,9 +66,9 @@ #define RLC_MODULE (RLC_DBGMASK_TM | RLC_DBGMASK_DL) -PRIVATE Void rlcTmmSendBoSta ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, - MsgLen bo, KwuDatReqInfo *datReqInfo)); -extern uint32_t rgMacGT ; +static Void rlcTmmSendBoSta ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, + MsgLen bo, RlcDatReqInfo *datReqInfo)); +uint32_t rgMacGT ; /** @addtogroup tmmode */ /*@{*/ @@ -90,21 +90,13 @@ extern uint32_t rgMacGT ; * -# ROK * -# RFAILED */ -#ifdef ANSI Void rlcTmmQSdu ( RlcCb *gCb, RlcDlRbCb *rbCb, -KwuDatReqInfo *datReqInfo, +RlcDatReqInfo *datReqInfo, Buffer *mBuf ) -#else -Void rlcTmmQSdu(gCb,rbCb,datReqInfo,mBuf) -RlcCb *gCb; -RlcDlRbCb *rbCb; -KwuDatReqInfo *datReqInfo; -Buffer *mBuf; -#endif { RlcSdu *sdu; @@ -112,10 +104,8 @@ Buffer *mBuf; #if (ERRCLASS & ERRCLS_ADD_RES) if ( sdu == NULLP ) { - RLOG_ARG2(L_FATAL,DBG_RBID,rbCb->rlcId.rbId, - "Memory Allocation failed UEID:%d CELLID:%d", - rbCb->rlcId.ueId, - rbCb->rlcId.cellId); + DU_LOG("\nERROR --> RLC_DL : Memory Allocation failed UEID:%d CELLID:%d", + rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ @@ -225,13 +215,13 @@ void rlcTmmSendToMac(RlcCb *gCb, SuId suId, RlcDlRbCb *rbCb, RguCStaIndInfo *sta (sdu->mode.tm.slot != ((slot+TFU_DELTA)%10))) { node = node->next; - DU_LOG("\nRLC: rlcTmmSendToMac: Releasing SDU of RNTI = %d for RNTI = %d \ + DU_LOG("\nINFO --> RLC_DL : rlcTmmSendToMac: Releasing SDU of RNTI = %d for RNTI = %d \ UEID:%d CELLID:%d", sdu->mode.tm.rnti, staInd->rnti, rbCb->rlcId.ueId, rbCb->rlcId.cellId); - DU_LOG("\nRLC: rlcTmmSendToMac: sfn %d slot %d UEID:%d CELLID:%d", + DU_LOG("\nINFO --> RLC_DL : rlcTmmSendToMac: sfn %d slot %d UEID:%d CELLID:%d", sfn, slot, rbCb->rlcId.ueId, rbCb->rlcId.cellId); cmLListDelFrm(&(rbCb->m.tm.sduQ), &sdu->lstEnt); - RLC_FREE_BUF(sdu->mBuf); + ODU_PUT_MSG_BUF(sdu->mBuf); RLC_FREE(gCb, sdu, sizeof(RlcSdu)); } else @@ -250,21 +240,21 @@ void rlcTmmSendToMac(RlcCb *gCb, SuId suId, RlcDlRbCb *rbCb, RguCStaIndInfo *sta { timeDiff = curTime - sdu->arrTime; } - DU_LOG("\nRLC: rlcTmmSendToMac: TMM: TmSdu Sta Indication received \ + DU_LOG("\nDEBUG --> RLC_DL : rlcTmmSendToMac: TMM: TmSdu Sta Indication received \ for Rnti %d Sdu Rnti %d UEID:%d CELLID:%d", staInd->rnti, sdu->mode.tm.rnti, rbCb->rlcId.ueId, rbCb->rlcId.cellId); - DU_LOG("\nRLC: rlcTmmSendToMac: TMM: TmSdu Sta Indication received : \ + DU_LOG("\nDEBUG --> RLC_DL : rlcTmmSendToMac: TMM: TmSdu Sta Indication received : \ timeDiff %d SduQCnt %d UEID:%d CELLID:%d", timeDiff, rbCb->m.tm.sduQ.count, rbCb->rlcId.ueId, rbCb->rlcId.cellId); if (timeDiff > 40) { /* Memory leak needs to be fixed */ node = node->next; - DU_LOG("\nRLC: rlcTmmSendToMac: timeDiff greater than 40, so deleting\ + DU_LOG("\nERROR --> RLC_DL : rlcTmmSendToMac: timeDiff greater than 40, so deleting\ the Sdu %u UEID:%d CELLID:%d", sdu->mode.tm.rnti, rbCb->rlcId.ueId, rbCb->rlcId.cellId); cmLListDelFrm(&(rbCb->m.tm.sduQ), &sdu->lstEnt); - RLC_FREE_BUF(sdu->mBuf); + ODU_PUT_MSG_BUF(sdu->mBuf); RLC_FREE(gCb, sdu, sizeof(RlcSdu)); continue; } @@ -273,19 +263,19 @@ void rlcTmmSendToMac(RlcCb *gCb, SuId suId, RlcDlRbCb *rbCb, RguCStaIndInfo *sta { /* Memory leak needs to be fixed */ node = node->next; - DU_LOG("\nRLC: rlcTmmSendToMac: TMM: Searching for Rnti %d Skipping \ + DU_LOG("\nDEBUG --> RLC_DL : rlcTmmSendToMac: TMM: Searching for Rnti %d Skipping \ Sdu for Rnti %d UEID:%d CELLID:%d", staInd->rnti, sdu->mode.tm.rnti, rbCb->rlcId.ueId, rbCb->rlcId.cellId); - DU_LOG("\nRLC: rlcTmmSendToMac: timeDiff %d sdu->arrTime %d UEID:%d CELLID:%d", + DU_LOG("\nINFO --> RLC_DL : rlcTmmSendToMac: timeDiff %d sdu->arrTime %d UEID:%d CELLID:%d", timeDiff, sdu->arrTime, rbCb->rlcId.ueId, rbCb->rlcId.cellId); - DU_LOG("\nRLC: rlcTmmSendToMac: curTime %d SduQCnt %d and continuing" + DU_LOG("\nINFO --> RLC_DL : rlcTmmSendToMac: curTime %d SduQCnt %d and continuing" " UEID:%d CELLID:%d", curTime, rbCb->m.tm.sduQ.count, rbCb->rlcId.ueId, rbCb->rlcId.cellId); continue; } else { - DU_LOG("\nRLC: rlcTmmSendToMac: TMM: TmSdu found %u UEID:%d CELLID:%d", + DU_LOG("\nDEBUG --> RLC_DL : rlcTmmSendToMac: TMM: TmSdu found %u UEID:%d CELLID:%d", sdu->mode.tm.rnti, rbCb->rlcId.ueId, rbCb->rlcId.cellId); break; } @@ -294,7 +284,7 @@ void rlcTmmSendToMac(RlcCb *gCb, SuId suId, RlcDlRbCb *rbCb, RguCStaIndInfo *sta } if ( node == NULLP ) { - DU_LOG("\nRLC: rlcTmmSendToMac: SDU not found TM Queue is empty UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : rlcTmmSendToMac: SDU not found TM Queue is empty UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; } @@ -305,7 +295,7 @@ void rlcTmmSendToMac(RlcCb *gCb, SuId suId, RlcDlRbCb *rbCb, RguCStaIndInfo *sta #if (ERRCLASS & ERRCLS_ADD_RES) if ( dlData == NULLP ) { - DU_LOG("\nRLC: rlcTmmSendToMac: Memory Allocation failed UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : rlcTmmSendToMac: Memory Allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; } @@ -325,7 +315,7 @@ void rlcTmmSendToMac(RlcCb *gCb, SuId suId, RlcDlRbCb *rbCb, RguCStaIndInfo *sta dlData->pduInfo[0].pduBuf, pduLen); if (dlData->pduInfo[0].pduBuf == NULLP ) { - DU_LOG("Memory allocation failed"); + DU_LOG("\nERROR --> RLC_DL : Memory allocation failed"); return; } ODU_COPY_MSG_TO_FIX_BUF(sdu->mBuf, 0, pduLen, \ @@ -377,17 +367,11 @@ void rlcTmmSendToMac(RlcCb *gCb, SuId suId, RlcDlRbCb *rbCb, RguCStaIndInfo *sta * @return S16 * -# ROK */ -#ifdef ANSI Void rlcDlTmmReEstablish ( RlcCb *gCb, RlcDlRbCb *rbCb ) -#else -Void rlcDlTmmReEstablish(gCb,rbCb) -RlcCb *gCb; -RlcDlRbCb *rbCb; -#endif { #ifdef LTE_L2_MEAS_RLC @@ -417,7 +401,7 @@ RlcDlRbCb *rbCb; * -# RFAILED */ -void rlcTmmSendBoSta(RlcCb *gCb, RlcDlRbCb *rbCb, MsgLen bo, KwuDatReqInfo *datReqInfo) +static void rlcTmmSendBoSta(RlcCb *gCb, RlcDlRbCb *rbCb, MsgLen bo, RlcDatReqInfo *datReqInfo) { Pst pst; /* Post structure */ RlcBoStatus *boStatus; /* Buffer occupancy status information */ @@ -426,7 +410,7 @@ void rlcTmmSendBoSta(RlcCb *gCb, RlcDlRbCb *rbCb, MsgLen bo, KwuDatReqInfo *datR boStatus, sizeof(RlcBoStatus)); if ( boStatus == NULLP ) { - DU_LOG("Memory Allocation failed UEID:%d CELLID:%d",\ + DU_LOG("\nERROR --> RLC_DL : Memory Allocation failed UEID:%d CELLID:%d",\ rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; }