Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
DL RRC Message Transfer from DU APP to RLC [Issue-ID: ODUHIGH-45]
[o-du/l2.git]
/
src
/
5gnrrlc
/
mac_stub.c
diff --git
a/src/5gnrrlc/mac_stub.c
b/src/5gnrrlc/mac_stub.c
index
94503ba
..
7bf768b
100644
(file)
--- a/
src/5gnrrlc/mac_stub.c
+++ b/
src/5gnrrlc/mac_stub.c
@@
-23,7
+23,7
@@
uint8_t rlcDatSn = 0;
uint64_t ulDatNum = 0;
uint8_t rlcDatSn = 0;
uint64_t ulDatNum = 0;
-
PUBLIC S16
macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta)
+
uint8_t
macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta)
{
Pst rspPst;
RlcMacSchedRepInfo *schRep;
{
Pst rspPst;
RlcMacSchedRepInfo *schRep;
@@
-42,7
+42,7
@@
PUBLIC S16 macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta)
rspPst.pool = pst->pool;
/* Filling Scheduling Report */
rspPst.pool = pst->pool;
/* Filling Scheduling Report */
-
KW
_SHRABL_STATIC_BUF_ALLOC(pst->region, pst->pool, schRep, sizeof(RlcMacSchedRepInfo));
+
RLC
_SHRABL_STATIC_BUF_ALLOC(pst->region, pst->pool, schRep, sizeof(RlcMacSchedRepInfo));
schRep->cellId = boSta->cellId;
schRep->rnti = boSta->rnti;
schRep->cellId = boSta->cellId;
schRep->rnti = boSta->rnti;
@@
-59,7
+59,7
@@
PUBLIC S16 macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta)
}
}
-
PUBLIC S16
macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData)
+
uint8_t
macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData)
{
U32 availmem;
{
U32 availmem;
@@
-69,14
+69,14
@@
PUBLIC S16 macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData)
DU_LOG("\nMAC_STUB : Received DL data from RLC to be sent to PHY");
DU_LOG("\nMAC_STUB : Received DL data from RLC to be sent to PHY");
-
SPutMsg
(dlData->pduInfo[0].pduBuf);
+
ODU_PUT_MSG_BUF
(dlData->pduInfo[0].pduBuf);
dlData->pduInfo[0].pduBuf = NULL;
#if 0
dlData->pduInfo[0].pduBuf = NULL;
#if 0
-
KW
_FREE_SHRABL_BUF(pst->region, pst->pool,
+
RLC
_FREE_SHRABL_BUF(pst->region, pst->pool,
dlData, sizeof(RlcMacData));
{
dlData, sizeof(RlcMacData));
{
-
KW
_ALLOC_SHRABL_BUF(pst->region, pst->pool,
+
RLC
_ALLOC_SHRABL_BUF(pst->region, pst->pool,
ulData, sizeof(RlcMacData));
SRegInfoShow(2, &availmem);
ulData, sizeof(RlcMacData));
SRegInfoShow(2, &availmem);
@@
-84,7
+84,7
@@
PUBLIC S16 macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData)
#endif
ulData = dlData;
#endif
ulData = dlData;
-
SGetMsg
(pst->region, pst->pool, &mBuf);
+
ODU_GET_MSG_BUF
(pst->region, pst->pool, &mBuf);
macStubBuildUlData(mBuf);
ulData->pduInfo[0].pduBuf = mBuf;
macStubBuildUlData(mBuf);
ulData->pduInfo[0].pduBuf = mBuf;
@@
-100,7
+100,7
@@
PUBLIC S16 macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData)
ulDatNum++;
DU_LOG("\nMAC_STUB : UL data number %d", ulDatNum);
ulDatNum++;
DU_LOG("\nMAC_STUB : UL data number %d", ulDatNum);
- Rlc
Mac
ProcUlData(&rspPst, 1, ulData);
+ RlcProcUlData(&rspPst, 1, ulData);
return ROK;
}
return ROK;
}
@@
-110,7
+110,7
@@
void macStubBuildUlData(Buffer *mBuf)
int datSize = 30;
U32 availmem;
int datSize = 30;
U32 availmem;
-
SAddPstMsgMult
((Data *)data, datSize, mBuf);
+
ODU_ADD_POST_MSG_MULT
((Data *)data, datSize, mBuf);
/* filling IPv4 header */
CmIpv4Hdr ipv4Hdr;
/* 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 */
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);
#if 0
SRegInfoShow(0, &availmem);
SRegInfoShow(1, &availmem);