X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_ul_ex_ms.c;h=01fcde09a6026bf4d754887f98f78ea19ba2d98c;hb=42f73fef5ef8722af83284e0f146b2da693a1f68;hp=72b6301bd8c1f456d501117c559359aaa016890a;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_ul_ex_ms.c b/src/5gnrrlc/kw_ul_ex_ms.c index 72b6301bd..01fcde09a 100755 --- a/src/5gnrrlc/kw_ul_ex_ms.c +++ b/src/5gnrrlc/kw_ul_ex_ms.c @@ -58,13 +58,14 @@ static int RLOG_FILE_ID=206; #include "kw_ul.x" #include "kw_udx.x" +#include "rlc_mac_inf.h" #include "du_app_rlc_inf.h" #ifdef TENB_STATS #include "l2_tenb_stats.x" #endif -PUBLIC S16 rlcUlInitExt ARGS (( Void )); +S16 rlcUlInitExt ARGS (( Void )); /** * @@ -81,14 +82,13 @@ PUBLIC S16 rlcUlInitExt ARGS (( Void )); */ #ifdef ANSI -PUBLIC S16 rlcUlInitExt +S16 rlcUlInitExt ( ) #else -PUBLIC S16 rlcUlInitExt() +S16 rlcUlInitExt() #endif { - TRC2(rlcUlInitExt); return ROK; } /* kwInitExt */ @@ -123,7 +123,7 @@ PUBLIC S16 rlcUlInitExt() * */ #ifdef ANSI -PUBLIC S16 rlcUlActvInit +S16 rlcUlActvInit ( Ent ent, /* entity */ Inst inst, /* instance */ @@ -131,7 +131,7 @@ Region region, /* region */ Reason reason /* reason */ ) #else -PUBLIC S16 rlcUlActvInit(ent, inst, region, reason) +S16 rlcUlActvInit(ent, inst, region, reason) Ent ent; /* entity */ Inst inst; /* instance */ Region region; /* region */ @@ -139,7 +139,6 @@ Reason reason; /* reason */ #endif { RlcCb *tRlcCb; - TRC3(rlcUlActvInit) if (inst >= MAX_RLC_INSTANCES) { @@ -171,7 +170,7 @@ Reason reason; /* reason */ tRlcCb->init.acnt = TRUE; /* enable accounting */ tRlcCb->init.usta = TRUE; /* enable unsolicited status */ tRlcCb->init.trc = FALSE; /* enable trace */ - tRlcCb->init.procId = SFndProcId(); + tRlcCb->init.procId = ODU_GET_PROCID(); rlcCb[inst] = tRlcCb; @@ -205,20 +204,19 @@ Reason reason; /* reason */ * */ #ifdef ANSI -PUBLIC S16 rlcUlActvTsk +S16 rlcUlActvTsk ( Pst *pst, /* pst structure */ Buffer *mBuf /* message buffer */ ) #else -PUBLIC S16 rlcUlActvTsk(pst, mBuf) +S16 rlcUlActvTsk(pst, mBuf) Pst *pst; /* pst structure */ Buffer *mBuf; /* message buffer */ #endif { S16 ret = ROK; - TRC3(kwActvTsk); switch(pst->srcEnt) { @@ -229,13 +227,13 @@ Buffer *mBuf; /* message buffer */ #ifdef LCLKW case LKW_EVT_CFG_REQ: { - ret = unpackRlcConfigReq(KwMiRlcConfigReq, pst, mBuf); + ret = unpackRlcConfigReq(RlcMiRlcConfigReq, pst, mBuf); break; } case LKW_EVT_CNTRL_REQ: { - ret = cmUnpkLkwCntrlReq(KwMiLkwCntrlReq, pst, mBuf); + ret = cmUnpkLkwCntrlReq(RlcMiLkwCntrlReq, pst, mBuf); break; } @@ -247,38 +245,38 @@ Buffer *mBuf; /* message buffer */ case LKW_EVT_STS_REQ: { - ret = cmUnpkLkwStsReq(KwMiLkwStsReq, pst, mBuf); + ret = cmUnpkLkwStsReq(RlcMiLkwStsReq, pst, mBuf); break; } case LKW_EVT_STA_REQ: { - ret = cmUnpkLkwStaReq(KwMiLkwStaReq, pst, mBuf); + ret = cmUnpkLkwStaReq(RlcMiLkwStaReq, pst, mBuf); break; } /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS case LKW_EVT_L2MEAS_REQ: { - ret = cmUnpkLkwL2MeasReq(KwMiLkwL2MeasReq, pst, mBuf); + ret = cmUnpkLkwL2MeasReq(RlcMiLkwL2MeasReq, pst, mBuf); break; } case LKW_EVT_L2MEAS_SEND_REQ: { - ret = cmUnpkLkwL2MeasSendReq(KwMiLkwL2MeasSendReq, pst, mBuf); + ret = cmUnpkLkwL2MeasSendReq(RlcMiLkwL2MeasSendReq, pst, mBuf); break; } case LKW_EVT_L2MEAS_STOP_REQ: { - ret = cmUnpkLkwL2MeasStopReq(KwMiLkwL2MeasStopReq, pst, mBuf); + ret = cmUnpkLkwL2MeasStopReq(RlcMiLkwL2MeasStopReq, pst, mBuf); break; } #endif #endif /* LCLKW */ default: - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_FATAL,"Received Invalid Event[%d] from SM", @@ -291,7 +289,7 @@ Buffer *mBuf; /* message buffer */ break; } - case ENTKW: + case ENTRLC: { switch(pst->event) { @@ -323,7 +321,7 @@ Buffer *mBuf; /* message buffer */ #endif /* LCCKW */ default: - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from RLC UL", @@ -343,19 +341,19 @@ Buffer *mBuf; /* message buffer */ #ifdef LCCKW case CKW_EVT_BND_REQ: /* Bind request */ { - ret = cmUnpkCkwBndReq(KwUiCkwBndReq, pst, mBuf ); + ret = cmUnpkCkwBndReq(RlcUiCkwBndReq, pst, mBuf ); break; } case CKW_EVT_UBND_REQ: /* Unbind request */ { - ret = cmUnpkCkwUbndReq(KwUiCkwUbndReq, pst, mBuf ); + ret = cmUnpkCkwUbndReq(RlcUiCkwUbndReq, pst, mBuf ); break; } case CKW_EVT_UEIDCHG_REQ: /* Configuration request */ { - ret = cmUnpkCkwUeIdChgReq(KwUiCkwUeIdChgReq, pst, mBuf); + ret = cmUnpkCkwUeIdChgReq(RlcUiCkwUeIdChgReq, pst, mBuf); break; } @@ -364,18 +362,18 @@ Buffer *mBuf; /* message buffer */ #ifdef LCKWU case KWU_EVT_BND_REQ: /* Bind request */ { - ret = cmUnpkKwuBndReq(KwUiKwuBndReq, pst, mBuf ); + ret = cmUnpkKwuBndReq(RlcUiKwuBndReq, pst, mBuf ); break; } case KWU_EVT_UBND_REQ: /* Unbind request */ { - ret = cmUnpkKwuUbndReq(KwUiKwuUbndReq, pst, mBuf ); + ret = cmUnpkKwuUbndReq(RlcUiKwuUbndReq, pst, mBuf ); break; } #endif /* LCKWU */ default: - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from RRC", @@ -395,18 +393,18 @@ Buffer *mBuf; /* message buffer */ #ifdef LCKWU case KWU_EVT_BND_REQ: /* Bind request */ { - ret = cmUnpkKwuBndReq(KwUiKwuBndReq, pst, mBuf ); + ret = cmUnpkKwuBndReq(RlcUiKwuBndReq, pst, mBuf ); break; } case KWU_EVT_UBND_REQ: /* Unbind request */ { - ret = cmUnpkKwuUbndReq(KwUiKwuUbndReq, pst, mBuf ); + ret = cmUnpkKwuUbndReq(RlcUiKwuUbndReq, pst, mBuf ); break; } default: - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from PDCP", @@ -419,27 +417,27 @@ Buffer *mBuf; /* message buffer */ break; } - case ENTRG: + case ENTMAC: { switch(pst->event) { #ifdef LCRGU case EVTRGUBNDCFM: /* Bind request */ { - ret = cmUnpkRguBndCfm(KwLiRguBndCfm, pst, mBuf ); + ret = cmUnpkRguBndCfm(RlcLiRguBndCfm, pst, mBuf ); break; } - case EVTRLCULDAT: /* Dedicated Channel Data request */ + case EVENT_UL_DATA_TO_RLC: /* UL Data request */ { - ret = unpackRcvdUlData(RlcProcUlData, pst, mBuf); + ret = unpackRlcUlData(RlcProcUlData, pst, mBuf); break; } #endif /* LCRGU */ default: - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { RLOG1(L_ERROR,"Received Invalid Event[%d] from MAC", @@ -458,7 +456,7 @@ Buffer *mBuf; /* message buffer */ case KWU_EVT_TTI_IND: { rlcUlBatchProc(); - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); break; } } @@ -467,7 +465,7 @@ Buffer *mBuf; /* message buffer */ #endif/* End for TENB_T2K3K_SPECIFIC_CHANGES and L2_L3_SPLIT */ #ifndef UL_RLC_NET_CLUSTER #ifdef TENB_STATS - case ENTTF: + case ENTLWRMAC: { switch(pst->event) { @@ -478,14 +476,14 @@ Buffer *mBuf; /* message buffer */ tRlcCb = RLC_GET_RLCCB(pst->dstInst); TSL2SendStatsToApp(&(tRlcCb->genCfg.lmPst), 0); - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); break; } default: { printf("\n ERROR Invalid Event[%d] from CL to PDCPUL\n", pst->event); - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); break; } } @@ -499,7 +497,7 @@ Buffer *mBuf; /* message buffer */ { RLOG1(L_ERROR, "Received Invalid Source Entity[%d]",pst->event); } - ODU_PUT_MSG(mBuf); + ODU_PUT_MSG_BUF(mBuf); ret = RFAILED; break; }