X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_mux.c;h=1473e7af587c7a165a985be85e4cad4341cba328;hb=refs%2Fchanges%2F91%2F5391%2F11;hp=447ade660472e4f4549a206c438ec9e0e17ffe49;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c
index 447ade660..1473e7af5 100755
--- a/src/5gnrmac/rg_mux.c
+++ b/src/5gnrmac/rg_mux.c
@@ -66,7 +66,7 @@ static int RLOG_MODULE_ID=4096;
 #include "ss_msg.x"            /* MAC includes */
 /* local defines */
 #ifndef T2K_MEM_LEAK_DBG
-EXTERN  S16 ssGetDBufOfSize(Region region,Size size,Buffer **dBuf);
+ S16 ssGetDBufOfSize(Region region,Size size,Buffer **dBuf);
 #else
 char* file = __FILE__;
 uint32_t line = __LINE__;
@@ -79,10 +79,10 @@ uint32_t rgDlrate_rgu;
 
 /* local externs */
 
-PRIVATE Void rgMUXGet20bitRarGrnt ARGS((uint8_t ulBw,
+static Void rgMUXGet20bitRarGrnt ARGS((uint8_t ulBw,
                                         RgInfRarUlGrnt *msg3Grnt,
                                         uint8_t *grnt));
-EXTERN uint16_t rgMUXCalcRiv ARGS((uint8_t bw,
+uint16_t rgMUXCalcRiv ARGS((uint8_t bw,
                                 uint8_t rbStart,
                                 uint8_t numRb));
  
@@ -155,21 +155,13 @@ EXTERN uint16_t rgMUXCalcRiv ARGS((uint8_t bw,
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
-PRIVATE S16 rgMUXAddCes
+static S16 rgMUXAddCes
 (
 Inst           inst,
 RgBldPduInfo   *pdu,
 Buffer         *ceBuf,
 RgErrInfo      *err
 )
-#else
-PRIVATE S16 rgMUXAddCes(inst,pdu, ceShdrBuf, ceBuf, err)
-Inst           inst;
-RgBldPduInfo   *pdu;
-Buffer         *ceBuf;
-RgErrInfo      *err;
-#endif
 {
    S16            ret;
    RgMUXSubHdr    subHdr;
@@ -278,8 +270,7 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
-PRIVATE S16 rgMUXInsSdu
+static S16 rgMUXInsSdu
 (
 Inst           inst,
 MsgLen         *schdTbSz,
@@ -288,15 +279,6 @@ Buffer         *sdu,
 Buffer         *sduBuf,
 RgErrInfo      *err
 )
-#else
-PRIVATE S16 rgMUXInsSdu(inst,schdTbSz, lcId, sdu, sduBuf, err)
-Inst           inst;
-MsgLen         *schdTbSz;
-uint8_t        lcId;
-Buffer         *sdu;
-Buffer         *sduBuf;
-RgErrInfo      *err;
-#endif
 {
    S16            ret;
    MsgLen         msgLen = 0;
@@ -369,7 +351,6 @@ RgErrInfo      *err;
 #ifdef L2_OPTMZ
 uint32_t padSize = 0;
 #endif
-#ifdef ANSI
 S16 rgMUXAddPadd
 (
 Inst           inst,
@@ -378,14 +359,6 @@ Buffer         *sduBuf,
 Bool           isRar,
 RgErrInfo      *err
 )
-#else
-S16 rgMUXAddPadd(inst,schdTbSz, sduBuf, isRar, err)
-Inst           inst;
-MsgLen         *schdTbSz;
-Buffer         *sduBuf;
-Bool           isRar;
-RgErrInfo      *err;
-#endif
 {
    S16     ret = ROK;
    Buffer         *padBuf = NULLP;
@@ -509,21 +482,13 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
-PRIVATE S16 rgMUXAddSdus
+static S16 rgMUXAddSdus
 (
 Inst           inst,
 RgBldPduInfo   *pdu,
 Buffer         *sduBuf,
 RgErrInfo      *err
 )
-#else
-PRIVATE S16 rgMUXAddSdus(inst,pdu, sduBuf, err)
-Inst           inst;
-RgBldPduInfo   *pdu;
-Buffer         *sduBuf;
-RgErrInfo      *err;
-#endif
 {
    RgRguDDatReqPerUe *dDatReq;
    RgRguCmnDatReq    *cDatReq;
@@ -643,7 +608,6 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgMUXBldPdu
 (
 Inst           inst,
@@ -651,13 +615,6 @@ RgBldPduInfo   *pdu,
 Buffer         **txPdu,
 RgErrInfo      *err
 )
-#else
-S16 rgMUXBldPdu(inst, pdu, txPdu, err)
-Inst           inst;
-RgBldPduInfo   *pdu;
-Buffer         **txPdu;
-RgErrInfo      *err;
-#endif
 {
    Buffer         *mBuf = NULLP;
 
@@ -708,8 +665,7 @@ RgErrInfo      *err;
  *      -# ROK 
  *      -# RFAILED
  **/
-#ifdef ANSI
-PRIVATE S16 rgMUXAddSdus
+static S16 rgMUXAddSdus
 (
 Inst                inst,
 RgBldPduInfo        *pdu,
@@ -717,14 +673,6 @@ Buffer              *sHdrBuf,
 RgTfuDatReqTbInfo   *tb,
 RgErrInfo           *err
 )
-#else
-PRIVATE S16 rgMUXAddSdus(pdu, sHdrBuf, tb, err)
-Inst                inst;
-RgBldPduInfo        *pdu;
-Buffer              *sHdrBuf;
-RgTfuDatReqTbInfo   *tb;
-RgErrInfo           *err;
-#endif
 {
    RgRguDDatReqPerUe  *dDatReq;
    RgRguCmnDatReq     *cDatReq;
@@ -945,7 +893,6 @@ RgErrInfo           *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgMUXBldPdu
 (
 Inst               inst,
@@ -953,13 +900,6 @@ RgBldPduInfo       *pdu,
 RgTfuDatReqTbInfo  *tb,
 RgErrInfo          *err
 )
-#else
-S16 rgMUXBldPdu(inst, pdu, tb, err)
-Inst               inst;
-RgBldPduInfo       *pdu;
-RgTfuDatReqTbInfo  *tb;
-RgErrInfo          *err;
-#endif
 {
    Buffer         *mBuf1; /* MAC hearder */
    Buffer         *mBuf2; /* MAC CEs */
@@ -1023,7 +963,6 @@ RgErrInfo          *err;
  *      -# ROK 
  *      -# RFAILED 
  **/
-#ifdef ANSI
 S16 rgMUXBldRarPdu
 (
 RgCellCb        *cell,
@@ -1031,13 +970,6 @@ RgInfRaRntiInfo *alloc,
 Buffer          **txPdu,
 RgErrInfo       *err
 )
-#else
-S16 rgMUXBldRarPdu(cell, alloc, txPdu, err)
-RgCellCb        *cell;
-RgInfRaRntiInfo *alloc;
-Buffer          **txPdu;
-RgErrInfo       *err;
-#endif
 {
    Buffer      *datBuf = NULLP;
    S16         ret; 
@@ -1163,19 +1095,12 @@ RgErrInfo       *err;
  *     File : rg_mux.c
  *
  **********************************************************/
-#ifdef ANSI
-PRIVATE Void rgMUXGet20bitRarGrnt
+static Void rgMUXGet20bitRarGrnt
 (
 uint8_t             ulBw,
 RgInfRarUlGrnt *msg3Grnt,
 uint8_t             *grnt
 )
-#else
-PRIVATE Void rgMUXGet20bitRarGrnt(ulBw, msg3Grnt, grnt)
-uint8_t             ulBw;
-RgInfRarUlGrnt *msg3Grnt;
-uint8_t             *grnt;
-#endif
 {
    uint16_t       riv = rgMUXCalcRiv(ulBw, msg3Grnt->rbStart, msg3Grnt->numRb);
 
@@ -1208,19 +1133,12 @@ uint8_t             *grnt;
  *     File : rg_mux.c
  *
  **********************************************************/
-#ifdef ANSI
 uint16_t rgMUXCalcRiv
 (
 uint8_t           bw,
 uint8_t           rbStart,
 uint8_t           numRb
 )
-#else
-uint16_t rgMUXCalcRiv(bw, rbStart, numRb)
-uint8_t           bw;
-uint8_t           rbStart;
-uint8_t           numRb;
-#endif
 {
    uint8_t           numRbMinus1 = numRb - 1;
    uint16_t          riv;