Moving all common header file into common_def.h file

[o-du/l2.git] / src / cm / rgu.c

diff --git a/src/cm/rgu.c b/src/cm/rgu.c
index 1125b6b..a40da04 100755 (executable)
--- a/src/cm/rgu.c
+++ b/src/cm/rgu.c
@@ -35,25 +35,10 @@
 */
 
 /* header include files (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-#include "cm_tkns.h"       /* Common Token Defines */
-#include "cm_llist.h"      /* Common Link List Defines */
-#include "cm_hash.h"       /* Common Hash List Defines */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "rgu.h"           /* RGU Interface defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm_tkns.x"       /* Common Token Definitions */
-#include "cm_llist.x"      /* Common Link List Definitions */
-#include "cm_lib.x"        /* Common Library Definitions */
-#include "cm_hash.x"       /* Common Hash List Definitions */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "rgu.x"           /* RGU Interface includes */
 
 #ifdef SS_RBUF
@@ -420,7 +405,7 @@ Buffer *mBuf;
 *
 * @details
 *
-*     Function : packSendDlData
+*     Function : packDlData
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SpId  spId
@@ -428,22 +413,15 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 packSendDlData
+PUBLIC uint16_t packDlData
 (
 Pst* pst,
 SpId spId,
 RlcMacData  *dlData
 )
-#else
-PUBLIC S16 packSendDlData(pst, spId, dlData)
-Pst* pst;
-SpId spId;
-RlcMacData  dlData;
-#endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(packSendDlData)
+   TRC3(packDlData)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
@@ -455,7 +433,7 @@ RlcMacData  dlData;
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKPK(cmPkPtr,(PTR) dlData, mBuf);
    }
@@ -497,7 +475,7 @@ RlcMacData  dlData;
           __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
           (ErrVal)ERGU024, (ErrVal)0, "Packing failed");
 #endif      
-      if (dlData != NULLP);
+      if (dlData != NULLP)
       {
          SPutSBuf(pst->region, pst->pool, 
                   (Data *)dlData, sizeof(RlcMacData));
@@ -516,7 +494,7 @@ RlcMacData  dlData;
 *
 * @details
 *
-*     Function : unpackSendDlData
+*     Function : unpackDlData
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SpId  spId
@@ -524,32 +502,24 @@ RlcMacData  dlData;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 unpackSendDlData
+PUBLIC S16 unpackDlData
 (
-RguDDatReq func,
+RlcMacDlData func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 unpackSendDlData(func, pst, mBuf)
-RguDDatReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
-//   RguDDatReqInfo *datReq;
    RlcMacData *dlData;
    
-   TRC3(unpackSendDlData)
+   TRC3(unpackDlData)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKUNPK(cmUnpkPtr,(PTR *) &dlData, mBuf);
    }
@@ -634,7 +604,7 @@ RlcMacData  *ulData;
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKPK(cmPkPtr,(PTR)ulData, mBuf);
    }
@@ -693,19 +663,12 @@ RlcMacData  *ulData;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 PUBLIC S16 unpackRcvdUlData
 (
-RguDDatInd func,
+RlcMacUlData func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 unpackRcvdUlData(func, pst, mBuf)
-RguDDatInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
    RlcMacData *ulData;
@@ -722,7 +685,7 @@ Buffer *mBuf;
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKUNPK(cmUnpkPtr,(PTR *) &ulData, mBuf);
    }
@@ -885,7 +848,7 @@ RguL2MUlThrpMeasReqInfo* measReq;
       SPutSBuf(pst->region, pst->pool, (Data *)measReq, sizeof(RguL2MUlThrpMeasReqInfo));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKPK(cmPkPtr,(PTR) measReq, mBuf);
    }
@@ -978,7 +941,7 @@ Buffer *mBuf;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKUNPK(cmUnpkPtr,(PTR *) &measReq, mBuf);
    }
@@ -1021,7 +984,7 @@ Buffer *mBuf;
 *
 * @details
 *
-*     Function : packSendBOStatus,
+*     Function : packBOStatus,
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SpId  spId
@@ -1029,19 +992,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 packSendBOStatus
+PUBLIC uint16_t packBOStatus
 (
 Pst* pst,
 SpId spId,
 RlcMacBOStatus  *boStatus
 )
-#else
-PUBLIC S16 packSendBOStatus(pst, spId, staRsp)
-Pst* pst;
-SpId spId;
-RlcMacBOStatus  *boStatus;
-#endif
 {
    RlcMacBOStatus  *boStaInfo = NULL;
    Buffer *mBuf = NULLP;
@@ -1073,7 +1029,7 @@ RlcMacBOStatus  *boStatus;
 
       RETVALUE(RFAILED);
    }
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKPK(cmPkPtr,(PTR) boStaInfo, mBuf);
    }
@@ -1115,7 +1071,7 @@ RlcMacBOStatus  *boStatus;
 *
 * @details
 *
-*     Function : unpackSendBOStatus
+*     Function : unpackBOStatus
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SpId  spId
@@ -1123,24 +1079,17 @@ RlcMacBOStatus  *boStatus;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
-PUBLIC S16 unpackSendBOStatus
+PUBLIC uint16_t unpackBOStatus
 (
-RguDStaRsp func,
+RlcMacBoStatus func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 unpackSendBOStatus(func, pst, mBuf)
-RguDStaRsp func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SpId spId;
    RlcMacBOStatus *boSta;
 
-   TRC3(unpackSendBOStatus)
+   TRC3(unpackBOStatus)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
@@ -1152,7 +1101,7 @@ Buffer *mBuf;
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKUNPK(cmUnpkPtr,(PTR *) &boSta, mBuf);
    }
@@ -1253,7 +1202,7 @@ RguHarqStatusInd  *harqStatusInd;
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKPK(cmPkPtr,(PTR) harqStaInd, mBuf); 
    }
@@ -1290,7 +1239,7 @@ RguHarqStatusInd  *harqStatusInd;
    if (SPutSBuf(pst->region, pst->pool, (Data *)harqStaInd,
             sizeof(RguHarqStatusInd)) != ROK) {
 #else   
-   if (pst->selector != RGU_SEL_LWLC)
+   if (pst->selector != ODU_SELECTOR_LWLC)
    {
       if(SPutStaticBuffer(pst->region, pst->pool, (Data *)harqStaInd, 
                sizeof(RguHarqStatusInd), 0) != ROK)
@@ -1359,7 +1308,7 @@ Buffer *mBuf;
    if ((SGetSBuf(pst->region, pst->pool, (Data **)&hqStaInd, 
         sizeof(RguHarqStatusInd))) != ROK) {
 #else   
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKUNPK(cmUnpkPtr,(PTR *) &hqStaInd, mBuf);
    }  
@@ -1419,19 +1368,12 @@ Buffer *mBuf;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 PUBLIC S16 packSchedRep
 (
 Pst* pst,
 SuId suId,
-RlcMacSchedRep  * schRep
+RlcMacSchedRepInfo  * schRep
 )
-#else
-PUBLIC S16 packSchedRep(pst, suId, staInd)
-Pst* pst;
-SuId suId;
-RlcMacSchedRep  * schRep;
-#endif
 {
    Buffer *mBuf = NULLP;
    TRC3(packSchedRep)
@@ -1442,10 +1384,10 @@ RlcMacSchedRep  * schRep;
           __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
           (ErrVal)ERGU076, (ErrVal)0, "Packing failed");
 #endif      
-      SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRep));
+      SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKPK(cmPkPtr,(PTR) schRep, mBuf);
    }
@@ -1458,12 +1400,12 @@ RlcMacSchedRep  * schRep;
                (ErrVal)ERGU077, (ErrVal)0, "Packing failed");
 #endif      
         SPutSBuf(pst->region, pst->pool, (Data *)schRep, 
-                                         sizeof(RlcMacSchedRep));
+                                         sizeof(RlcMacSchedRepInfo));
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       } 
       if (SPutSBuf(pst->region, pst->pool, (Data *)schRep,
-                                  sizeof(RlcMacSchedRep)) != ROK) {
+                                  sizeof(RlcMacSchedRepInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
              __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -1482,7 +1424,7 @@ RlcMacSchedRep  * schRep;
 #endif      
       if (schRep != NULLP)
       {
-         SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRep));
+         SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo));
       }
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
@@ -1509,23 +1451,15 @@ RlcMacSchedRep  * schRep;
 *  @return   S16
 *      -# ROK
 **/
-#ifdef ANSI
 PUBLIC S16 unpackSchedRep
 (
-RguDStaInd func,
+RlcMacSchedRep func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 unpackSchedRep(func, pst, mBuf)
-RguDStaInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
-//   RguDStaIndInfo *staInd;
-   RlcMacSchedRep *schRep;
+   RlcMacSchedRepInfo *schRep;
    
    TRC3(unpackSchedRep)
 
@@ -1538,13 +1472,13 @@ Buffer *mBuf;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKUNPK(cmUnpkPtr,(PTR *) &schRep, mBuf);
    }
    else 
    {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&schRep, sizeof(RlcMacSchedRep))) != ROK) {
+      if ((SGetSBuf(pst->region, pst->pool, (Data **)&schRep, sizeof(RlcMacSchedRepInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
          __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -1560,7 +1494,7 @@ Buffer *mBuf;
              (ErrVal)ERGU082, (ErrVal)0, "UnPacking failed");
 #endif      
          SPutMsg(mBuf);
-         SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRep));
+         SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo));
          RETVALUE(RFAILED);
       }
    }
@@ -1678,7 +1612,7 @@ RguFlowCntrlInd   *flowCntrlInd;
 #endif      
       RETVALUE(RFAILED);
    }
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKPK(cmPkPtr,(PTR) flowCntrlInd, mBuf);
    }
@@ -1819,7 +1753,7 @@ Buffer *mBuf;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKUNPK(cmUnpkPtr,(PTR *) &flowCntrlInd, mBuf);
    }
@@ -2702,7 +2636,7 @@ Buffer *mBuf;
 
    for (i=param->nmbPdu-1; i >= 0; i--)
    {
-      MsgLen msgLen = 0;
+      msgLen = 0;
       if (SFndLenMsg(param->pduInfo[i].pduBuf, &msgLen) != ROK)
          RETVALUE(RFAILED);
       if (SCatMsg(mBuf, param->pduInfo[i].pduBuf, M1M2) != ROK)
@@ -2762,7 +2696,7 @@ Buffer *mBuf;
 
       CMCHKUNPK(cmUnpkBool, &param->pduInfo[i].commCh, mBuf);
       CMCHKUNPK(cmUnpkLteLcId, &param->pduInfo[i].lcId, mBuf);
-      CMCHKUNPK(cmPkMsgLen, &param->pduInfo[i].pduLen, mBuf);
+      CMCHKUNPK(cmUnpkMsgLen, &param->pduInfo[i].pduLen, mBuf);
       if (SFndLenMsg(mBuf, &totalMsgLen) != ROK)
          RETVALUE(RFAILED);
       if (SSegMsg(mBuf, totalMsgLen-param->pduInfo[i].pduLen, &param->pduInfo[i].pduBuf) != ROK)
@@ -3143,19 +3077,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 PUBLIC S16 packSchedRepInfo
 (
-RlcMacSchedRep *param,
+RlcMacSchedRepInfo *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 packSchedRepInfo(param, mBuf)
-RlcMacSchedRep *param;
-Buffer *mBuf;
-#endif
 {
-   S32 i;
    S32 idx;
 
    TRC3(packSchedRepInfo);
@@ -3191,19 +3118,12 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
 PUBLIC S16 unpackSchedRepInfo
 (
-RlcMacSchedRep *param,
+RlcMacSchedRepInfo *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 unpackSchedRepInfo(param, mBuf)
-RlcMacSchedRep *param;
-Buffer *mBuf;
-#endif
 {
-   S32 i;
    S32 idx;
 
    TRC3(unpackSchedRepInfo);