X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_dux.c;h=d037cfd04c5e3b9659e7a66483dde428b7b4f2b6;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=b39913292e08e880c9942897626aaa53ab6ab7c3;hpb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_dux.c b/src/5gnrmac/rg_dux.c
index b39913292..d037cfd04 100755
--- 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)\
    {\
-      *_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]);\
    }\
 }
 
@@ -154,8 +154,8 @@ PRIVATE S16 rgDUXInsSdu
 Inst        inst,
 RgMacPdu    *pdu,
 RgMacSdu    **sdu,
-U8          lcId,
-U16         sduLen,
+uint8_t     lcId,
+uint16_t    sduLen,
 RgErrInfo   *err
 )
 #else
@@ -163,8 +163,8 @@ PRIVATE S16 rgDUXInsSdu(inst,pdu, sdu, lcId, sduLen, err)
 Inst        inst;
 RgMacPdu    *pdu;
 RgMacSdu    **sdu,
-U8          lcId;
-U16         sduLen;
+uint8_t     lcId;
+uint16_t    sduLen;
 RgErrInfo   *err;
 #endif
 {
@@ -213,8 +213,8 @@ PRIVATE S16 rgDUXExtSubHdr
 Inst        inst,
 RgMacPdu    *pdu,
 Buffer      *mBuf,
-U8          *lcId,
-U16         *len,
+uint8_t     *lcId,
+uint16_t    *len,
 RgErrInfo   *err
 )
 #else
@@ -223,13 +223,13 @@ len, err)
 Inst        inst;
 RgMacPdu    *pdu;
 Buffer      *mBuf;
-U8          *lcId;
-U16         *len;
+uint8_t     *lcId;
+uint16_t    *len;
 RgErrInfo   *err;
 #endif
 {
-   U8             byte;
-   U8             fmt=0;
+   uint8_t             byte;
+   uint8_t             fmt=0;
  
 
    *len = 0;   
@@ -295,21 +295,21 @@ PRIVATE S16 rgDUXExtCe
 (
 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
 PRIVATE S16 rgDUXExtCe(inst,pdu, ceInfo, mBuf,lcId,subPduLen, err)
 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;
@@ -319,10 +319,10 @@ RgErrInfo    *err;
    {
       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);
@@ -426,7 +426,7 @@ RgErrInfo    *err;
          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)
             {
@@ -491,20 +491,20 @@ PRIVATE S16 rgDUXExtSdu
 (
 Inst        inst,
 RgMacPdu    *pdu,
-RgInfCeInfo  *ceInfo,
+RgInfCeInfo *ceInfo,
 Buffer      **mBuf,
-U8          lcId,
-U16         subPduLen,
+uint8_t     lcId,
+uint16_t    subPduLen,
 RgErrInfo   *err
 )
 #else
 PRIVATE S16 rgDUXExtSdu(inst,pdu, ceInfo,mBuf,lcId,subPduLen,err)
 Inst        inst;
 RgMacPdu    *pdu;
-RgInfCeInfo  *ceInfo;
+RgInfCeInfo *ceInfo;
 Buffer      **mBuf;
-U8          lcId;
-U16         subPduLen;
+uint8_t     lcId;
+uint16_t    subPduLen;
 RgErrInfo   *err;
 #endif
 {
@@ -581,8 +581,8 @@ Buffer        **mBuf;
 RgErrInfo     *err;
 #endif
 {
-   U8          lcId;
-   U16          subPduLen;
+   uint8_t     lcId;
+   uint16_t    subPduLen;
    MsgLen      len;  
 
    ceInfo->bitMask = 0x0000;