X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fmac_stub.c;h=da96e98aee74ca8ce5d04aea06ef9af426739739;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=9b2fb092b716dc2ab42bfef1738763ea806dd5b9;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/mac_stub.c b/src/5gnrrlc/mac_stub.c index 9b2fb092b..da96e98ae 100644 --- a/src/5gnrrlc/mac_stub.c +++ b/src/5gnrrlc/mac_stub.c @@ -23,7 +23,7 @@ uint8_t rlcDatSn = 0; uint64_t ulDatNum = 0; -PUBLIC S16 macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta) +PUBLIC uint8_t macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta) { Pst rspPst; RlcMacSchedRepInfo *schRep; @@ -59,7 +59,7 @@ PUBLIC S16 macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta) } -PUBLIC S16 macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData) +PUBLIC uint8_t macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData) { U32 availmem; @@ -69,7 +69,7 @@ PUBLIC S16 macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData) DU_LOG("\nMAC_STUB : Received DL data from RLC to be sent to PHY"); - SPutMsg(dlData->pduInfo[0].pduBuf); + ODU_PUT_MSG(dlData->pduInfo[0].pduBuf); dlData->pduInfo[0].pduBuf = NULL; #if 0 @@ -84,7 +84,7 @@ PUBLIC S16 macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData) #endif ulData = dlData; - SGetMsg(pst->region, pst->pool, &mBuf); + ODU_GET_MSG(pst->region, pst->pool, &mBuf); macStubBuildUlData(mBuf); ulData->pduInfo[0].pduBuf = mBuf; @@ -110,7 +110,7 @@ void macStubBuildUlData(Buffer *mBuf) int datSize = 30; U32 availmem; - SAddPstMsgMult((Data *)data, datSize, mBuf); + ODU_ADD_POST_MSG_MULT((Data *)data, datSize, mBuf); /* filling IPv4 header */ CmIpv4Hdr ipv4Hdr; @@ -183,9 +183,9 @@ void macStubBuildUlData(Buffer *mBuf) revPkArray[idx] = pkArray[CM_IPV4_HDRLEN - idx -1]; /* this function automatically reverses revPkArray */ - ret = SAddPreMsgMult(revPkArray, (MsgLen)cnt, mBuf); + ret = ODU_ADD_PRE_MSG_MULT(revPkArray, (MsgLen)cnt, mBuf); - SAddPreMsgMult((Data *)&rlcDatSn, sizeof(uint8_t), mBuf); + ODU_ADD_PRE_MSG_MULT((Data *)&rlcDatSn, sizeof(uint8_t), mBuf); #if 0 SRegInfoShow(0, &availmem); SRegInfoShow(1, &availmem);