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
L1-L2 Integration fixes.[Issue-ID: ODUHIGH-252]
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_dux.c
diff --git
a/src/5gnrmac/rg_dux.c
b/src/5gnrmac/rg_dux.c
index
8466d3a
..
d4cb889
100755
(executable)
--- a/
src/5gnrmac/rg_dux.c
+++ b/
src/5gnrmac/rg_dux.c
@@
-111,8
+111,8
@@
static int RLOG_MODULE_ID=4096;
_ret = SRemPreMsgMult(_unpkArray, (MsgLen) 2, _mBuf);\
if (_ret == ROK)\
{\
_ret = SRemPreMsgMult(_unpkArray, (MsgLen) 2, _mBuf);\
if (_ret == ROK)\
{\
- *_rnti = (
U16) PutHiByte(*_rnti, (U8
) _unpkArray[0]);\
- *_rnti = (
U16) PutLoByte(*_rnti, (U8
) _unpkArray[1]);\
+ *_rnti = (
uint16_t) PutHiByte(*_rnti, (uint8_t
) _unpkArray[0]);\
+ *_rnti = (
uint16_t) PutLoByte(*_rnti, (uint8_t
) _unpkArray[1]);\
}\
}
}\
}
@@
-149,29
+149,28
@@
static int RLOG_MODULE_ID=4096;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PRIVATE
S16 rgDUXInsSdu
+
static
S16 rgDUXInsSdu
(
Inst inst,
RgMacPdu *pdu,
RgMacSdu **sdu,
(
Inst inst,
RgMacPdu *pdu,
RgMacSdu **sdu,
-
U8
lcId,
-
U16
sduLen,
+
uint8_t
lcId,
+
uint16_t
sduLen,
RgErrInfo *err
)
#else
RgErrInfo *err
)
#else
-
PRIVATE
S16 rgDUXInsSdu(inst,pdu, sdu, lcId, sduLen, err)
+
static
S16 rgDUXInsSdu(inst,pdu, sdu, lcId, sduLen, err)
Inst inst;
RgMacPdu *pdu;
RgMacSdu **sdu,
Inst inst;
RgMacPdu *pdu;
RgMacSdu **sdu,
-
U8
lcId;
-
U16
sduLen;
+
uint8_t
lcId;
+
uint16_t
sduLen;
RgErrInfo *err;
#endif
{
S16 ret;
RgMacSdu *sduAloc = NULLP;
RgErrInfo *err;
#endif
{
S16 ret;
RgMacSdu *sduAloc = NULLP;
- TRC2(rgDUXInsSdu)
RG_DUX_ALLOC(pdu, sizeof(RgMacSdu), sduAloc, ret);
if(ret != ROK)
RG_DUX_ALLOC(pdu, sizeof(RgMacSdu), sduAloc, ret);
if(ret != ROK)
@@
-209,30
+208,29
@@
RgErrInfo *err;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PRIVATE
S16 rgDUXExtSubHdr
+
static
S16 rgDUXExtSubHdr
(
Inst inst,
RgMacPdu *pdu,
Buffer *mBuf,
(
Inst inst,
RgMacPdu *pdu,
Buffer *mBuf,
-
U8
*lcId,
-
U16
*len,
+
uint8_t
*lcId,
+
uint16_t
*len,
RgErrInfo *err
)
#else
RgErrInfo *err
)
#else
-
PRIVATE
S16 rgDUXExtSubHdr(inst,pdu, mBuf, lcId,
+
static
S16 rgDUXExtSubHdr(inst,pdu, mBuf, lcId,
len, err)
Inst inst;
RgMacPdu *pdu;
Buffer *mBuf;
len, err)
Inst inst;
RgMacPdu *pdu;
Buffer *mBuf;
-
U8
*lcId;
-
U16
*len;
+
uint8_t
*lcId;
+
uint16_t
*len;
RgErrInfo *err;
#endif
{
RgErrInfo *err;
#endif
{
-
U8
byte;
-
U8
fmt=0;
+
uint8_t
byte;
+
uint8_t
fmt=0;
- TRC2(rgDUXExtSubHdr)
*len = 0;
if(oduPackUInt8(&byte,mBuf) != ROK)
*len = 0;
if(oduPackUInt8(&byte,mBuf) != ROK)
@@
-293,39
+291,38
@@
RgErrInfo *err;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PRIVATE
S16 rgDUXExtCe
+
static
S16 rgDUXExtCe
(
Inst inst,
RgMacPdu *pdu,
(
Inst inst,
RgMacPdu *pdu,
-RgInfCeInfo
*ceInfo,
-Buffer
*mBuf,
-
U8
lcId,
-
U16
subPduLen,
-RgErrInfo
*err
+RgInfCeInfo *ceInfo,
+Buffer *mBuf,
+
uint8_t
lcId,
+
uint16_t
subPduLen,
+RgErrInfo *err
)
#else
)
#else
-
PRIVATE
S16 rgDUXExtCe(inst,pdu, ceInfo, mBuf,lcId,subPduLen, err)
+
static
S16 rgDUXExtCe(inst,pdu, ceInfo, mBuf,lcId,subPduLen, err)
Inst inst;
RgMacPdu *pdu;
Inst inst;
RgMacPdu *pdu;
-RgInfCeInfo
*ceInfo;
-Buffer
*mBuf;
-
U8
lcId;
-
U16
subPduLen;
-RgErrInfo
*err;
+RgInfCeInfo *ceInfo;
+Buffer *mBuf;
+
uint8_t
lcId;
+
uint16_t
subPduLen;
+RgErrInfo *err;
#endif
{
S16 ret;
#endif
{
S16 ret;
- TRC2(rgDUXExtCe);
switch(lcId)
{
case RG_EXT_PHR_LCID:
{
switch(lcId)
{
case RG_EXT_PHR_LCID:
{
-
U8
Ci;
-
U8
sCellIdx;
-
U8
extPhrOctet;
-
U8
extPhrPCmax;
+
uint8_t
Ci;
+
uint8_t
sCellIdx;
+
uint8_t
extPhrOctet;
+
uint8_t
extPhrPCmax;
RgInfExtPhrCEInfo *extPhr;
RG_UNPACK_EXT_PHR_CI(&Ci,mBuf,ret);
RgInfExtPhrCEInfo *extPhr;
RG_UNPACK_EXT_PHR_CI(&Ci,mBuf,ret);
@@
-429,7
+426,7
@@
RgErrInfo *err;
break;
case RG_LONG_BSR_LCID:
{
break;
case RG_LONG_BSR_LCID:
{
-
U8
longBsr[3] = {0}; /* KW_FIXX */
+
uint8_t
longBsr[3] = {0}; /* KW_FIXX */
RG_UNPACK_LONG_BSR(longBsr,mBuf,ret);
if(ret != ROK)
{
RG_UNPACK_LONG_BSR(longBsr,mBuf,ret);
if(ret != ROK)
{
@@
-490,24
+487,24
@@
RgErrInfo *err;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PRIVATE
S16 rgDUXExtSdu
+
static
S16 rgDUXExtSdu
(
Inst inst,
RgMacPdu *pdu,
(
Inst inst,
RgMacPdu *pdu,
-RgInfCeInfo
*ceInfo,
+RgInfCeInfo *ceInfo,
Buffer **mBuf,
Buffer **mBuf,
-
U8
lcId,
-
U16
subPduLen,
+
uint8_t
lcId,
+
uint16_t
subPduLen,
RgErrInfo *err
)
#else
RgErrInfo *err
)
#else
-
PRIVATE
S16 rgDUXExtSdu(inst,pdu, ceInfo,mBuf,lcId,subPduLen,err)
+
static
S16 rgDUXExtSdu(inst,pdu, ceInfo,mBuf,lcId,subPduLen,err)
Inst inst;
RgMacPdu *pdu;
Inst inst;
RgMacPdu *pdu;
-RgInfCeInfo
*ceInfo;
+RgInfCeInfo *ceInfo;
Buffer **mBuf;
Buffer **mBuf;
-
U8
lcId;
-
U16
subPduLen;
+
uint8_t
lcId;
+
uint16_t
subPduLen;
RgErrInfo *err;
#endif
{
RgErrInfo *err;
#endif
{
@@
-516,7
+513,6
@@
RgErrInfo *err;
Buffer *tmpBuf2 = NULLP;
RgMacSdu *sdu;
Buffer *tmpBuf2 = NULLP;
RgMacSdu *sdu;
- TRC2(rgDUXExtSdu)
if(lcId == RG_CCCH_LCID)
{
if(lcId == RG_CCCH_LCID)
{
@@
-585,10
+581,9
@@
Buffer **mBuf;
RgErrInfo *err;
#endif
{
RgErrInfo *err;
#endif
{
-
U8
lcId;
-
U16
subPduLen;
+
uint8_t
lcId;
+
uint16_t
subPduLen;
MsgLen len;
MsgLen len;
- TRC2(rgDUXDemuxData)
ceInfo->bitMask = 0x0000;
ceInfo->bitMask = 0x0000;