X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fkwu.c;h=04c7eee62c5d22a70b887517d23c275fa90fffa9;hb=ef711b0830aedde36f4a1beceed146d08e77ce58;hp=d9c6408e643058c008cd54b78cb0ce3f6ca83a97;hpb=829bbd114f1c3dc00c1da47bca0a8207c049df3f;p=o-du%2Fl2.git diff --git a/src/cm/kwu.c b/src/cm/kwu.c index d9c6408e6..04c7eee62 100755 --- a/src/cm/kwu.c +++ b/src/cm/kwu.c @@ -244,14 +244,12 @@ Buffer *mBuf; PUBLIC S16 cmPkKwuDatReq ( Pst * pst, -SpId spId, KwuDatReqInfo* datReq, Buffer * mBuf ) #else -PUBLIC S16 cmPkKwuDatReq(pst, spId, datReq, mBuf) +PUBLIC S16 cmPkKwuDatReq(pst, datReq, mBuf) Pst * pst; -SpId spId; KwuDatReqInfo* datReq; Buffer * mBuf; #endif @@ -270,7 +268,7 @@ Buffer * mBuf; { case KWU_SEL_LWLC: { - if(pst->srcEnt == ENTPJ) + if(pst->srcEnt == ENTDUAPP) { /* When the Selector is LWLC, we need to allocate memory, copy * the contents and pass the pointer of the allocated memory. The @@ -334,7 +332,6 @@ Buffer * mBuf; RETVALUE(RFAILED); } - CMCHKPKLOG(SPkS16, spId, mBuf, EKWU011, pst); #ifdef L2_L3_SPLIT if(datReq->rlcId.rbType == CM_LTE_SRB) { @@ -446,14 +443,12 @@ Buffer *mBuf; PUBLIC S16 cmPkKwuDatInd ( Pst * pst, -SuId suId, KwuDatIndInfo* datInd, Buffer * mBuf ) #else -PUBLIC S16 cmPkKwuDatInd(pst, suId, datInd, mBuf) +PUBLIC S16 cmPkKwuDatInd(pst, datInd, mBuf) Pst * pst; -SuId suId; KwuDatIndInfo* datInd; Buffer * mBuf; #endif @@ -519,16 +514,6 @@ Buffer * mBuf; #else cmPkKwuDatIndInfo( (datInd), mBuf); #endif /* ERRCLASS & ERRCLS_ADD_RES */ -#if 0 - /*Commenting out the below block as no Memory Allocation happens - * in Protocol. This code will be removed once testing is done */ - if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datInd, - sizeof(KwuDatIndInfo),SS_SHARABLE_MEMORY) != ROK) - { - SPutMsg(mBuf); - RETVALUE(RFAILED); - } -#endif } break; default: @@ -541,7 +526,6 @@ Buffer * mBuf; RETVALUE(RFAILED); } - CMCHKPKLOG(SPkS16, suId, mBuf, EKWU013, pst); pst->event = (Event) KWU_EVT_DAT_IND; RETVALUE(SPstTsk(pst,mBuf)); @@ -715,14 +699,6 @@ KwuDiscSduInfo* discSdu; #else cmPkKwuDiscSduInfo( (discSdu), mBuf); #endif /* ERRCLASS & ERRCLS_ADD_RES */ -#if 0 - if (SPutSBuf(pst->region, pst->pool, (Data *)discSdu, - sizeof(KwuDiscSduInfo)) != ROK) - { - SPutMsg(mBuf); - RETVALUE(RFAILED); - } -#endif break; } } @@ -1289,9 +1265,6 @@ Buffer *mBuf; TRC3(cmUnpkKwuDatReq) - - CMCHKUNPK(SUnpkS16, &(spId), mBuf); - switch(pst->selector) { case KWU_SEL_LWLC: @@ -1301,22 +1274,6 @@ Buffer *mBuf; break; case KWU_SEL_LC: { -#if 0 - /*This will be removed once the testing is done on all platforms */ - if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datReq,\ - sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY)) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - /*MBUF_FIXX*/ - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)EKWU026, (ErrVal)0, "SGetMsg() failed"); - -#endif /* ERRCLASS & ERRCLS_ADD_RES */ - RETVALUE(ret1); - } - -#endif /* Allocate the memory statically as there is no free * in RLC */ datReq = &datReqTmp; @@ -1346,7 +1303,7 @@ Buffer *mBuf; RETVALUE(RFAILED); } - retVal = (*func)(pst, spId, datReq, mBuf); + retVal = (*func)(pst, datReq, mBuf); /* If LWLC is configured, we need to * free the memory here. */ if(pst->selector == KWU_SEL_LWLC) @@ -1397,14 +1354,11 @@ Buffer *mBuf; #endif { S16 ret1 = ROK, retVal; - SuId suId = 0; KwuDatIndInfo *datInd = NULLP; KwuDatIndInfo datIndTmp; TRC3(cmUnpkKwuDatInd) - CMCHKUNPK(SUnpkS16, &(suId), mBuf); - switch(pst->selector) { case KWU_SEL_LWLC: @@ -1457,7 +1411,7 @@ Buffer *mBuf; (ErrVal)ERRKWU, (ErrVal)ret1, "pst->selector is invalid\n"); RETVALUE(RFAILED); } - retVal = (*func)(pst, suId, datInd, mBuf); + retVal = (*func)(pst, datInd, mBuf); /* If LWLC is configured and the destination entity is PDCP, we need to * free the memory here. */ if((pst->selector == KWU_SEL_LWLC) && (pst->dstEnt == ENTPJ))