Moving all common header file into common_def.h file

Change-Id: I8bb053c66c3ce93b79fc587c3b3e479eb2eb1264
Signed-off-by: Balaji Shankaran <balaji.shankaran@radisys.com>

diff --git a/Dockerfile b/Dockerfile
index 28a5f0b..2010fae 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 as ubuntu
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as ubuntu
 
 ADD . /opt/o-du-l2
 WORKDIR /opt/o-du-l2

diff --git a/Dockerfile-cu-stub b/Dockerfile-cu-stub
index 6a1d809..1e0796a 100644 (file)
--- a/Dockerfile-cu-stub
+++ b/Dockerfile-cu-stub
@@ -1,4 +1,4 @@
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 as ubuntu
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as ubuntu
 
 ADD . /opt/o-du-l2
 WORKDIR /opt/o-du-l2

diff --git a/build/odu/makefile b/build/odu/makefile
index ff00e9b..634fc7a 100644 (file)
--- a/build/odu/makefile
+++ b/build/odu/makefile
@@ -70,7 +70,7 @@ endif
 # macro for output file name and makefile name
 #
 
-PLTFRM_FLAGS= -UMSPD -DODU #-DFAPI -DINTEL_WLS -DEGTP_TEST
+PLTFRM_FLAGS= -UMSPD -DODU #-DINTEL_FAPI -DINTEL_WLS -DEGTP_TEST
 
 ifeq ($(MODE),TDD)
    PLTFRM_FLAGS += -DMODE=TDD

diff --git a/src/5gnrmac/lwr_mac.h b/src/5gnrmac/lwr_mac.h
index b8cc0af..9480bbe 100644 (file)
--- a/src/5gnrmac/lwr_mac.h
+++ b/src/5gnrmac/lwr_mac.h
@@ -22,17 +22,6 @@
 
 #define MAX_NUM_CELL_SUPP 1
 
-#include "envdep.h"
-#include "gen.h"
-#include "ssi.h"
-#include "cm_hash.h"
-#include "cm_lte.h"
-
-#include "gen.x"
-#include "ssi.x"
-#include "cm_hash.x"
-#include "cm_lte.x"
-#include "cm_lib.x"
 #include "du_app_mac_inf.h"
 
 #ifdef INTEL_WLS

diff --git a/src/5gnrmac/lwr_mac_fsm.c b/src/5gnrmac/lwr_mac_fsm.c
index 4373c70..494d6a5 100644 (file)
--- a/src/5gnrmac/lwr_mac_fsm.c
+++ b/src/5gnrmac/lwr_mac_fsm.c
@@ -16,21 +16,9 @@
  ################################################################################
  *******************************************************************************/
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"           /* Layer manager interface includes*/
 #include "crg.h"           /* CRG interface includes*/
 #include "rgu.h"           /* RGU interface includes*/
@@ -44,15 +32,6 @@
 #include "lwr_mac_fsm.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
@@ -63,8 +42,6 @@
 #include "mac.h"
 #include "rg.x"            /* typedefs for MAC */
 #include "lwr_mac_phy.h"
-#include "common_def.h"
-#include "math.h"
 
 #define MIB_SFN_BITMASK 0xFC
 #define PDCCH_PDU_TYPE 0
@@ -119,7 +96,7 @@ S16 lwr_mac_handleInvalidEvt(void *msg)
    RETVALUE(ROK);
 }
 
-#ifdef FAPI
+#ifdef INTEL_FAPI
 /*******************************************************************
   *
   * @brief Fills FAPI message header
@@ -1321,7 +1298,7 @@ uint32_t getParamValue(fapi_uint16_tlv_t *tlv, uint16_t type)
 
 S16 lwr_mac_handleParamReqEvt(void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    /* startGuardTimer(); */
    uint32_t msgLen = 0;             //Length of message Body
    fapi_param_req_t *paramReq = NULL;
@@ -1363,7 +1340,7 @@ S16 lwr_mac_handleParamReqEvt(void *msg)
 
 S16 lwr_mac_handleParamRspEvt(void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
   /* stopGuardTimer(); */
    uint8_t index;
    uint32_t encodedVal;
@@ -1900,7 +1877,7 @@ S16 lwr_mac_handleParamRspEvt(void *msg)
 
 S16 lwr_mac_handleConfigReqEvt(void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    Inst inst = 0;
    uint8_t idx = 0;
    uint8_t index = 0;
@@ -2070,7 +2047,7 @@ S16 lwr_mac_handleConfigReqEvt(void *msg)
 
 S16 lwr_mac_handleConfigRspEvt(void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    fapi_config_resp_t *configRsp;
    configRsp = (fapi_config_resp_t *)msg;
 
@@ -2123,7 +2100,7 @@ S16 lwr_mac_handleConfigRspEvt(void *msg)
  * ****************************************************************/
 S16 lwr_mac_handleStartReqEvt(void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    uint32_t msgLen = 0;
    fapi_start_req_t *startReq;
 
@@ -2164,7 +2141,7 @@ S16 lwr_mac_handleStartReqEvt(void *msg)
 
 S16 lwr_mac_handleStopReqEvt(void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    uint32_t msgLen = 0;
    fapi_stop_req_t *stopReq = NULLP;
    LWR_MAC_ALLOC(stopReq, sizeof(fapi_stop_req_t));
@@ -2206,7 +2183,7 @@ PUBLIC void setMibPdu(uint8_t *mibPdu, uint32_t *val, uint16_t sfn)
     DU_LOG("\nLWR_MAC: MIB PDU %x", *val);
 }
 
-#ifdef FAPI
+#ifdef INTEL_FAPI
 /*******************************************************************
  *
  * @brief fills SSB PDU required for DL TTI info in MAC
@@ -3127,7 +3104,7 @@ uint8_t fillMsg4TxDataReq(fapi_tx_pdu_desc_t *pduDesc, Msg4Info *msg4Info,
  * ****************************************************************/
 uint16_t handleDlTtiReq(SlotIndInfo currTimingInfo)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    uint8_t idx;
    uint8_t nPdu = 0;
    uint8_t numPduEncoded = 0;
@@ -3320,7 +3297,7 @@ uint16_t handleDlTtiReq(SlotIndInfo currTimingInfo)
  * ****************************************************************/
 uint16_t sendTxDataReq(SlotIndInfo currTimingInfo, DlSchedInfo *dlInfo)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    uint8_t nPdu = 0;
    uint32_t msgLen = 0;
    uint16_t pduIndex = 0;
@@ -3410,7 +3387,7 @@ uint16_t sendTxDataReq(SlotIndInfo currTimingInfo, DlSchedInfo *dlInfo)
  *             Pointer to CurrUlSlot
  * @return count
  * ********************************************************************/
-#ifdef FAPI
+#ifdef INTEL_FAPI
 uint8_t getnPdus(fapi_ul_tti_req_t *ulTtiReq, MacUlSlot *currUlSlot)
 {
    uint8_t pduCount = 0;
@@ -3463,7 +3440,7 @@ uint8_t getnPdus(fapi_ul_tti_req_t *ulTtiReq, MacUlSlot *currUlSlot)
 
 void setNumCs(uint8_t *numCs, MacCellCfg *macCellCfg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    uint8_t idx;
    if(macCellCfg != NULLP)
    {
@@ -3490,7 +3467,7 @@ void setNumCs(uint8_t *numCs, MacCellCfg *macCellCfg)
  *             Pointer to msgLen
  * ********************************************************************/
 
-#ifdef FAPI
+#ifdef INTEL_FAPI
 void fillPrachPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg, MacUlSlot *currUlSlot, uint32_t *msgLen)
 {
    if(ulTtiReqPdu != NULLP)
@@ -3646,7 +3623,7 @@ void fillPucchPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg,\
  ******************************************************************/
 uint16_t handleUlTtiReq(SlotIndInfo currTimingInfo)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    uint8_t    pduIdx = -1;
    uint8_t    numPdu = 0;
    uint32_t   msgLen = 0;

diff --git a/src/5gnrmac/lwr_mac_fsm.h b/src/5gnrmac/lwr_mac_fsm.h
index 351a7ea..b080f9f 100644 (file)
--- a/src/5gnrmac/lwr_mac_fsm.h
+++ b/src/5gnrmac/lwr_mac_fsm.h
@@ -26,7 +26,7 @@
 
 #include "lwr_mac.h"
 
-#ifdef FAPI
+#ifdef INTEL_FAPI
 #include "fapi.h"
 #endif
 

diff --git a/src/5gnrmac/lwr_mac_handle_phy.c b/src/5gnrmac/lwr_mac_handle_phy.c
index ecdd431..cfb8190 100644 (file)
--- a/src/5gnrmac/lwr_mac_handle_phy.c
+++ b/src/5gnrmac/lwr_mac_handle_phy.c
@@ -17,30 +17,13 @@
 *******************************************************************************/
 
 /* 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 "cm_mblk.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "tfu.h"           /* RGU Interface defines */
-#ifdef FAPI
+#ifdef INTEL_FAPI
 #include "fapi.h"
 #endif
 
 /* 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 "cm_mblk.x"        /* Common LTE Defines */
 #include "tfu.x"           /* RGU Interface includes */
 #include "du_log.h"
 #include "lwr_mac_fsm.h"
@@ -48,7 +31,7 @@
 #include "lwr_mac_upr_inf.h"
 #include "rg.h"
 
-#ifdef FAPI
+#ifdef INTEL_FAPI
 /* Function pointer for slot indication from lower mac to mac */
 packSlotIndMsg packSlotIndOpts[] =
 {
@@ -115,7 +98,7 @@ void fillLwrMacToMacPst(Pst *pst)
    pst->dstInst = 0;
    pst->region = 0;
    pst->pool =  0; 
-   pst->selector = MAC_SELECTOR_TC;
+   pst->selector = ODU_SELECTOR_TC;
 }
 
 /*******************************************************************
@@ -350,7 +333,7 @@ uint8_t handleRxDataInd(fapi_rx_data_indication_t  *fapiRxDataInd)
 
 void handlePhyMessages(uint16_t msgType, uint32_t msgSize, void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    /* extract the header */
    fapi_msg_t *header;
    header = (fapi_msg_t *)msg;

diff --git a/src/5gnrmac/lwr_mac_phy.c b/src/5gnrmac/lwr_mac_phy.c
index 17bc911..b604747 100644 (file)
--- a/src/5gnrmac/lwr_mac_phy.c
+++ b/src/5gnrmac/lwr_mac_phy.c
@@ -18,13 +18,7 @@
 
 /* This file contains APIs to send/receive messages from PHY */
 
-#include <stdio.h>
-#include <stdint.h>
-
-#include "envdep.h"
-#include "gen.h"
-#include "ssi.h"
-#include "gen.x"
+#include "common_def.h"
 #include "rg.h"
 #include "lwr_mac_phy.h"
 #include "lwr_mac_fsm.h"

diff --git a/src/5gnrmac/lwr_mac_phy.h b/src/5gnrmac/lwr_mac_phy.h
index 086f8c4..830533d 100644 (file)
--- a/src/5gnrmac/lwr_mac_phy.h
+++ b/src/5gnrmac/lwr_mac_phy.h
@@ -18,14 +18,6 @@
 #ifndef _LWR_MAC_PHY_H_
 #define _LWR_MAC_PHY_H_
 
-#include "envdep.h"
-#include "gen.h"
-#include "ssi.h"
-#include "cm_llist.h"
-
-#include "gen.x"
-#include "ssi.x"
-#include "cm_llist.x"
 
 typedef enum
 {

diff --git a/src/5gnrmac/lwr_mac_upr_inf.c b/src/5gnrmac/lwr_mac_upr_inf.c
index 0c91610..4432bec 100644 (file)
--- a/src/5gnrmac/lwr_mac_upr_inf.c
+++ b/src/5gnrmac/lwr_mac_upr_inf.c
@@ -15,7 +15,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 *******************************************************************************/
-
+#include "common_def.h"
 #include "lwr_mac_upr_inf.h"
 
 /*******************************************************************
@@ -37,14 +37,11 @@
  * ****************************************************************/
 uint16_t packCrcInd(Pst *pst, CrcInd *crcInd)
 {
-   if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC))
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
    {
       return ROK;
    }
-   else
-   {
-      return RFAILED;
-   }
+   return RFAILED;
 }
 
 /*******************************************************************
@@ -66,7 +63,7 @@ uint16_t packCrcInd(Pst *pst, CrcInd *crcInd)
  * ****************************************************************/
 uint16_t packRxDataInd(Pst *pst, RxDataInd *rxDataInd)
 {
-   if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC))
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
    {
       return ROK;
    }
@@ -96,14 +93,11 @@ uint16_t packRxDataInd(Pst *pst, RxDataInd *rxDataInd)
  * ****************************************************************/
 uint16_t packRachInd(Pst *pst, RachInd *rachInd)
 {
-   if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC))
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
    {
       return ROK;
    }
-   else
-   {
-      return RFAILED;
-   }
+   return RFAILED;
 }
  
 /*******************************************************************
@@ -178,7 +172,7 @@ S16 packLwlcSlotInd (Pst *pst, SlotIndInfo *slotInd)
  * ****************************************************************/
 uint16_t packStopInd(Pst *pst)
 {
-   if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC))
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
    {
       return ROK;
    }

diff --git a/src/5gnrmac/lwr_mac_upr_inf.h b/src/5gnrmac/lwr_mac_upr_inf.h
index 1fbbd57..3875a82 100644 (file)
--- a/src/5gnrmac/lwr_mac_upr_inf.h
+++ b/src/5gnrmac/lwr_mac_upr_inf.h
@@ -20,30 +20,9 @@
 
 #ifndef __LWR_MAC_UPR_INF_H__
 #define __LWR_MAC_UPR_INF_H__
-
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"        /* common tokens */
 #include "tfu.h"
  
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "tfu.x"
 
 /* events */

diff --git a/src/5gnrmac/lwr_mac_util.c b/src/5gnrmac/lwr_mac_util.c
index 7071432..fcbf803 100644 (file)
--- a/src/5gnrmac/lwr_mac_util.c
+++ b/src/5gnrmac/lwr_mac_util.c
@@ -18,16 +18,7 @@
 
 /* This file contains all utility functions for MAC CL */
 
-#include "stdio.h"
-#include "envopt.h"
-#include "envdep.h"
-#include "envind.h"
-#include "gen.h"
-#include "ssi.h"
-#include "cm_hash.h"
-#include "gen.x"
-#include "ssi.x"
-#include "cm_hash.x"
+#include "common_def.h"
 #include "lwr_mac.h"
 
  /*******************************************************************

diff --git a/src/5gnrmac/mac_demux.c b/src/5gnrmac/mac_demux.c
index bcb3cef..c014095 100644 (file)
--- a/src/5gnrmac/mac_demux.c
+++ b/src/5gnrmac/mac_demux.c
@@ -15,52 +15,29 @@
 #   limitations under the License.                                             #
 ################################################################################
 *******************************************************************************/ 
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
+#include "du_log.h"
+#include "du_app_mac_inf.h"
 #include "lrg.h"           /* Layer manager interface includes*/
 #include "crg.h"           /* CRG interface includes*/
-#include "rgu.h"           /* RGU interface includes*/
 #include "tfu.h"           /* TFU interface includes */
+#include "rgu.h"           /* RGU interface includes*/
 #include "rg_sch_inf.h"    /* SCH interface includes */
-#include "rg_prg.h"       /* PRG (MAC-MAC) interface includes*/
 #include "rg_env.h"       /* MAC environmental includes*/
 #include "rg.h"           /* MAC includes*/
 #include "rg_err.h"       /* MAC error includes*/
-#include "du_log.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
-#include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "crg.x"           /* CRG interface includes */
+#include "mac.h"
+#include "rgu.x"           /* RGU types */
 #include "rg_sch_inf.x"    /* SCH interface typedefs */
 #include "rg_prg.x"        /* PRG (MAC-MAC) Interface typedefs */
-#include "du_app_mac_inf.h"
-#include "mac.h"
 #include "rg.x"            /* typedefs for MAC */
-
 /*******************************************************************
  *
  * @brief De-mux of MAC-Sub PDUs from Rx Data Ind Pdu

diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c
index 8efe400..7ed544a 100644 (file)
--- a/src/5gnrmac/mac_msg_hdl.c
+++ b/src/5gnrmac/mac_msg_hdl.c
@@ -17,18 +17,7 @@
 *******************************************************************************/
 
 /* header include files -- defines (.h)  */
-#include <stdbool.h>
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"        /* common tokens */
+#include "common_def.h"
 #include "rgu.h"
 #include "tfu.h"
 #include "rg_sch_inf.h"
@@ -40,15 +29,6 @@
 #include "lwr_mac.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "rgu.x"
 #include "tfu.x"
 #include "rg_sch_inf.x"
@@ -295,10 +275,10 @@ uint16_t MacHdlCellStartReq(Pst *pst, MacCellStartInfo  *cellStartInfo)
  * ****************************************************************/
 uint16_t MacHdlCellStopReq(Pst *pst, MacCellStopInfo  *cellStopInfo)
 {
-   #ifdef FAPI
+#ifdef INTEL_FAPI
    DU_LOG("\nMAC : Sending cell stop request to Lower Mac");
    sendToLowerMac(FAPI_STOP_REQUEST, 0, cellStopInfo);
-   #endif
+#endif
 
    MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellStopInfo, \
           sizeof(MacCellStopInfo));
@@ -403,7 +383,7 @@ uint16_t macSendUlCcchInd(uint8_t *rrcContainer, uint16_t cellId, uint16_t crnti
        ulCcchIndInfo->ulCcchMsg = rrcContainer;
 
        /* Fill Pst */
-       pst.selector  = DU_MAC_LWLC;
+       pst.selector  = ODU_SELECTOR_LWLC;
        pst.srcEnt    = ENTRG;
        pst.dstEnt    = ENTDUAPP;
        pst.dstInst   = 0;

diff --git a/src/5gnrmac/mac_mux.c b/src/5gnrmac/mac_mux.c
index 688afd6..738e5ee 100644 (file)
--- a/src/5gnrmac/mac_mux.c
+++ b/src/5gnrmac/mac_mux.c
@@ -16,21 +16,9 @@
 ################################################################################
  *******************************************************************************/
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"           /* Layer manager interface includes*/
 #include "crg.h"           /* CRG interface includes*/
 #include "rgu.h"           /* RGU interface includes*/
@@ -43,15 +31,6 @@
 #include "du_log.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrmac/mac_rach.c b/src/5gnrmac/mac_rach.c
index 13c85ed..46b5805 100644 (file)
--- a/src/5gnrmac/mac_rach.c
+++ b/src/5gnrmac/mac_rach.c
@@ -16,29 +16,10 @@
 ################################################################################
  *******************************************************************************/
 /* header include files (.h) */
-#include <stdbool.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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "tfu.h"           /* RGU Interface includes */
 #include "lrg.h"
 
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "tfu.x"           /* RGU Interface includes */
 #include "lrg.x"
 #include "du_app_mac_inf.h"

diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c
index 7949523..cb0b832 100644 (file)
--- a/src/5gnrmac/mac_slot_ind.c
+++ b/src/5gnrmac/mac_slot_ind.c
@@ -16,17 +16,7 @@
 ################################################################################
  *******************************************************************************/
 /* header include files (.h) */
-#include "stdbool.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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "rgu.h"
 #include "tfu.h"           /* RGU Interface includes */
 #include "lrg.h"
@@ -35,15 +25,6 @@
 #include "rg_env.h"   
 #include "rg.h"
 
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "rgu.x"
 #include "tfu.x"           /* RGU Interface includes */
 #include "lrg.x"
@@ -218,7 +199,7 @@ int sendSlotIndMacToDuApp(SlotIndInfo *slotInd)
   slotInfo->slot = slotInd->slot;
  
   /* Fill Pst */
-  pst.selector  = DU_MAC_LWLC;
+  pst.selector  = ODU_SELECTOR_LWLC;
   pst.srcEnt    = ENTRG;
   pst.dstEnt    = ENTDUAPP;
   pst.dstInst   = 0;

diff --git a/src/5gnrmac/mac_stop_ind.c b/src/5gnrmac/mac_stop_ind.c
index e609e17..1543a50 100644 (file)
--- a/src/5gnrmac/mac_stop_ind.c
+++ b/src/5gnrmac/mac_stop_ind.c
@@ -16,28 +16,9 @@
 ################################################################################
  *******************************************************************************/
 /* header include files (.h) */
-#include <stdbool.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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "tfu.h"           /* RGU Interface includes */
 #include "lrg.h"
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "tfu.x"           /* RGU Interface includes */
 #include "lrg.x"
 #include "du_app_mac_inf.h"

diff --git a/src/5gnrmac/mac_upr_inf_api.c b/src/5gnrmac/mac_upr_inf_api.c
index 273ce4e..2bbe7d8 100644 (file)
--- a/src/5gnrmac/mac_upr_inf_api.c
+++ b/src/5gnrmac/mac_upr_inf_api.c
@@ -18,7 +18,7 @@
 
 /* This file contains the definitions for Upper Interface APIs that are
  * invoked from MAC */
-
+#include "common_def.h"
 #include "mac_upr_inf_api.h"
 
 /* Funtion pointer options for slot indication */

diff --git a/src/5gnrmac/mac_upr_inf_api.h b/src/5gnrmac/mac_upr_inf_api.h
index 9eb5333..a2d3335 100644 (file)
--- a/src/5gnrmac/mac_upr_inf_api.h
+++ b/src/5gnrmac/mac_upr_inf_api.h
@@ -19,29 +19,6 @@
 /* This file contains the definitions for Upper Interface APIs that are
  * invoked from MAC */
 
-/* header include files -- defines (.h)  */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"        /* common tokens */
-
-/* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "du_app_mac_inf.h"
 
 

diff --git a/src/5gnrmac/rg_cfg.c b/src/5gnrmac/rg_cfg.c
index b83107f..bdfa54f 100755 (executable)
--- a/src/5gnrmac/rg_cfg.c
+++ b/src/5gnrmac/rg_cfg.c
@@ -37,16 +37,7 @@ static int RLOG_FILE_ID=180;
 static int RLOG_MODULE_ID=4096;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"           /* Layer manager interface includes*/
 #include "crg.h"           /* CRG interface includes*/
 #include "rgu.h"           /* RGU interface includes*/
@@ -58,15 +49,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_err.h"       /* MAC error includes*/
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrmac/rg_com.c b/src/5gnrmac/rg_com.c
index 4e15d76..17947b6 100755 (executable)
--- a/src/5gnrmac/rg_com.c
+++ b/src/5gnrmac/rg_com.c
@@ -36,44 +36,26 @@ invoked by RRC towards MAC.
 static const char* RLOG_MODULE_NAME="MAC";
 static int RLOG_FILE_ID=181;
 static int RLOG_MODULE_ID=4096;
+
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
+#include "tfu.h"
+#include "du_app_mac_inf.h"
 #include "lrg.h"
 #include "crg.h"
 #include "rgu.h"
-#include "tfu.h"
 #include "rg_sch_inf.h"
-#include "rg_prg.h"       /* PRG interface includes*/
 #include "rg_env.h"
 #include "rg.h"
 #include "rg_err.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system service interface */
-#include "cm5.x"           /* common timers */
-#include "cm_lib.x"        /* common library */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_mblk.x"       /* common memory link list library */
-#include "cm_llist.x"      /* common linked list library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common LTE */
+#include "tfu.x"
 #include "lrg.x"
 #include "crg.x"
 #include "rgu.x"
-#include "tfu.x"
 #include "rg_sch_inf.x"
 #include "rg_prg.x"       /* PRG interface typedefs*/
-#include "du_app_mac_inf.h"
 #include "rg.x"
 #ifdef LTE_ADV
 #include "rg_pom_scell.x"

diff --git a/src/5gnrmac/rg_dbm.c b/src/5gnrmac/rg_dbm.c
index 12bf632..82a25f1 100755 (executable)
--- a/src/5gnrmac/rg_dbm.c
+++ b/src/5gnrmac/rg_dbm.c
@@ -33,44 +33,25 @@
 */
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
+#include "tfu.h"
+#include "du_app_mac_inf.h"
 #include "lrg.h"
 #include "crg.h"
 #include "rgu.h"
-#include "tfu.h"
 #include "rg_sch_inf.h"
 #include "rg_env.h"
 #include "rg.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system service interface */
-#include "cm5.x"           /* common timers */
-#include "cm_lib.x"        /* common library */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_mblk.x"       /* common memory link list library */
-#include "cm_llist.x"      /* common linked list library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common LTE */
+#include "tfu.x"
 #include "lrg.x"
 #include "crg.x"
 #include "rgu.x"
-#include "tfu.x"
 #include "rg_sch_inf.x"
 #include "rg_prg.x"       /* PRG interface typedefs*/
-#include "du_app_mac_inf.h"
 #include "rg.x"
 
-
 /* local defines */
 PRIVATE S16 rgDBMInitUeCbLst ARGS(( RgCellCb *cellCb, U16 numBins));
 PRIVATE Void rgDBMInitDedLcLst ARGS((RgUeCb *ueCb));

diff --git a/src/5gnrmac/rg_dhm.c b/src/5gnrmac/rg_dhm.c
index e387cb8..5692108 100755 (executable)
--- a/src/5gnrmac/rg_dhm.c
+++ b/src/5gnrmac/rg_dhm.c
@@ -36,49 +36,30 @@ static const char* RLOG_MODULE_NAME="MAC";
 static int RLOG_FILE_ID=279;
 static int RLOG_MODULE_ID=4096;
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
+#include "common_def.h"
 #ifdef L2_OPTMZ
 #include "ss_strm.h"
 #endif
-#include "cm5.h"           /* common timers */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
 #include "lrg.h"
 #include "crg.h"
-#include "rgu.h"
 #include "tfu.h"
+#include "rgu.h"
 #include "rg_sch_inf.h"
 #include "rg_env.h"
 #include "rg_err.h"
 #include "rg.h"
+#include "du_app_mac_inf.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system service interface */
 #ifdef L2_OPTMZ
 #include "ss_strm.x"
 #endif
-#include "cm5.x"           /* common timers */
-#include "cm_lib.x"        /* common library */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_llist.x"      /* common linked list library */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common LTE */
 #include "lrg.x"
 #include "crg.x"
-#include "rgu.x"
 #include "tfu.x"
+#include "rgu.x"
 #include "rg_sch_inf.x"
 #include "rg_prg.x"        /* PRG interface typedefs */
-#include "du_app_mac_inf.h"
 #include "rg.x"
 
 #ifdef L2_OPTMZ

diff --git a/src/5gnrmac/rg_dux.c b/src/5gnrmac/rg_dux.c
index 5b16b3d..4ae5f15 100755 (executable)
--- a/src/5gnrmac/rg_dux.c
+++ b/src/5gnrmac/rg_dux.c
@@ -36,19 +36,8 @@ static const char* RLOG_MODULE_NAME="MAC";
 static int RLOG_FILE_ID=176;
 static int RLOG_MODULE_ID=4096;
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
+#include "common_def.h"
   
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-
-#include "cm_lte.h"        /* Common LTE */
-#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_mblk.h"       /* common memory link list library */
-
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "tfu.h"           /* CRG Interface defines */
 #include "crg.h"           /* CRG Interface defines */
@@ -60,16 +49,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_err.h"        /* MAC error defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* common timers */
-#include "cm_lib.x"        /* common library */
-#include "cm_lte.x"        /* Common LTE */
-#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_mblk.x"       /* common memory link list library */
 
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* CRG Interface includes */

diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c
index 6ca817a..736b6b2 100755 (executable)
--- a/src/5gnrmac/rg_ex_ms.c
+++ b/src/5gnrmac/rg_ex_ms.c
@@ -33,17 +33,7 @@
 registered with SSI during the LTE MAC Task initialization.
 */
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"        /* common tokens */
+#include "common_def.h"
 #include "rgu.h"           /* RGU defines */
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
@@ -57,15 +47,6 @@ registered with SSI during the LTE MAC Task initialization.
 
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrmac/rg_id.c b/src/5gnrmac/rg_id.c
index 8b4f52d..40242b5 100755 (executable)
--- a/src/5gnrmac/rg_id.c
+++ b/src/5gnrmac/rg_id.c
@@ -35,16 +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 layer */
-#include "ssi.h"              /* system services */
+#include "common_def.h"
 #include "lrg.h"              /* layer manager */
    
 /* header/extern include files (.x) */
-#include "gen.x"              /* general layer */
-#include "ssi.x"              /* system services */
 #include "cm_lib.x"           /* common library */
 
 

diff --git a/src/5gnrmac/rg_l2m.c b/src/5gnrmac/rg_l2m.c
index eb316a5..2a618a4 100755 (executable)
--- a/src/5gnrmac/rg_l2m.c
+++ b/src/5gnrmac/rg_l2m.c
@@ -33,15 +33,7 @@
 */
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "crg.h"        
 #include "rgr.h"
@@ -53,15 +45,6 @@
 #include "rg.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c
index 072f221..b003352 100755 (executable)
--- a/src/5gnrmac/rg_lim.c
+++ b/src/5gnrmac/rg_lim.c
@@ -36,18 +36,7 @@ static const char* RLOG_MODULE_NAME="MAC";
 static int RLOG_FILE_ID=182;
 static int RLOG_MODULE_ID=4096;
 /* header include files -- defines (.h) */
-#include <stdbool.h>
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"       /* common tokens */
+#include "common_def.h"
 #include "rgu.h"           /* RGU defines */
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
@@ -58,15 +47,6 @@ static int RLOG_MODULE_ID=4096;
 #include "du_log.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
@@ -618,7 +598,7 @@ void fillMacToSchPst(Pst *pst)
    pst->dstInst = 1;
    pst->region = 0;
    pst->pool =  0;
-   pst->selector = MAC_SELECTOR_TC;
+   pst->selector = ODU_SELECTOR_TC;
 }
 
 /*******************************************************************
@@ -678,7 +658,7 @@ uint8_t sendStopIndMacToDuApp()
    cellStopId->cellId = macCb.macCell->cellId;
 
    /* Fill Pst */
-   pst.selector  = DU_MAC_LWLC;
+   pst.selector  = ODU_SELECTOR_LWLC;
    pst.srcEnt    = ENTRG;
    pst.dstEnt    = ENTDUAPP;
    pst.dstInst   = 0;

diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c
index 68321b7..1fc073e 100755 (executable)
--- a/src/5gnrmac/rg_lmm.c
+++ b/src/5gnrmac/rg_lmm.c
@@ -38,17 +38,7 @@ static int RLOG_FILE_ID=220;
 static int RLOG_MODULE_ID=4096;
 
 /* header include files (.h) */
-#include "stdbool.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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "crg.h"           /* CRG Interface defines */
 #include "rgu.h"           /* RGU Interface defines */
@@ -61,15 +51,6 @@ static int RLOG_MODULE_ID=4096;
 #include "du_log.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "crg.x"           /* CRG Interface includes */
 #include "rgu.x"           /* RGU Interface includes */
 #include "tfu.x"           /* RGU Interface includes */
@@ -787,8 +768,8 @@ Elmnt sapType;            /* Sap Type */
    {   
       case STRGUSAP:
          if ((cfg->s.rguSap.spId > LRG_MAX_RGU_SAPS) &&
-             (cfg->s.rguSap.selector != RGU_SEL_TC) &&
-             (cfg->s.rguSap.selector != RGU_SEL_LC))
+             (cfg->s.rguSap.selector != ODU_SELECTOR_TC) &&
+             (cfg->s.rguSap.selector != ODU_SELECTOR_LC))
          {
             ret = LCM_REASON_INVALID_PAR_VAL;
             RLOG0(L_ERROR, "unsupported Selector value for RGU");
@@ -818,8 +799,8 @@ Elmnt sapType;            /* Sap Type */
           * there is cfg request with sap is 1*/
          break;
       case STCRGSAP:
-         if ((cfg->s.crgSap.selector != CRG_SEL_TC) &&
-             (cfg->s.crgSap.selector != CRG_SEL_LC))
+         if ((cfg->s.crgSap.selector != ODU_SELECTOR_TC) &&
+             (cfg->s.crgSap.selector != ODU_SELECTOR_LC))
          {
             ret = LCM_REASON_INVALID_PAR_VAL;
             RLOG0(L_ERROR, "unsupported Selector value for CRG");
@@ -848,8 +829,8 @@ Elmnt sapType;            /* Sap Type */
          break;
       case STTFUSAP:
 #ifndef CL_MAC_LWLC 
-         if ((cfg->s.tfuSap.selector != TFU_SEL_TC) &&
-             (cfg->s.tfuSap.selector != TFU_SEL_LC))
+         if ((cfg->s.tfuSap.selector != ODU_SELECTOR_TC) &&
+             (cfg->s.tfuSap.selector != ODU_SELECTOR_LC))
          {
             ret = LCM_REASON_INVALID_PAR_VAL;
             RLOG0(L_ERROR, "unsupported Selector value for TFU");
@@ -927,8 +908,8 @@ RgCfg *cfg;            /* Configuaration information */
    {
       RETVALUE(LCM_REASON_INVALID_MSGTYPE);
    }
-   if ((cfg->s.genCfg.lmPst.selector != LRG_SEL_TC) &&
-       (cfg->s.genCfg.lmPst.selector != LRG_SEL_LC))
+   if ((cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_TC) &&
+       (cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_LC))
    {
       RLOG0(L_ERROR, "unsupported Selector value for RGU");
       RETVALUE(LCM_REASON_INVALID_PAR_VAL);
@@ -2041,7 +2022,7 @@ RgMngmt  *cfm;    /* config confirm structure  */
        pst->dstEnt = ENTDUAPP;
        pst->dstInst = 0;
        pst->srcInst = 0;
-       pst->selector = MAC_SCH_LC_SELECTOR; 
+       pst->selector = ODU_SELECTOR_LC; 
    RgMiLrgSchCfgCfm(pst, cfm);
    
    RETVALUE(ROK);
@@ -2079,7 +2060,7 @@ Pst           *cfmPst
    cfmPst->dstInst   = 0;
    cfmPst->dstProcId = cfmPst->srcProcId;
 
-   cfmPst->selector  = LRG_SEL_LC;
+   cfmPst->selector  = ODU_SELECTOR_LC;
    cfmPst->prior     = reqPst->prior;
    cfmPst->route     = reqPst->route;
    cfmPst->region    = reqPst->region;
@@ -2273,7 +2254,7 @@ int MacSchCellCfgReq
        cfgPst.srcInst   = 0;
        cfgPst.dstEnt    = ENTRG;
        cfgPst.dstInst   = 1;
-       cfgPst.selector  = MAC_SCH_TC_SELECTOR;
+       cfgPst.selector  = ODU_SELECTOR_TC;
        cfgPst.event     = EVENT_SCH_CELL_CFG;
 
        ret = (*SchCellCfgOpts[cfgPst.selector])(&cfgPst, &schCellCfg);

diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c
index fce85ce..13d92ae 100755 (executable)
--- a/src/5gnrmac/rg_mux.c
+++ b/src/5gnrmac/rg_mux.c
@@ -37,19 +37,7 @@ static int RLOG_FILE_ID=229;
 static int RLOG_MODULE_ID=4096;
 
 /* header include files -- defines (.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_mblk.h"       /* memory management */
-#include "cm_lte.h"        /* Common LTE Defines */
-
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "tfu.h"           /* TFU Interface defines */
 #include "crg.h"           /* CRG Interface defines */
@@ -61,15 +49,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rg.h"            /* MAC defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.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_mblk.x"       /* memory management */
-#include "cm_lte.x"        /* Common LTE Definitions */
 
 #include "rgu.x"           /* RGU Interface includes */
 #include "tfu.x"           /* CRG Interface includes */

diff --git a/src/5gnrmac/rg_pom_scell.c b/src/5gnrmac/rg_pom_scell.c
index c8245f2..df15634 100755 (executable)
--- a/src/5gnrmac/rg_pom_scell.c
+++ b/src/5gnrmac/rg_pom_scell.c
@@ -33,16 +33,7 @@
 */
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "crg.h"
 #include "rgu.h"
@@ -54,15 +45,6 @@
 #include "rg_err.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system service interface */
-#include "cm5.x"           /* common timers */
-#include "cm_lib.x"        /* common library */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_mblk.x"       /* common memory link list library */
-#include "cm_llist.x"      /* common linked list library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common LTE */
 #include "lrg.x"
 #include "crg.x"
 #include "rgu.x"

diff --git a/src/5gnrmac/rg_prg.c b/src/5gnrmac/rg_prg.c
index 4eb62ef..59e9f21 100755 (executable)
--- a/src/5gnrmac/rg_prg.c
+++ b/src/5gnrmac/rg_prg.c
@@ -29,16 +29,7 @@
   
 **********************************************************************/
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "crg.h"
 #include "rgu.h"
@@ -50,15 +41,6 @@
 #include "rg_err.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrmac/rg_prg_pt.c b/src/5gnrmac/rg_prg_pt.c
index efa914f..d6d4966 100755 (executable)
--- a/src/5gnrmac/rg_prg_pt.c
+++ b/src/5gnrmac/rg_prg_pt.c
@@ -29,16 +29,7 @@
 **********************************************************************/
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"           /* layer manager for MAC */
 #include "crg.h"           /* CRG interface includes*/
 #include "rgu.h"           /* RGU interface includes*/
@@ -50,15 +41,6 @@
 #include "rg_err.h"        /* MAC error includes*/
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrmac/rg_ptli.c b/src/5gnrmac/rg_ptli.c
index 13e6304..6456cf9 100755 (executable)
--- a/src/5gnrmac/rg_ptli.c
+++ b/src/5gnrmac/rg_ptli.c
@@ -33,27 +33,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_mblk.h"
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "tfu.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_mblk.x"
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "tfu.x"           /* RGU Interface includes */
 
 

diff --git a/src/5gnrmac/rg_ptmi.c b/src/5gnrmac/rg_ptmi.c
index ca75c16..7dc1a10 100755 (executable)
--- a/src/5gnrmac/rg_ptmi.c
+++ b/src/5gnrmac/rg_ptmi.c
@@ -37,25 +37,9 @@
 */
 
 /* 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 "lrg.h"           /* LRG 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 "lrg.x"           /* LRG Interface includes */
 
 #ifdef __cplusplus

diff --git a/src/5gnrmac/rg_ram.c b/src/5gnrmac/rg_ram.c
index 970907b..f82bb8b 100755 (executable)
--- a/src/5gnrmac/rg_ram.c
+++ b/src/5gnrmac/rg_ram.c
@@ -37,19 +37,7 @@ static int RLOG_FILE_ID=132;
 static int RLOG_MODULE_ID=4096;
 
 /* 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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE */
-
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "crg.h"           /* CRG Interface defines */
 #include "rgu.h"           /* RGU Interface defines */
@@ -61,15 +49,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_err.h"        /* MAC error defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* Timer */
-#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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE */
 
 #include "crg.x"           /* CRG Interface includes */
 #include "rgu.x"           /* RGU Interface includes */

diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c
index 7e217de..0de1281 100755 (executable)
--- a/src/5gnrmac/rg_rom.c
+++ b/src/5gnrmac/rg_rom.c
@@ -37,19 +37,7 @@ static int RLOG_FILE_ID=184;
 static int RLOG_MODULE_ID=4096;
 
 /* 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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE */
-
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "crg.h"           /* CRG Interface defines */
 #include "rgu.h"           /* RGU Interface defines */
@@ -61,15 +49,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_err.h"        /* MAC error defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* Timer */
-#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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE */
 
 #include "crg.x"           /* CRG Interface includes */
 #include "rgu.x"           /* RGU Interface includes */

diff --git a/src/5gnrmac/rg_tom.c b/src/5gnrmac/rg_tom.c
index fae39dd..e6b259c 100755 (executable)
--- a/src/5gnrmac/rg_tom.c
+++ b/src/5gnrmac/rg_tom.c
@@ -36,18 +36,8 @@ static int RLOG_MODULE_ID=4096;
 invoked by PHY towards MAC
 */
 /* header include files -- defines (.h) */
-#include <stdbool.h>
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"       /* common tokens */
+#include "common_def.h"
+#include "du_app_mac_inf.h"
 #include "rgu.h"           /* RGU defines */
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
@@ -56,29 +46,18 @@ invoked by PHY towards MAC
 #include "rg.h"            /* defines and macros for MAC */
 #include "rg_env.h"            /* defines and macros for MAC */
 #include "rg_err.h"            /* defines and macros for MAC */
-
+#include "rgm.h"           /* layer management typedefs for MAC */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
+#include "crg.x"           /* CRG interface typedefs */
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
-#include "crg.x"           /* CRG interface typedefs */
 #include "rg_sch_inf.x"    /* SCH interface typedefs */
 #include "rg_prg.x"        /* PRG interface typedefs */
 #include "rgm.x"           /* layer management typedefs for MAC */
-#include "rgm.h"           /* layer management typedefs for MAC */
-#include "du_app_mac_inf.h"
-#include "mac.h"
 #include "rg.x"            /* typedefs for MAC */
+#include "mac.h"
 #include "lwr_mac_fsm.h"
 #ifdef MAC_RLC_UL_RBUF
 #include "ss_rbuf.h"

diff --git a/src/5gnrmac/rg_uhm.c b/src/5gnrmac/rg_uhm.c
index 8d880a7..6cba3bd 100755 (executable)
--- a/src/5gnrmac/rg_uhm.c
+++ b/src/5gnrmac/rg_uhm.c
@@ -33,19 +33,7 @@
 */
 
 /* header include files -- defines (.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_lte.h"        /* Common LTE */
-#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_mblk.h"       /* memory management */
-
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "tfu.h"           /* TFU Interface defines */
 #include "crg.h"           /* CRG Interface defines */
@@ -57,15 +45,6 @@
 #include "rg_err.h"        /* MAC error defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* system services */
-#include "cm_lte.x"        /* Common LTE */
-#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_mblk.x"       /* memory management */
 
 #include "tfu.x"           /* TFU Interface defines */
 #include "crg.x"           /* CRG Interface includes */

diff --git a/src/5gnrmac/rg_uim.c b/src/5gnrmac/rg_uim.c
index 48cc4ad..47d0982 100755 (executable)
--- a/src/5gnrmac/rg_uim.c
+++ b/src/5gnrmac/rg_uim.c
@@ -41,17 +41,7 @@ static int RLOG_FILE_ID=178;
 
 /* header/extern include files (.x) */
 /* header include files (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"
+#include "common_def.h"
 #include "crg.h"           /* CRG defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
 #include "tfu.h"
@@ -63,15 +53,6 @@ static int RLOG_FILE_ID=178;
 
 /* header/extern include files (.x) */
 
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"
 #include "crg.x"           /* CRG types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "tfu.x"

diff --git a/src/5gnrmac/rg_utl.c b/src/5gnrmac/rg_utl.c
index d7b87b0..db2417d 100755 (executable)
--- a/src/5gnrmac/rg_utl.c
+++ b/src/5gnrmac/rg_utl.c
@@ -37,18 +37,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=179;
 
 /* 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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE */
-
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "crg.h"           /* CRG Interface defines */
 #include "rgu.h"           /* RGU Interface defines */
@@ -61,15 +50,7 @@ static int RLOG_FILE_ID=179;
 #include "rg_err.h"        /* MAC error defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
 #include "cm5.x"           /* Timer */
-#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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE */
 
 #include "crg.x"           /* CRG Interface includes */
 #include "rgu.x"           /* RGU Interface includes */

diff --git a/src/5gnrrlc/kw_amm_dl.c b/src/5gnrrlc/kw_amm_dl.c
index 7b309f8..0b613fa 100755 (executable)
--- a/src/5gnrrlc/kw_amm_dl.c
+++ b/src/5gnrrlc/kw_amm_dl.c
@@ -39,18 +39,7 @@ static const char* RLOG_MODULE_NAME="AMM";
 static int RLOG_MODULE_ID=2048;
 static int RLOG_FILE_ID=189;
 /* 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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -64,15 +53,6 @@ static int RLOG_FILE_ID=189;
 
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_amm_ul.c b/src/5gnrrlc/kw_amm_ul.c
index f7ef2bf..e53c7a1 100755 (executable)
--- a/src/5gnrrlc/kw_amm_ul.c
+++ b/src/5gnrrlc/kw_amm_ul.c
@@ -40,18 +40,7 @@ static int RLOG_MODULE_ID=2048;
 static int RLOG_FILE_ID=190;
 
 /* 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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -64,16 +53,6 @@ static int RLOG_FILE_ID=190;
 #include "kw_ul.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_cfg_dl.c b/src/5gnrrlc/kw_cfg_dl.c
index 27f37d5..359b3c7 100755 (executable)
--- a/src/5gnrrlc/kw_cfg_dl.c
+++ b/src/5gnrrlc/kw_cfg_dl.c
@@ -46,18 +46,7 @@ static int RLOG_FILE_ID=191;
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -69,16 +58,6 @@ static int RLOG_FILE_ID=191;
 #include "kw_dl.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_cfg_ul.c b/src/5gnrrlc/kw_cfg_ul.c
index c55f6a3..a3765da 100755 (executable)
--- a/src/5gnrrlc/kw_cfg_ul.c
+++ b/src/5gnrrlc/kw_cfg_ul.c
@@ -40,18 +40,7 @@ static int RLOG_FILE_ID=192;
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -62,16 +51,6 @@ static int RLOG_FILE_ID=192;
 #include "kw_ul.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c
index bb4da26..8acc01e 100755 (executable)
--- a/src/5gnrrlc/kw_dbm_dl.c
+++ b/src/5gnrrlc/kw_dbm_dl.c
@@ -53,45 +53,22 @@ static int RLOG_FILE_ID=193;
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
-#include "kwu.h"           /* KWU defines */
 #include "rgu.h"           /* RGU defines */
+#include "kwu.h"           /* KWU defines */
 #include "kw_err.h"        /* Err defines */
 #include "kw_env.h"        /* RLC environment options */
-
 #include "kw.h"            /* RLC defines */
 #include "kw_udx.h"
 #include "kw_dl.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
-#include "kwu.x"           /* KWU */
 #include "rgu.x"           /* RGU */
-
+#include "kwu.x"           /* KWU */
 #include "kw.x"
 #include "kw_udx.x"
 #include "kw_dl.x"

diff --git a/src/5gnrrlc/kw_dbm_ul.c b/src/5gnrrlc/kw_dbm_ul.c
index 2cbb236..fa4cd06 100755 (executable)
--- a/src/5gnrrlc/kw_dbm_ul.c
+++ b/src/5gnrrlc/kw_dbm_ul.c
@@ -33,18 +33,7 @@ static int RLOG_FILE_ID=194;
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -56,16 +45,6 @@ static int RLOG_FILE_ID=194;
 #include "kw_ul.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_dl_ex_ms.c b/src/5gnrrlc/kw_dl_ex_ms.c
index fcdbd43..eeb545a 100755 (executable)
--- a/src/5gnrrlc/kw_dl_ex_ms.c
+++ b/src/5gnrrlc/kw_dl_ex_ms.c
@@ -38,18 +38,7 @@ static int RLOG_FILE_ID=195;
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -62,16 +51,6 @@ static int RLOG_FILE_ID=195;
 
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_lim.c b/src/5gnrrlc/kw_lim.c
index 62adb4e..3200617 100755 (executable)
--- a/src/5gnrrlc/kw_lim.c
+++ b/src/5gnrrlc/kw_lim.c
@@ -48,18 +48,7 @@ static int RLOG_FILE_ID=196;
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -73,16 +62,6 @@ static int RLOG_FILE_ID=196;
 #include "kw_ul.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_lmm.c b/src/5gnrrlc/kw_lmm.c
index a530dff..a0a996d 100755 (executable)
--- a/src/5gnrrlc/kw_lmm.c
+++ b/src/5gnrrlc/kw_lmm.c
@@ -47,18 +47,7 @@ static int RLOG_FILE_ID=197;
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -72,16 +61,6 @@ static int RLOG_FILE_ID=197;
 #include "kw_udx.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_ptli.c b/src/5gnrrlc/kw_ptli.c
index e0402ff..485117e 100755 (executable)
--- a/src/5gnrrlc/kw_ptli.c
+++ b/src/5gnrrlc/kw_ptli.c
@@ -34,18 +34,7 @@
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -60,16 +49,6 @@
 #include "kw.h"            /* RLC defines */
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_ptmi.c b/src/5gnrrlc/kw_ptmi.c
index b01d918..32757f0 100755 (executable)
--- a/src/5gnrrlc/kw_ptmi.c
+++ b/src/5gnrrlc/kw_ptmi.c
@@ -37,18 +37,7 @@
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -58,16 +47,6 @@
 #include "kw.h"            /* RLC defines */
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_ptui.c b/src/5gnrrlc/kw_ptui.c
index a1e49fb..e9e569d 100755 (executable)
--- a/src/5gnrrlc/kw_ptui.c
+++ b/src/5gnrrlc/kw_ptui.c
@@ -37,18 +37,7 @@ static int RLOG_FILE_ID=199;
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -59,16 +48,6 @@ static int RLOG_FILE_ID=199;
 #include "kw.h"            /* RLC defines */
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_tenb_stats.c b/src/5gnrrlc/kw_tenb_stats.c
index 0063267..ec472a3 100755 (executable)
--- a/src/5gnrrlc/kw_tenb_stats.c
+++ b/src/5gnrrlc/kw_tenb_stats.c
@@ -29,18 +29,7 @@
 **********************************************************************/
 
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -51,16 +40,6 @@
 #include "kw_ul.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_tmm_dl.c b/src/5gnrrlc/kw_tmm_dl.c
index e144db0..0028a69 100755 (executable)
--- a/src/5gnrrlc/kw_tmm_dl.c
+++ b/src/5gnrrlc/kw_tmm_dl.c
@@ -42,18 +42,7 @@ static int RLOG_FILE_ID=200;
 */
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -66,16 +55,6 @@ static int RLOG_FILE_ID=200;
 #include "kw_dl.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_tmm_ul.c b/src/5gnrrlc/kw_tmm_ul.c
index 268b870..70f8932 100755 (executable)
--- a/src/5gnrrlc/kw_tmm_ul.c
+++ b/src/5gnrrlc/kw_tmm_ul.c
@@ -42,18 +42,7 @@ static int RLOG_FILE_ID=201;
 */
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -65,16 +54,6 @@ static int RLOG_FILE_ID=201;
 #include "kw_ul.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_tmr.c b/src/5gnrrlc/kw_tmr.c
index f050a95..055c40c 100755 (executable)
--- a/src/5gnrrlc/kw_tmr.c
+++ b/src/5gnrrlc/kw_tmr.c
@@ -38,18 +38,7 @@ static int RLOG_FILE_ID=202;
 
 
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -63,15 +52,6 @@ static int RLOG_FILE_ID=202;
 #include "kw_dl.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_udx.c b/src/5gnrrlc/kw_udx.c
index 75d610a..59e5479 100755 (executable)
--- a/src/5gnrrlc/kw_udx.c
+++ b/src/5gnrrlc/kw_udx.c
@@ -28,37 +28,14 @@
         File:    kw_udx.c
   
 *********************************************************************21*/
-
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"
 #include "kw_udx.h"           /* UDX defines */
+#include "kw.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
-#include "kw.h"
 #include "lkw.x"
 #include "kw_udx.x"
-#include <stdlib.h>
 \f
 
 #ifdef LCUDX

diff --git a/src/5gnrrlc/kw_udx_dl.c b/src/5gnrrlc/kw_udx_dl.c
index 9ba4f88..a25f805 100755 (executable)
--- a/src/5gnrrlc/kw_udx_dl.c
+++ b/src/5gnrrlc/kw_udx_dl.c
@@ -32,18 +32,7 @@ static int RLOG_MODULE_ID=262144;
 static int RLOG_FILE_ID=203;
 
 /* 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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -56,16 +45,6 @@ static int RLOG_FILE_ID=203;
 #include "kw_dl.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_udx_ptdl.c b/src/5gnrrlc/kw_udx_ptdl.c
index bee2eac..f2fe9d8 100755 (executable)
--- a/src/5gnrrlc/kw_udx_ptdl.c
+++ b/src/5gnrrlc/kw_udx_ptdl.c
@@ -32,18 +32,7 @@
 */
 
 /* 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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -57,16 +46,6 @@
 
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_udx_ptul.c b/src/5gnrrlc/kw_udx_ptul.c
index 42f0453..a331013 100755 (executable)
--- a/src/5gnrrlc/kw_udx_ptul.c
+++ b/src/5gnrrlc/kw_udx_ptul.c
@@ -32,18 +32,7 @@
 */
 
 /* 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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -56,16 +45,6 @@
 #include "kw_dl.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_udx_ul.c b/src/5gnrrlc/kw_udx_ul.c
index c6e9cbc..8e4da05 100755 (executable)
--- a/src/5gnrrlc/kw_udx_ul.c
+++ b/src/5gnrrlc/kw_udx_ul.c
@@ -36,18 +36,7 @@ static int RLOG_FILE_ID=204;
 */
  
 /* 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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -61,16 +50,6 @@ static int RLOG_FILE_ID=204;
 #include "kw_dl.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_uim.c b/src/5gnrrlc/kw_uim.c
index 2276532..e9d7a63 100755 (executable)
--- a/src/5gnrrlc/kw_uim.c
+++ b/src/5gnrrlc/kw_uim.c
@@ -50,18 +50,7 @@ static int RLOG_FILE_ID=205;
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -73,16 +62,6 @@ static int RLOG_FILE_ID=205;
 #include "kw_udx.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_ul_ex_ms.c b/src/5gnrrlc/kw_ul_ex_ms.c
index 5793ac0..0dbffd4 100755 (executable)
--- a/src/5gnrrlc/kw_ul_ex_ms.c
+++ b/src/5gnrrlc/kw_ul_ex_ms.c
@@ -38,18 +38,7 @@ static int RLOG_FILE_ID=206;
 
 \f
 /* header (.h) include files */
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -61,16 +50,6 @@ static int RLOG_FILE_ID=206;
 #include "kw_udx.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "lkw.x"           /* LKW */
 #include "ckw.x"           /* CKW */
 #include "kwu.x"           /* KWU */

diff --git a/src/5gnrrlc/kw_umm_dl.c b/src/5gnrrlc/kw_umm_dl.c
index 987d3ed..8b84123 100755 (executable)
--- a/src/5gnrrlc/kw_umm_dl.c
+++ b/src/5gnrrlc/kw_umm_dl.c
@@ -43,16 +43,7 @@ static int RLOG_FILE_ID=239;
 */
 
 /* header (.h) include files */
-#include "envopt.h"             /* environment options */
-#include "envdep.h"             /* environment dependent */
-#include "envind.h"             /* environment independent */
-
-#include "gen.h"                /* general */
-#include "ssi.h"                /* system services interface */
-#include "cm5.h"                /* Timer Functions */
-#include "cm_lte.h"             /* common umts header file */
-#include "cm_hash.h"            /* common hash module  file */
-#include "cm_llist.h"           /* common list header file */
+#include "common_def.h"
 #include "ckw.h"                /* RRC layer */
 #include "lkw.h"                /* RRC layer */
 #include "kwu.h"                /* RLC service user */
@@ -68,13 +59,6 @@ static int RLOG_FILE_ID=239;
 
 /* header/extern include files (.x) */
 
-#include "gen.x"                /* general */
-#include "ssi.x"                /* system services interface */
-#include "cm_lib.x"             /* common library */
-#include "cm5.x"                /* Timer Functions */
-#include "cm_hash.x"            /* common hash module */
-#include "cm_lte.x"             /* common umts file */
-#include "cm_llist.x"           /* common list header file */
 #include "ckw.x"                /* RRC layer */
 #include "kwu.x"                /* RLC service user */
 #include "lkw.x"                /* LM Interface */

diff --git a/src/5gnrrlc/kw_umm_ul.c b/src/5gnrrlc/kw_umm_ul.c
index 449e186..2f6755e 100755 (executable)
--- a/src/5gnrrlc/kw_umm_ul.c
+++ b/src/5gnrrlc/kw_umm_ul.c
@@ -44,16 +44,7 @@ static int RLOG_FILE_ID=240;
 */
 
 /* header (.h) include files */
-#include "envopt.h"             /* environment options */
-#include "envdep.h"             /* environment dependent */
-#include "envind.h"             /* environment independent */
-
-#include "gen.h"                /* general */
-#include "ssi.h"                /* system services interface */
-#include "cm5.h"                /* Timer Functions */
-#include "cm_lte.h"             /* common umts header file */
-#include "cm_hash.h"            /* common hash module  file */
-#include "cm_llist.h"           /* common list header file */
+#include "common_def.h"
 #include "ckw.h"                /* RRC layer */
 #include "lkw.h"                /* RRC layer */
 #include "kwu.h"                /* RLC service user */
@@ -68,13 +59,6 @@ static int RLOG_FILE_ID=240;
 
 /* header/extern include files (.x) */
 
-#include "gen.x"                /* general */
-#include "ssi.x"                /* system services interface */
-#include "cm_lib.x"             /* common library */
-#include "cm5.x"                /* Timer Functions */
-#include "cm_hash.x"            /* common hash module */
-#include "cm_lte.x"             /* common umts file */
-#include "cm_llist.x"           /* common list header file */
 #include "ckw.x"                /* RRC layer */
 #include "kwu.x"                /* RLC service user */
 #include "lkw.x"                /* LM Interface */

diff --git a/src/5gnrrlc/kw_utl_dl.c b/src/5gnrrlc/kw_utl_dl.c
index 9b6c225..bfbb505 100755 (executable)
--- a/src/5gnrrlc/kw_utl_dl.c
+++ b/src/5gnrrlc/kw_utl_dl.c
@@ -44,22 +44,12 @@ static int RLOG_FILE_ID=209;
 */
 
 /* header (.h) include files */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
+
+#include "common_def.h"
 /* kw005.201 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
 #include <sys/time.h>
 #endif
-#include <stdlib.h>
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* CKW defines */
 #include "lkw.h"           /* LKW defines */
@@ -72,16 +62,6 @@ static int RLOG_FILE_ID=209;
 #include "kw_dl.h"
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "ckw.x"           /* CKW includes */
 #include "kwu.x"           /* KWU includes */
 #include "lkw.x"           /* LKW inlcudes */

diff --git a/src/5gnrrlc/kw_utl_ul.c b/src/5gnrrlc/kw_utl_ul.c
index 9baac73..6cb027c 100755 (executable)
--- a/src/5gnrrlc/kw_utl_ul.c
+++ b/src/5gnrrlc/kw_utl_ul.c
@@ -43,22 +43,12 @@ static int RLOG_FILE_ID=210;
 */
 
 /* header (.h) include files */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
+#include "common_def.h"
 /* kw005.201 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
 #include <sys/time.h>
 #endif
 
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
 #include "lkw.h"           /* LKW defines */
@@ -70,16 +60,6 @@ static int RLOG_FILE_ID=210;
 #include "kw_ul.h"         /* RLC Uplink defines */
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #include "ckw.x"           /* CKW includes */
 #include "kwu.x"           /* KWU includes */
 #include "lkw.x"           /* LKW includes */

diff --git a/src/5gnrrlc/mac_stub.c b/src/5gnrrlc/mac_stub.c
index 1b621bf..94503ba 100644 (file)
--- a/src/5gnrrlc/mac_stub.c
+++ b/src/5gnrrlc/mac_stub.c
@@ -17,7 +17,7 @@
 *******************************************************************************/
 
 #ifdef EGTP_TEST
-
+#include "common_def.h"
 #include "mac_stub.h"
 
 uint8_t rlcDatSn = 0;
@@ -32,7 +32,7 @@ PUBLIC S16 macStubBOStatus(Pst *pst, SpId spId, RlcMacBOStatus *boSta)
 
 //  SGetSBuf(pst->region, pst->pool, (Data **)&rspPst, sizeof(Pst));
 
-  rspPst.selector  = RGU_SEL_TC;
+  rspPst.selector  = ODU_SELECTOR_TC;
   rspPst.srcEnt    = pst->dstEnt;
   rspPst.dstEnt    = pst->srcEnt;
   rspPst.dstInst   = pst->srcInst;
@@ -89,7 +89,7 @@ PUBLIC S16 macStubSendDlData(Pst *pst, SpId spId, RlcMacData *dlData)
    ulData->pduInfo[0].pduBuf = mBuf;
 
    /* Fill response post */
-   rspPst.selector  = RGU_SEL_TC;
+   rspPst.selector  = ODU_SELECTOR_TC;
    rspPst.srcEnt    = pst->dstEnt;
    rspPst.dstEnt    = pst->srcEnt;
    rspPst.dstInst   = pst->srcInst;

diff --git a/src/5gnrrlc/mac_stub.h b/src/5gnrrlc/mac_stub.h
index 46b7104..365fc5e 100644 (file)
--- a/src/5gnrrlc/mac_stub.h
+++ b/src/5gnrrlc/mac_stub.h
@@ -21,34 +21,10 @@
 #ifndef __MAC_STUB_H__
 #define __MAC_STUB_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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "cm_tpt.h"
-#include "cm_inet.h"
 #include "du_log.h" 
 #include "rgu.h"
 #include "kw.h"
 
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_tpt.x"
-#include "cm_inet.x"
 #include "rgu.x"
 
 

diff --git a/src/5gnrsch/rg_sch.c b/src/5gnrsch/rg_sch.c
index 4bbdc11..d1f9fa7 100755 (executable)
--- a/src/5gnrsch/rg_sch.c
+++ b/src/5gnrsch/rg_sch.c
@@ -37,15 +37,7 @@ static int RLOG_FILE_ID=185;
 static int RLOG_MODULE_ID=4096;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "tfu.h"
@@ -59,15 +51,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_cfg.c b/src/5gnrsch/rg_sch_cfg.c
index 640d74a..af66f6f 100755 (executable)
--- a/src/5gnrsch/rg_sch_cfg.c
+++ b/src/5gnrsch/rg_sch_cfg.c
@@ -37,16 +37,7 @@ static int RLOG_FILE_ID=186;
 static int RLOG_MODULE_ID=4096;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "rgm.h"
@@ -60,15 +51,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_cmn.c b/src/5gnrsch/rg_sch_cmn.c
index 7398c20..92bf8bc 100755 (executable)
--- a/src/5gnrsch/rg_sch_cmn.c
+++ b/src/5gnrsch/rg_sch_cmn.c
@@ -37,16 +37,7 @@ static int RLOG_FILE_ID=187;
 static int RLOG_MODULE_ID=4096;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
-#include "cm5.h"
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "tfu.h"
@@ -60,15 +51,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_dbm.c b/src/5gnrsch/rg_sch_dbm.c
index b12ac8c..a709bf9 100755 (executable)
--- a/src/5gnrsch/rg_sch_dbm.c
+++ b/src/5gnrsch/rg_sch_dbm.c
@@ -35,16 +35,7 @@ static const char* RLOG_MODULE_NAME="MAC";
 static int RLOG_FILE_ID=230;
 static int RLOG_MODULE_ID=4096;
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "tfu.h"
@@ -55,15 +46,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rg_sch_cmn.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system service interface */
-#include "cm5.x"           /* common timers */
-#include "cm_lib.x"        /* common library */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_mblk.x"       /* common memory link list library */
-#include "cm_llist.x"      /* common linked list library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common LTE */
 #include "lrg.x"
 #include "rgr.x"
 #include "tfu.x"

diff --git a/src/5gnrsch/rg_sch_drx.c b/src/5gnrsch/rg_sch_drx.c
index 5b44497..2e7107c 100755 (executable)
--- a/src/5gnrsch/rg_sch_drx.c
+++ b/src/5gnrsch/rg_sch_drx.c
@@ -37,15 +37,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=163;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "rgm.h"
@@ -62,15 +54,6 @@ static int RLOG_FILE_ID=163;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_empty.c b/src/5gnrsch/rg_sch_empty.c
index 253d830..f8734bf 100644 (file)
--- a/src/5gnrsch/rg_sch_empty.c
+++ b/src/5gnrsch/rg_sch_empty.c
@@ -29,15 +29,7 @@
   
 **********************************************************************/
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "tfu.h"
@@ -49,15 +41,6 @@
 #include "rg_sch_cmn.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_ex_ms.c b/src/5gnrsch/rg_sch_ex_ms.c
index e6015b4..39dad66 100755 (executable)
--- a/src/5gnrsch/rg_sch_ex_ms.c
+++ b/src/5gnrsch/rg_sch_ex_ms.c
@@ -33,17 +33,7 @@
 registered with SSI during the LTE MAC Task initialization.
 */
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"       /* common tokens */
+#include "common_def.h"
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
 #include "rgr.h"           /* layer management defines for LTE-MAC */
@@ -55,15 +45,6 @@ registered with SSI during the LTE MAC Task initialization.
 
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_gom.c b/src/5gnrsch/rg_sch_gom.c
index 127eeba..ce66f67 100755 (executable)
--- a/src/5gnrsch/rg_sch_gom.c
+++ b/src/5gnrsch/rg_sch_gom.c
@@ -38,16 +38,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=164;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "tfu.h"
@@ -59,15 +50,6 @@ static int RLOG_FILE_ID=164;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system service interface */
-#include "cm5.x"           /* common timers */
-#include "cm_lib.x"        /* common library */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_llist.x"      /* common linked list library */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common LTE */
 #include "lrg.x"
 #include "rgr.x"
 #include "tfu.x"

diff --git a/src/5gnrsch/rg_sch_hdfdd.c b/src/5gnrsch/rg_sch_hdfdd.c
index df02c21..96cc4db 100755 (executable)
--- a/src/5gnrsch/rg_sch_hdfdd.c
+++ b/src/5gnrsch/rg_sch_hdfdd.c
@@ -39,15 +39,7 @@ static int RLOG_FILE_ID=165;
 #endif
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "tfu.h"
@@ -62,15 +54,6 @@ static int RLOG_FILE_ID=165;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_inf.c b/src/5gnrsch/rg_sch_inf.c
index 282fa62..daf9730 100755 (executable)
--- a/src/5gnrsch/rg_sch_inf.c
+++ b/src/5gnrsch/rg_sch_inf.c
@@ -30,16 +30,7 @@
 **********************************************************************/
 
 /* 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_mblk.h"       /* memory management */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "tfu.h"           /* RGU defines */
 #ifdef LTE_L2_MEAS
 #include "lrg.h"
@@ -47,14 +38,6 @@
 #include "rg_sch_inf.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_mblk.x"       /* memory management */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "tfu.x"           /* RGU defines */
 #ifdef LTE_L2_MEAS
 #include "lrg.x"

diff --git a/src/5gnrsch/rg_sch_l2m.c b/src/5gnrsch/rg_sch_l2m.c
index 09badc3..49292d7 100755 (executable)
--- a/src/5gnrsch/rg_sch_l2m.c
+++ b/src/5gnrsch/rg_sch_l2m.c
@@ -14,7 +14,7 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-*******************************************************************************
+*******************************************************************************/
 
 /************************************************************************
  
@@ -33,15 +33,7 @@
 */
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "rgm.h"
@@ -55,15 +47,6 @@
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_lmm.c b/src/5gnrsch/rg_sch_lmm.c
index 2d90b4b..780b54f 100755 (executable)
--- a/src/5gnrsch/rg_sch_lmm.c
+++ b/src/5gnrsch/rg_sch_lmm.c
@@ -39,16 +39,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=167;
 
 /* 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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "rgr.h"           /* RGR Interface defines */
 #include "tfu.h"           /* RGU Interface defines */
@@ -64,15 +55,6 @@ static int RLOG_FILE_ID=167;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "rgr.x"           /* RGR Interface includes */
 #include "rgm.x"           /* RGM Interface includes */
 #include "tfu.x"           /* RGU Interface includes */
@@ -165,8 +147,8 @@ Elmnt sapType;            /* SAP Type */
    {   
       case STRGRSAP:
 #ifndef CL_MAC_LWLC
-         if ((cfg->s.schInstCfg.rgrSap[sapIdx].selector != RGR_SEL_TC) &&
-             (cfg->s.schInstCfg.rgrSap[sapIdx].selector != RGR_SEL_LC))
+         if ((cfg->s.schInstCfg.rgrSap[sapIdx].selector != ODU_SELECTOR_TC) &&
+             (cfg->s.schInstCfg.rgrSap[sapIdx].selector != ODU_SELECTOR_LC))
          {
             ret = LCM_REASON_INVALID_PAR_VAL;
             RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCfg(): unsupported"
@@ -199,8 +181,8 @@ Elmnt sapType;            /* SAP Type */
          break;
       case STTFUSAP:
 #ifndef CL_MAC_LWLC
-         if ((cfg->s.schInstCfg.tfuSap[sapIdx].selector != TFU_SEL_TC) &&
-             (cfg->s.schInstCfg.tfuSap[sapIdx].selector != TFU_SEL_LC))
+         if ((cfg->s.schInstCfg.tfuSap[sapIdx].selector != ODU_SELECTOR_TC) &&
+             (cfg->s.schInstCfg.tfuSap[sapIdx].selector != ODU_SELECTOR_LC))
          {
             ret = LCM_REASON_INVALID_PAR_VAL;
             RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCfg(): unsupported"

diff --git a/src/5gnrsch/rg_sch_mga.c b/src/5gnrsch/rg_sch_mga.c
index 8667b8a..3830189 100755 (executable)
--- a/src/5gnrsch/rg_sch_mga.c
+++ b/src/5gnrsch/rg_sch_mga.c
@@ -36,15 +36,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=169;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "tfu.h"
@@ -57,15 +49,6 @@ static int RLOG_FILE_ID=169;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_pt.c b/src/5gnrsch/rg_sch_pt.c
index 13bee92..9fdc5d9 100755 (executable)
--- a/src/5gnrsch/rg_sch_pt.c
+++ b/src/5gnrsch/rg_sch_pt.c
@@ -34,15 +34,7 @@
        Portable functions corresponding to these primitives are also defined.
 */
 /* 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 "rg_env.h"        /* MAC Environment Defines */
 #include "crg.h"           /* CRG Interface defines */
 #include "rgr.h"           /* RGR Interface defines */
@@ -56,13 +48,6 @@
 #include "rg_sch_inf.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 "crg.x"           /* CRG Interface includes */
 #include "rgr.x"           /* RGR Interface includes */
 #include "rgu.x"           /* RGU Interface includes */

diff --git a/src/5gnrsch/rg_sch_pwr.c b/src/5gnrsch/rg_sch_pwr.c
index a7d4ba9..41faf57 100755 (executable)
--- a/src/5gnrsch/rg_sch_pwr.c
+++ b/src/5gnrsch/rg_sch_pwr.c
@@ -36,16 +36,7 @@ static const char* RLOG_MODULE_NAME="MAC";
 static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=188;
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
-#include "cm_math.h"       /* common MATH functions */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "rgm.h"
@@ -57,16 +48,6 @@ static int RLOG_FILE_ID=188;
 #include "rg_sch_cmn.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
-#include "cm_math.x"       /* common MATH functions */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_ram.c b/src/5gnrsch/rg_sch_ram.c
index fcfcce2..61f492b 100755 (executable)
--- a/src/5gnrsch/rg_sch_ram.c
+++ b/src/5gnrsch/rg_sch_ram.c
@@ -37,18 +37,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=171;
 
 /* 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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE */
+#include "common_def.h"
 
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "rgr.h"           /* RGR Interface defines */
@@ -64,15 +53,6 @@ static int RLOG_FILE_ID=171;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* Timer */
-#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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE */
 
 #include "rgr.x"           /* RGR Interface includes */
 #include "rgm.x"           /* RGR Interface includes */

diff --git a/src/5gnrsch/rg_sch_sc1.c b/src/5gnrsch/rg_sch_sc1.c
index d2e56d8..4a2a5bb 100755 (executable)
--- a/src/5gnrsch/rg_sch_sc1.c
+++ b/src/5gnrsch/rg_sch_sc1.c
@@ -37,16 +37,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=173;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm5.h"           /* common timers */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "rgm.h"
@@ -61,15 +52,6 @@ static int RLOG_FILE_ID=173;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_scell.c b/src/5gnrsch/rg_sch_scell.c
index db18f1a..366fc92 100755 (executable)
--- a/src/5gnrsch/rg_sch_scell.c
+++ b/src/5gnrsch/rg_sch_scell.c
@@ -33,16 +33,7 @@
 */
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm5.h"           /* common timers */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "rgm.h"
@@ -54,15 +45,6 @@
 #include "rg_sch_cmn.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common tokens */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_tmr.c b/src/5gnrsch/rg_sch_tmr.c
index 350f1bd..35da1d1 100755 (executable)
--- a/src/5gnrsch/rg_sch_tmr.c
+++ b/src/5gnrsch/rg_sch_tmr.c
@@ -36,17 +36,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=175;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"       /* common tokens */
+#include "common_def.h"
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
 #include "rgr.h"           /* layer management defines for LTE-MAC */
@@ -59,15 +49,6 @@ static int RLOG_FILE_ID=175;
 
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */

diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c
index 7949aba..e0c2e2b 100755 (executable)
--- a/src/5gnrsch/rg_sch_tom.c
+++ b/src/5gnrsch/rg_sch_tom.c
@@ -37,17 +37,7 @@ static int RLOG_FILE_ID=228;
 static int RLOG_MODULE_ID=4096;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"       /* common tokens */
+#include "common_def.h"
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
 #include "rgr.h"           /* layer management defines for LTE-MAC */
@@ -62,15 +52,6 @@ static int RLOG_MODULE_ID=4096;
 
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
@@ -700,9 +681,9 @@ U32 rgSch5gtfCqi2Mcs[15] =
 /*HARQ Feedback interpretation in accordance with Femto Forum.
 Note: There is no value as '0' in Femto Forum Spec but in order to retain
 the existing usage in MAC (and its Acceptance), its being considered*/
-CONSTANT PRIVATE U8 rgSchTomHqFbkMap[8] = {0,1,0,0,4,4,4,4};
+//CONSTANT PRIVATE U8 rgSchTomHqFbkMap[8] = {0,1,0,0,4,4,4,4};
 /*added #defines instead of magic numbers*/
-CONSTANT PRIVATE U32 rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_TOT_NUM_SUBBANDS]={
+/*CONSTANT PRIVATE U32 rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_TOT_NUM_SUBBANDS]={
 {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28},
 {0,1,3,6,10,15,21,28,36,45,55,66,78,91,105,120,136,153,171,190,210,231,253,276,300,325,351,378},
 {0,0,1,4,10,20,35,56,84,120,165,220,286,364,455,560,680,816,969,1140,1330,1540,1771,2024,2300,2600,2925,3276},
@@ -710,7 +691,7 @@ CONSTANT PRIVATE U32 rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_T
 {0,0,0,0,1,6,21,56,126,252,462,792,1287,2002,3003,4368,6188,8568,11628,15504,20349,26334,33649,42504,53130,65780,80730,98280},
 {0,0,0,0,0,1,7,28,84,210,462,924,1716,3003,5005,8008,12376,18564,27132,38760,54264,74613,100947,134596,177100,230230,296010,376740}
 };
-
+*/
 
 /*ccpu00116923 - ADD - SRS present support*/
 /*Tables Derived from 3GPP TS 36.211 Section 5.5.3.3 */

diff --git a/src/5gnrsch/rg_sch_uhm.c b/src/5gnrsch/rg_sch_uhm.c
index a23f1fb..ab40396 100755 (executable)
--- a/src/5gnrsch/rg_sch_uhm.c
+++ b/src/5gnrsch/rg_sch_uhm.c
@@ -33,19 +33,7 @@
 */
 
 /* header include files -- defines (.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_lte.h"        /* Common LTE */
-#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_mblk.h"       /* memory management */
-
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "tfu.h"           /* TFU Interface defines */
 #include "rgr.h"           /* RGR Interface defines */
@@ -56,15 +44,6 @@
 #include "rg_sch_err.h"        /* MAC error defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* system services */
-#include "cm_lte.x"        /* Common LTE */
-#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_mblk.x"       /* memory management */
 
 #include "tfu.x"           /* TFU Interface defines */
 #include "rgr.x"           /* RGR Interface includes */

diff --git a/src/5gnrsch/rg_sch_utl.c b/src/5gnrsch/rg_sch_utl.c
index 9199920..709f81c 100755 (executable)
--- a/src/5gnrsch/rg_sch_utl.c
+++ b/src/5gnrsch/rg_sch_utl.c
@@ -37,15 +37,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=177;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "tfu.h"
@@ -59,15 +51,6 @@ static int RLOG_FILE_ID=177;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
@@ -7139,7 +7122,7 @@ U8            status;
    cfmPst.dstEnt    = (Ent)ENTRG;
    cfmPst.dstInst   = (Inst) 0;
    cfmPst.dstProcId = SFndProcId();
-   cfmPst.selector  = RGR_SEL_LC;
+   cfmPst.selector  = ODU_SELECTOR_LC;
    cfmPst.region    = reg;
    cfmPst.pool      = pool;
 

diff --git a/src/5gnrsch/rg_sch_utl_clist.c b/src/5gnrsch/rg_sch_utl_clist.c
index 4cbec3c..ff19314 100755 (executable)
--- a/src/5gnrsch/rg_sch_utl_clist.c
+++ b/src/5gnrsch/rg_sch_utl_clist.c
@@ -29,18 +29,9 @@
 *********************************************************************21*/
   
 /* header include files (.h) */
-
-#include "envopt.h"        /* environment options */  
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
+#include "common_def.h"
 
 /* header/extern include files (.x) */
-  
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system services */
 #include "rg_sch_clist.x"      /* common functions */
 
 

diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c
index 27ed26c..269ae0b 100644 (file)
--- a/src/5gnrsch/sch.c
+++ b/src/5gnrsch/sch.c
@@ -31,41 +31,22 @@
 /** @file sch.c
 @brief This file implements the schedulers main access to MAC layer code.
 */
-#include "stdbool.h"
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"        
+#include "du_app_mac_inf.h"
 #include "lrg.h"
-#include "rgr.h"
 #include "tfu.h"
+#include "du_log.h"
+#include "rgr.h"
 #include "rg_sch_inf.h"
 #include "rg_sch.h"
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
+
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
 #include "rg_sch_inf.x"         /* typedefs for Scheduler */
-#include "du_app_mac_inf.h"
 #include "mac_sch_interface.h"
 #include "sch.h"
 #include "sch_utils.h"
-#include "du_log.h"
-#include "common_def.h"
 
 extern SchCb schCb[SCH_MAX_INST];
 void SchFillCfmPst(Pst *reqPst,Pst *cfmPst,RgMngmt *cfm);

diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h
index 99044f2..3090cbd 100644 (file)
--- a/src/5gnrsch/sch.h
+++ b/src/5gnrsch/sch.h
@@ -71,7 +71,7 @@
    _rspPst.dstEnt    = ENTRG;\
    _rspPst.srcInst   = 1;\
    _rspPst.dstInst   = 0;\
-       _rspPst.selector  = MAC_SELECTOR_TC;\
+       _rspPst.selector  = ODU_SELECTOR_TC;\
 }      
 extern uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst);
 /**

diff --git a/src/5gnrsch/sch_common.c b/src/5gnrsch/sch_common.c
index 30c0049..a8bb0b7 100644 (file)
--- a/src/5gnrsch/sch_common.c
+++ b/src/5gnrsch/sch_common.c
@@ -31,29 +31,10 @@ File:     sch_common.c
 /** @file sch_common.c
   @brief This module performs common scheduling
  */
-#include "stdbool.h"
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "tfu.h"
 #include "lrg.h"
 
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "tfu.x"
 #include "lrg.x"
 #include "du_log.h"
@@ -61,7 +42,6 @@ File:     sch_common.c
 #include "mac_sch_interface.h"
 #include "sch.h"
 #include "sch_utils.h"
-#include "common_def.h"
 
 extern SchCb schCb[SCH_MAX_INST];
 extern uint16_t prachCfgIdxTable[MAX_PRACH_CONFIG_IDX][8];

diff --git a/src/5gnrsch/sch_rach.c b/src/5gnrsch/sch_rach.c
index 65d3e40..de1a855 100644 (file)
--- a/src/5gnrsch/sch_rach.c
+++ b/src/5gnrsch/sch_rach.c
@@ -31,30 +31,9 @@
 /** @file sch_rach.c
 @brief This file implements the rach handling.
 */
-
-#include "stdbool.h"
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "tfu.h"
 #include "lrg.h"
-
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "tfu.x"
 #include "lrg.x"
 #include "du_log.h"
@@ -62,7 +41,6 @@
 #include "mac_sch_interface.h"
 #include "sch.h"
 #include "sch_utils.h"
-#include "common_def.h"
 
 extern SchCb schCb[SCH_MAX_INST];
 extern uint8_t puschDeltaTable[MAX_MU_PUSCH];

diff --git a/src/5gnrsch/sch_slot_ind.c b/src/5gnrsch/sch_slot_ind.c
index 3f4b7e8..4a6b998 100644 (file)
--- a/src/5gnrsch/sch_slot_ind.c
+++ b/src/5gnrsch/sch_slot_ind.c
@@ -31,29 +31,9 @@ File:     sch_slot_ind.c
 /** @file sch_slot_ind.c
   @brief This module processes slot indications
  */
-#include "stdbool.h"
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "tfu.h"
 #include "lrg.h"
-
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
 #include "tfu.x"
 #include "lrg.x"
 #include "du_log.h"
@@ -61,7 +41,6 @@ File:     sch_slot_ind.c
 #include "mac_sch_interface.h"
 #include "sch.h"
 #include "sch_utils.h"
-#include "common_def.h"
 
 SchMacDlAllocFunc schMacDlAllocOpts[] =
 {

diff --git a/src/cm/ckw.c b/src/cm/ckw.c
index feec780..e216b6a 100755 (executable)
--- a/src/cm/ckw.c
+++ b/src/cm/ckw.c
@@ -29,32 +29,10 @@
 
 *********************************************************************21*/
 
-#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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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 "ckw.h"           /* CKW defines */
-
+#include "common_def.h"
+#include "ckw.h"
+#include "ckw.x"
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
-#include "ckw.x"           /* CKW */
 
 \f
 #ifdef __cplusplus
@@ -550,7 +528,7 @@ CkwCfgInfo        *cfgInfo;
 
     switch(pst->selector)
     {
-       case CKW_SEL_LWLC:
+       case ODU_SELECTOR_LWLC:
           {
              CMCHKPK(cmPkPtr,(PTR) cfgInfo, mBuf);
              break;
@@ -690,7 +668,7 @@ CkwCfgCfmInfo     *cfgCfmInfo;
     switch(pst->selector)
     {
 #ifdef LCCKW
-       case CKW_SEL_LC:
+       case ODU_SELECTOR_LC:
           {
              ret1 = cmPkCkwCfgCfmInfo( (cfgCfmInfo), pst, mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1430,7 +1408,7 @@ Buffer            *mBuf;
 
     switch(pst->selector)
     {
-       case CKW_SEL_LWLC:
+       case ODU_SELECTOR_LWLC:
           {
              CMCHKUNPK(cmUnpkPtr,(PTR *) &cfgInfo, mBuf); 
              break;
@@ -1496,7 +1474,7 @@ Buffer            *mBuf;
     switch(pst->selector)
     {
 #ifdef LCCKW
-       case CKW_SEL_LC:
+       case ODU_SELECTOR_LC:
        {
           ret1 = cmUnpkCkwCfgCfmInfo( (cfgCfmInfo), pst, mBuf);
 #if(ERRCLASS & ERRCLS_DEBUG)

diff --git a/src/cm/ckw.h b/src/cm/ckw.h
index 71f6f1d..aa3f154 100755 (executable)
--- a/src/cm/ckw.h
+++ b/src/cm/ckw.h
@@ -42,11 +42,6 @@ EXTERN "C" {
  
 /* CKW Interface Hash Defines */
 
-/* Loose Coupling define */
-#define CKW_SEL_LC            0     /*!< Loose Coupling Option */
-#define CKW_SEL_TC            1     /*!< Tight Coupling Option */
-#define CKW_SEL_LWLC          2     /*!< Light Weight Loose Coupling */
-
 /* CKW Interface defines */
 #define CKW_MAX_ENT_CFG       24    /*!< Maximum number of entities to configure */
 /* ckw_h_001.main_3 added support for L2 Measurement */   

diff --git a/src/cm/cm_inet.c b/src/cm/cm_inet.c
index 85dca98..cd12a0a 100644 (file)
--- a/src/cm/cm_inet.c
+++ b/src/cm/cm_inet.c
@@ -3365,12 +3365,14 @@ Ptr       value;                /* option value */
          if (status.sstat_primary.spinfo_state == SCTP_ACTIVE)
              pSctpStatus->primary.isActive = TRUE;
          else
+                       {
              pSctpStatus->primary.isActive = FALSE;
              pSctpStatus->primary.cwnd = status.sstat_primary.spinfo_cwnd;
              pSctpStatus->primary.srtt = status.sstat_primary.spinfo_srtt;
              pSctpStatus->primary.rto  = status.sstat_primary.spinfo_rto;
              pSctpStatus->primary.mtu  = status.sstat_primary.spinfo_mtu;
-         break;
+         }
+                       break;
 
       case CM_INET_OPT_SCTP_GET_PADDR_INFO:
          pPeerAddrInfo = (CmInetSctpPeerAddrInfo*)value;

diff --git a/src/cm/common_def.h b/src/cm/common_def.h
index 7ef5121..534cdfc 100644 (file)
--- a/src/cm/common_def.h
+++ b/src/cm/common_def.h
@@ -15,6 +15,46 @@
 #   limitations under the License.                                             #
 ################################################################################
 *******************************************************************************/
+#include <stdio.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "cm_mem.h"
+#include "cm_math.h"
+#include "envopt.h"
+#include "envdep.h"
+#include "envind.h"
+#include "gen.h" 
+#include "ssi.h" 
+#include "cm5.h"
+#include "cm_tkns.h"
+#include "cm_mblk.h"
+#include "cm_llist.h"
+#include "cm_hash.h"
+#include "cm_lte.h"
+#include "cm_err.h"
+#include "cm_tpt.h"
+#include "cm.h"
+#include "gen.x"           /* general */
+#include "ssi.x"           /* system services */
+#include "cm_math.x"
+#include "cm_tpt.x"
+#include "cm_tkns.x" 
+#include "cm_mblk.x"
+#include "cm_llist.x"
+#include "cm5.x" 
+#include "cm_hash.x"
+#include "cm_lte.x"
+#include "cm_lib.x"
 
 /* 5G ORAN phy delay */
 #define PHY_DELTA 2
+
+ /* SELECTORS */ 
+#define ODU_SELECTOR_LC 0
+#define ODU_SELECTOR_TC 1
+#define ODU_SELECTOR_LWLC 2
+

diff --git a/src/cm/crg.c b/src/cm/crg.c
index 9d2dc3a..ba3244d 100755 (executable)
--- a/src/cm/crg.c
+++ b/src/cm/crg.c
@@ -34,28 +34,12 @@
        primitives.
 */
 /* 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 "crg.h"           /* CRG 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 "crg.x"           /* CRG Interface includes */
 
-
 #ifdef LCCRG
 \f
 /**

diff --git a/src/cm/crg.h b/src/cm/crg.h
index 62a35b5..1e160ca 100755 (executable)
--- a/src/cm/crg.h
+++ b/src/cm/crg.h
@@ -78,9 +78,6 @@
 /* Activation time limit in terms of number of frames */
 #define CRG_ACTV_WIN_SIZE 20 /*!< Macro for Size of activation time window
                                 (in terms of number of frames) */
-/* selector(coupling) values */
-#define CRG_SEL_TC 1     /*!< Macro for Tight Coupling */
-#define CRG_SEL_LC 0     /*!< Macro for Light Coupling */
 
 /* pack unpack error code */
 #define ECRGXXX 0  /* reserved */

diff --git a/src/cm/ctf.c b/src/cm/ctf.c
index 2922e6e..8e2d2c1 100755 (executable)
--- a/src/cm/ctf.c
+++ b/src/cm/ctf.c
@@ -30,26 +30,10 @@
 *********************************************************************21*/
 
 /* header include files (.h) */
-#include "envopt.h"        /* Environment options             */
-#include "envdep.h"        /* Environment dependent options   */
-#include "envind.h"        /* Environment independent options */
-#include "gen.h"           /* General layer                   */
-#include "ssi.h"           /* System service interface        */
-#include "cm5.h"           /* Common timer library            */
-#include "cm_llist.h"      /* Common linked list library      */
-#include "cm_hash.h"       /* Common hash library             */
-#include "cm_tkns.h"       /* Common tokens                   */
-#include "cm_lte.h"        /* Common LTE Defines              */
+#include "common_def.h"
 #include "ctf.h"           /* CTF interface defines           */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* General layer                   */
-#include "ssi.x"           /* System services interface       */
-#include "cm_lib.x"        /* Common linrary function         */
-#include "cm_llist.x"      /* Common link list library        */
-#include "cm_hash.x"       /* Common hash list library        */
-#include "cm_tkns.x"       /* Common tokens                   */
-#include "cm_lte.x"        /* Common LTE library              */
 #ifdef TENB_AS_SECURITY
 #include "cm_mblk.x"
 #endif
@@ -713,7 +697,7 @@ CtfKdfReqInfo* kdfReqInfo;
       SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == CTF_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkCtfKdfReqInfo(kdfReqInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -726,7 +710,7 @@ CtfKdfReqInfo* kdfReqInfo;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LWLC) {
+   else if (pst->selector == ODU_SELECTOR_LWLC) {
    }
    if (cmPkCtfCfgTransId(&transId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -750,7 +734,7 @@ CtfKdfReqInfo* kdfReqInfo;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if (SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -971,7 +955,7 @@ CtfCnmCellSyncReq * cfgReqInfo;
       SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == CTF_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkCtfCtfCnmCellSyncReq(cfgReqInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -984,7 +968,7 @@ CtfCnmCellSyncReq * cfgReqInfo;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LWLC) {
+   else if (pst->selector == ODU_SELECTOR_LWLC) {
 
    if (cmPkPtr((PTR)cfgReqInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1021,7 +1005,7 @@ CtfCnmCellSyncReq * cfgReqInfo;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmCellSyncReq));
    }
    pst->event = (Event)EVTCTFCNMSYNCREQ;
@@ -1082,7 +1066,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&SyncReqMsg, sizeof(CtfCnmCellSyncReq))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1094,13 +1078,13 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   if (pst->selector == CTF_SEL_LWLC) {
+   if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmUnpkPtr((PTR *)&SyncReqMsg, mBuf) != ROK) {
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       }
    }
-  else if (pst->selector == CTF_SEL_LC)
+  else if (pst->selector == ODU_SELECTOR_LC)
       if (cmUnpkCtfCtfCnmCellSyncReq(SyncReqMsg, mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)SyncReqMsg, sizeof(CtfCnmCellSyncReq));
       SPutMsg(mBuf);
@@ -1164,7 +1148,7 @@ CtfCnmInitSyncReq * cfgReqInfo;
       SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == CTF_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkCtfcfgReqInfo(cfgReqInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1177,7 +1161,7 @@ CtfCnmInitSyncReq * cfgReqInfo;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LWLC) {
+   else if (pst->selector == ODU_SELECTOR_LWLC) {
 
    if (cmPkPtr((PTR)cfgReqInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1214,7 +1198,7 @@ CtfCnmInitSyncReq * cfgReqInfo;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(CtfCnmInitSyncReq));
    }
    pst->event = (Event)EVTCTFCNMINITSYNCREQ;
@@ -1277,7 +1261,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncReqInfo, sizeof(CtfCnmInitSyncReq))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1289,13 +1273,13 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   if (pst->selector == CTF_SEL_LWLC) {
+   if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmUnpkPtr((PTR *)&syncReqInfo, mBuf) != ROK) {
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       }
    }
-  else if (pst->selector == CTF_SEL_LC)
+  else if (pst->selector == ODU_SELECTOR_LC)
       if (cmUnpkCtfsyncReqInfo(syncReqInfo, mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)syncReqInfo, sizeof(CtfCnmInitSyncReq));
       SPutMsg(mBuf);
@@ -1433,7 +1417,7 @@ CtfCnmInitSyncRsp * cfgRspInfo;
       SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == CTF_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkCtfcfgRspInfo(cfgRspInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1446,7 +1430,7 @@ CtfCnmInitSyncRsp * cfgRspInfo;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LWLC) {
+   else if (pst->selector == ODU_SELECTOR_LWLC) {
 
    if (cmPkPtr((PTR)cfgRspInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1483,7 +1467,7 @@ CtfCnmInitSyncRsp * cfgRspInfo;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmInitSyncRsp));
    }
    pst->event = (Event)EVTCTFCNMINITSYNCRSP;
@@ -1620,7 +1604,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if((SGetSBuf(pst->region, pst->pool, (Data **)&syncRspInfo, sizeof(CtfCnmInitSyncRsp))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1632,13 +1616,13 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   if (pst->selector == CTF_SEL_LWLC) {
+   if (pst->selector == ODU_SELECTOR_LWLC) {
       if(cmUnpkPtr((PTR *)&syncRspInfo, mBuf) != ROK) {
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       }
    }
-  else if (pst->selector == CTF_SEL_LC)
+  else if (pst->selector == ODU_SELECTOR_LC)
       if(cmUnpkCtfCnmInitSyncRspMsg(syncRspInfo, mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)syncRspInfo, sizeof(CtfCnmInitSyncRsp));
       SPutMsg(mBuf);
@@ -1720,7 +1704,7 @@ CtfCnmCellSyncRsp * cfgRspInfo;
       SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == CTF_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkCtfCellSyncRsp(cfgRspInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1733,7 +1717,7 @@ CtfCnmCellSyncRsp * cfgRspInfo;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LWLC) {
+   else if (pst->selector == ODU_SELECTOR_LWLC) {
 
    if (cmPkPtr((PTR)cfgRspInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1770,7 +1754,7 @@ CtfCnmCellSyncRsp * cfgRspInfo;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       SPutSBuf(pst->region, pst->pool, (Data *)cfgRspInfo, sizeof(CtfCnmCellSyncRsp));
    }
    pst->event = (Event)EVTCTFCNMSYNCRSP;
@@ -1853,7 +1837,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncRspMsg, sizeof(CtfCnmCellSyncRsp))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1865,13 +1849,13 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   if (pst->selector == CTF_SEL_LWLC) {
+   if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmUnpkPtr((PTR *)&syncRspMsg, mBuf) != ROK) {
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       }
    }
-  else if (pst->selector == CTF_SEL_LC)
+  else if (pst->selector == ODU_SELECTOR_LC)
       if (cmUnpkCtfCnmSyncRspMsg(syncRspMsg, mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)syncRspMsg, sizeof(CtfCnmCellSyncRsp));
       SPutMsg(mBuf);
@@ -1954,7 +1938,7 @@ CtfCnmCellSyncInd * cfgIndInfo;
       SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == CTF_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkCtfcfgIndInfo(cfgIndInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -1967,7 +1951,7 @@ CtfCnmCellSyncInd * cfgIndInfo;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LWLC) {
+   else if (pst->selector == ODU_SELECTOR_LWLC) {
 
    if (cmPkPtr((PTR)cfgIndInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -2004,7 +1988,7 @@ CtfCnmCellSyncInd * cfgIndInfo;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       SPutSBuf(pst->region, pst->pool, (Data *)cfgIndInfo, sizeof(CtfCnmCellSyncInd));
    }
    pst->event = (Event)EVTCTFCNMSYNCIND;
@@ -2088,7 +2072,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&syncIndMsg, sizeof(CtfCnmCellSyncInd))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -2100,13 +2084,13 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   if (pst->selector == CTF_SEL_LWLC) {
+   if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmUnpkPtr((PTR *)&syncIndMsg, mBuf) != ROK) {
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       }
    }
-  else if (pst->selector == CTF_SEL_LC)
+  else if (pst->selector == ODU_SELECTOR_LC)
       if (cmUnpkCtfCnmSyncIndMsg(syncIndMsg, mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)syncIndMsg, sizeof(CtfCnmCellSyncInd));
       SPutMsg(mBuf);
@@ -2174,7 +2158,7 @@ CtfCfgReqInfo* cfgReqInfo;
       cmRelCtfCfgReq(pst, cfgReqInfo);     
       RETVALUE(RFAILED);
    }
-   if (pst->selector == CTF_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkCtfCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -2187,7 +2171,7 @@ CtfCfgReqInfo* cfgReqInfo;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LWLC) {
+   else if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmPkPtr((PTR)cfgReqInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -2222,7 +2206,7 @@ CtfCfgReqInfo* cfgReqInfo;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
          cmRelCtfCfgReq(pst, cfgReqInfo); 
    }
    pst->event = (Event) EVTCTFCFGREQ;
@@ -2471,7 +2455,7 @@ Buffer *mBuf;
       RETVALUE(RFAILED);
    }
    
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&kdfReqInfo, sizeof(CtfKdfReqInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -2485,13 +2469,13 @@ Buffer *mBuf;
          
    }
    
-   if (pst->selector == CTF_SEL_LWLC) {
+   if (pst->selector == ODU_SELECTOR_LWLC) {
       /*if (cmUnpkPtr((PTR *)&cfgReqInfo, mBuf) != ROK) {
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       }*/
    }
-   else if (pst->selector == CTF_SEL_LC) 
+   else if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkCtfKdfReqInfo(kdfReqInfo, mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)kdfReqInfo, sizeof(CtfKdfReqInfo));
       SPutMsg(mBuf);
@@ -2565,7 +2549,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&cfgReqInfo, sizeof(CtfCfgReqInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -2577,13 +2561,13 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   if (pst->selector == CTF_SEL_LWLC) {
+   if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmUnpkPtr((PTR *)&cfgReqInfo, mBuf) != ROK) {
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LC) 
+   else if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkCtfCfgReqInfo(pst,cfgReqInfo, mBuf) != ROK) {
       cmRelCtfCfgReq(pst, cfgReqInfo);
       SPutMsg(mBuf);
@@ -3476,7 +3460,7 @@ CtfUeInfo * newUeInfo;
       SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == CTF_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkCtfUeInfo(newUeInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3490,7 +3474,7 @@ CtfUeInfo * newUeInfo;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LWLC) {
+   else if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmPkPtr((PTR)newUeInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3504,7 +3488,7 @@ CtfUeInfo * newUeInfo;
          RETVALUE(RFAILED);
       }
    }
-   if (pst->selector == CTF_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkCtfUeInfo(ueInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3518,7 +3502,7 @@ CtfUeInfo * newUeInfo;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LWLC) {
+   else if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmPkPtr((PTR)ueInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3556,7 +3540,7 @@ CtfUeInfo * newUeInfo;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3639,7 +3623,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3651,13 +3635,13 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   if (pst->selector == CTF_SEL_LWLC) {
+   if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmUnpkPtr((PTR *)&ueInfo, mBuf) != ROK) {
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LC) 
+   else if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkCtfUeInfo(ueInfo, mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
       SPutMsg(mBuf);
@@ -3669,7 +3653,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&newUeInfo, sizeof(CtfUeInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3682,13 +3666,13 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   if (pst->selector == CTF_SEL_LWLC) {
+   if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmUnpkPtr((PTR *)&newUeInfo, mBuf) != ROK) {
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LC) 
+   else if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkCtfUeInfo(newUeInfo, mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
       SPutSBuf(pst->region, pst->pool, (Data *)newUeInfo, sizeof(CtfUeInfo));
@@ -3763,7 +3747,7 @@ CmStatus status;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == CTF_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkCtfUeInfo(ueInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3776,7 +3760,7 @@ CmStatus status;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LWLC) {
+   else if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmPkPtr((PTR)ueInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3811,7 +3795,7 @@ CmStatus status;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if (SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3884,7 +3868,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&ueInfo, sizeof(CtfUeInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -3896,13 +3880,13 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   if (pst->selector == CTF_SEL_LWLC) {
+   if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmUnpkPtr((PTR *)&ueInfo, mBuf) != ROK) {
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LC) 
+   else if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkCtfUeInfo(ueInfo, mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)ueInfo, sizeof(CtfUeInfo));
       SPutMsg(mBuf);
@@ -8117,7 +8101,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
             sizeof(CtfPeriodicRemCellSearchRsp));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == CTF_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkCtfPeriodicCellSearchRsp(CellCfgRsp, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       /* ctf_c_001.main_3 Compilation warning fix with g++ */
@@ -8131,7 +8115,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == CTF_SEL_LWLC) {
+   else if (pst->selector == ODU_SELECTOR_LWLC) {
 
    if (cmPkPtr((PTR)CellCfgRsp, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -8171,7 +8155,7 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp;
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       SPutSBuf(pst->region, pst->pool, (Data *)CellCfgRsp,
             sizeof(CtfPeriodicRemCellSearchRsp));
    }
@@ -8276,7 +8260,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != CTF_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&CellSrchRsp,
                   sizeof(CtfPeriodicRemCellSearchRsp))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -8289,13 +8273,13 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   if (pst->selector == CTF_SEL_LWLC) {
+   if (pst->selector == ODU_SELECTOR_LWLC) {
       if (cmUnpkPtr((PTR *)&CellSrchRsp, mBuf) != ROK) {
          SPutMsg(mBuf);
          RETVALUE(RFAILED);
       }
    }
-  else if (pst->selector == CTF_SEL_LC)
+  else if (pst->selector == ODU_SELECTOR_LC)
       if (cmUnpkCtfPerRemCellSrch(CellSrchRsp, mBuf) != ROK) {
       SPutSBuf(pst->region, pst->pool, (Data *)CellSrchRsp,
             sizeof(CtfPeriodicRemCellSearchRsp));

diff --git a/src/cm/ctf.h b/src/cm/ctf.h
index 4a8e169..144b779 100755 (executable)
--- a/src/cm/ctf.h
+++ b/src/cm/ctf.h
@@ -177,10 +177,6 @@
 
 #define CTF_CFG_TRANSID_SIZE 9  /*!< Macro for Transaction ID size */
 
-/* selector(coupling) values */
-#define CTF_SEL_LC     0     /*!< Macro for Light Coupling */
-#define CTF_SEL_TC     1     /*!< Macro for Tight Coupling */
-#define CTF_SEL_LWLC   2     /*!< Macro for Light Weight Loose Coupling */
 
 /* Amit */
 #define CTF_MAX_SCELL_PER_UE         7

diff --git a/src/cm/du_app_mac_inf.c b/src/cm/du_app_mac_inf.c
index eb686a1..a8543aa 100644 (file)
--- a/src/cm/du_app_mac_inf.c
+++ b/src/cm/du_app_mac_inf.c
@@ -16,26 +16,12 @@
 ################################################################################
 *******************************************************************************/
 
-#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 "common_def.h"
 #include "ss_queue.h"
 #include "ss_task.h"
 #include "ss_msg.h"
-
-#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 "du_cfg.h"
 #include "du_app_mac_inf.h"
-#include "cm.h"
 
 /**************************************************************************
  * @brief Function to pack Loose Coupled 
@@ -56,12 +42,12 @@
  ***************************************************************************/
 int  packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg)
 {
-   if(pst->selector == DU_SELECTOR_LC)
+   if(pst->selector == ODU_SELECTOR_LC)
    {
       /* we are now implemented only light wieght lossely coupled interface */
       return RFAILED;
    }
-   else if(pst->selector == DU_SELECTOR_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       Buffer *mBuf = NULLP;
 
@@ -105,7 +91,7 @@ int  unpackDuMacCellCfg(
    U16 ret = ROK;
    MacCellCfg *macCellCfg;
 
-   if(pst->selector == DU_SELECTOR_LWLC)
+   if(pst->selector == ODU_SELECTOR_LWLC)
    {
       /* unpack the address of the structure */
       CMCHKUNPK(cmUnpkPtr, (PTR *)&macCellCfg, mBuf);
@@ -139,7 +125,7 @@ int  unpackDuMacCellCfg(
  ***************************************************************************/
 int  packMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm)
 {
-   if(pst->selector == DU_SELECTOR_LC)
+   if(pst->selector == ODU_SELECTOR_LC)
    {
       Buffer *mBuf = NULLP;
       if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) 
@@ -153,7 +139,7 @@ int  packMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm)
 
       return SPstTsk(pst,mBuf);
    }
-   else if(pst->selector == DU_SELECTOR_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       /* only LC is supported */
       return RFAILED;
@@ -185,7 +171,7 @@ int unpackMacCellCfgCfm(
 {
    MacCellCfgCfm macCellCfgCfm;
 
-   if(pst->selector == DU_SELECTOR_LC)
+   if(pst->selector == ODU_SELECTOR_LC)
    {
       /* unpack the transaction ID in CNF structure */
       CMCHKUNPK(SUnpkU16, &(macCellCfgCfm.transId), mBuf);
@@ -221,12 +207,12 @@ uint16_t packMacCellStartReq(Pst *pst, MacCellStartInfo  *cellStartInfo)
 {
        Buffer *mBuf = NULLP;
 
-   if(pst->selector == DU_SELECTOR_LC)
+   if(pst->selector == ODU_SELECTOR_LC)
    {
       /* Loose coupling not supported */
       return RFAILED;
    }
-   else if(pst->selector == DU_SELECTOR_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
 
       if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK)
@@ -264,7 +250,7 @@ uint16_t unpackMacCellStartReq(DuMacCellStartReq func, Pst *pst, Buffer *mBuf)
 {
    MacCellStartInfo  *cellStartInfo;
  
-   if(pst->selector == DU_SELECTOR_LWLC)
+   if(pst->selector == ODU_SELECTOR_LWLC)
    {
       /* unpack the address of the structure */
       CMCHKUNPK(cmUnpkPtr, (PTR *)&cellStartInfo, mBuf);
@@ -298,12 +284,12 @@ uint16_t unpackMacCellStartReq(DuMacCellStartReq func, Pst *pst, Buffer *mBuf)
  * ****************************************************************/
 uint16_t packMacCellStopReq(Pst *pst, MacCellStopInfo  *cellStopInfo)
 {
-   if(pst->selector == DU_SELECTOR_LC)
+   if(pst->selector == ODU_SELECTOR_LC)
    {
       /* Loose coupling not supported */
       return RFAILED;
    }
-   else if(pst->selector == DU_SELECTOR_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       Buffer *mBuf = NULLP;
  
@@ -343,7 +329,7 @@ uint16_t unpackMacCellStopReq(DuMacCellStopReq func, Pst *pst, Buffer *mBuf)
 {
    MacCellStopInfo  *cellStopInfo;
   
-   if(pst->selector == DU_SELECTOR_LWLC)
+   if(pst->selector == ODU_SELECTOR_LWLC)
    {
       /* unpack the address of the structure */
       CMCHKUNPK(cmUnpkPtr, (PTR *)&cellStopInfo, mBuf);
@@ -385,7 +371,7 @@ uint16_t packMacSlotInd(Pst *pst, SlotInfo *slotInfo )
       return RFAILED;
    }
  
-   if(pst->selector == DU_SELECTOR_LC)
+   if(pst->selector == ODU_SELECTOR_LC)
    {
       CMCHKPK(SPkU16, slotInfo->cellId, mBuf);
       CMCHKPK(SPkU16, slotInfo->sfn, mBuf);
@@ -394,7 +380,7 @@ uint16_t packMacSlotInd(Pst *pst, SlotInfo *slotInfo )
       CM_FREE_SHRABL_BUF(pst->region, pst->pool, slotInfo, sizeof(SlotInfo));
                slotInfo = NULL;
    }
-   else if(pst->selector == DU_SELECTOR_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       /* pack the address of the structure */
       CMCHKPK(cmPkPtr,(PTR)slotInfo, mBuf);
@@ -427,7 +413,7 @@ uint16_t packMacSlotInd(Pst *pst, SlotInfo *slotInfo )
  * ****************************************************************/
 uint16_t unpackMacSlotInd(DuMacSlotInd func, Pst *pst, Buffer *mBuf)
 {
-   if(pst->selector == DU_SELECTOR_LWLC)
+   if(pst->selector == ODU_SELECTOR_LWLC)
    {
       SlotInfo *slotInfo;
 
@@ -436,7 +422,7 @@ uint16_t unpackMacSlotInd(DuMacSlotInd func, Pst *pst, Buffer *mBuf)
       SPutMsg(mBuf);
       return (*func)(pst, slotInfo);
    }
-   else if(pst->selector == DU_SELECTOR_LC)
+   else if(pst->selector == ODU_SELECTOR_LC)
    {
       SlotInfo slotInfo;
 
@@ -483,7 +469,7 @@ uint16_t packMacStopInd(Pst *pst, MacCellStopInfo *cellStopId)
       return RFAILED;
    }
 
-   if(pst->selector == DU_SELECTOR_LC)
+   if(pst->selector == ODU_SELECTOR_LC)
    {
       /*pack the payload here*/
       DU_LOG("\nDU APP : Packed CellId");
@@ -491,7 +477,7 @@ uint16_t packMacStopInd(Pst *pst, MacCellStopInfo *cellStopId)
       CM_FREE_SHRABL_BUF(pst->region, pst->pool, cellStopId, sizeof(MacCellStopInfo));
       cellStopId = NULL;
    }
-   else if(pst->selector == DU_SELECTOR_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       /* pack the address of the structure */
       CMCHKPK(cmPkPtr,(PTR)cellStopId, mBuf);
@@ -524,7 +510,7 @@ uint16_t packMacStopInd(Pst *pst, MacCellStopInfo *cellStopId)
  * ****************************************************************/
 uint16_t unpackMacStopInd(DuMacStopInd func, Pst *pst, Buffer *mBuf)
 {
-   if(pst->selector == DU_SELECTOR_LWLC)
+   if(pst->selector == ODU_SELECTOR_LWLC)
    {
       MacCellStopInfo *cellStopId;
       /* unpack the address of the structure */
@@ -532,7 +518,7 @@ uint16_t unpackMacStopInd(DuMacStopInd func, Pst *pst, Buffer *mBuf)
       SPutMsg(mBuf);
       return (*func)(pst, cellStopId);
    }
-   else if(pst->selector == DU_SELECTOR_LC)
+   else if(pst->selector == ODU_SELECTOR_LC)
    {
       MacCellStopInfo cellStopId;
       CMCHKUNPK(SUnpkU16, &(cellStopId.cellId), mBuf);
@@ -571,7 +557,7 @@ uint16_t packMacUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo)
 {
    Buffer *mBuf = NULLP;
  
-       if(pst->selector == DU_SELECTOR_LWLC)
+       if(pst->selector == ODU_SELECTOR_LWLC)
        {
                if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK)
                {
@@ -610,7 +596,7 @@ uint16_t packMacUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo)
  * ****************************************************************/
 uint16_t unpackMacUlCcchInd(DuMacUlCcchInd func, Pst *pst, Buffer *mBuf)
 {
-   if(pst->selector == DU_SELECTOR_LWLC)
+   if(pst->selector == ODU_SELECTOR_LWLC)
    {
       UlCcchIndInfo *ulCcchIndInfo;
 
@@ -650,7 +636,7 @@ uint16_t packMacDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo)
 {
        Buffer *mBuf = NULLP;
 
-       if(pst->selector == DU_SELECTOR_LWLC)
+       if(pst->selector == ODU_SELECTOR_LWLC)
        {
                if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK)
                {
@@ -689,7 +675,7 @@ uint16_t packMacDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo)
  * ****************************************************************/
 uint16_t unpackMacDlCcchInd(DuMacDlCcchInd func, Pst *pst, Buffer *mBuf)
 {
-       if(pst->selector == DU_SELECTOR_LWLC)
+       if(pst->selector == ODU_SELECTOR_LWLC)
        {
                DlCcchIndInfo *dlCcchIndInfo;
 
@@ -730,7 +716,7 @@ uint8_t packDuMacUeCreateReq(Pst *pst, MacUeCfg *ueCfg)
 {
    Buffer *mBuf = NULLP;
  
-   if(pst->selector == DU_SELECTOR_LWLC)
+   if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK)
       {
@@ -769,7 +755,7 @@ uint8_t packDuMacUeCreateReq(Pst *pst, MacUeCfg *ueCfg)
  * ****************************************************************/
 uint8_t unpackMacUeCreateReq(DuMacUeCreateReq func, Pst *pst, Buffer *mBuf)
 {
-       if(pst->selector == DU_SELECTOR_LWLC)
+       if(pst->selector == ODU_SELECTOR_LWLC)
        {
                MacUeCfg *ueCfg;
 

diff --git a/src/cm/du_app_mac_inf.h b/src/cm/du_app_mac_inf.h
index ccc3206..a343fc2 100644 (file)
--- a/src/cm/du_app_mac_inf.h
+++ b/src/cm/du_app_mac_inf.h
@@ -46,6 +46,7 @@
 
 #define SRB_ID_0 0
 #define SRB_ID_1 1
+
 /* Macro for Ue Context */
 #define MAX_NUM_LOGICAL_CHANNELS 11
 #define MAX_NUM_SR_CFG_PER_CELL_GRP 8   /* Max number of scheduling request config per cell group */
@@ -61,11 +62,6 @@
 #define PDSCH_START_SYMBOL_LEN 53
 #define PUSCH_START_SYMBOL_LEN 41
 
-/* Macros for coupling */
-#define DU_MAC_LC  0
-#define DU_MAC_TC  1
-#define DU_MAC_LWLC  2
-
 /* Event IDs */
 #define EVENT_MAC_CELL_CONFIG_REQ    200
 #define EVENT_MAC_CELL_CONFIG_CFM    201

diff --git a/src/cm/kwu.c b/src/cm/kwu.c
index f5ff49a..6cb2f78 100755 (executable)
--- a/src/cm/kwu.c
+++ b/src/cm/kwu.c
@@ -30,18 +30,7 @@
 *********************************************************************21*/
 \f
 /* 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 "cm5.h"           /* common timer defines */
-#include "cm_tkns.h"       /* common tokens defines */
-#include "cm_mblk.h"       /* common memory allocation library 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"
 #ifdef TENB_SPLIT_ARCH
 #include "ss_queue.h"
 #include "ss_task.h"
@@ -50,16 +39,6 @@
 #include "kwu.h"           /* KWU defines */
 
 /* extern (.x) include files */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-
-#include "cm5.x"           /* common timer library */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_mblk.x"       /* common memory allocation */
-#include "cm_llist.x"      /* common link list */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lte.x"        /* common LTE includes */
-#include "cm_lib.x"        /* common memory allocation library */
 #ifdef TENB_SPLIT_ARCH
 #include "ss_queue.x"
 #include "ss_task.x"
@@ -266,7 +245,7 @@ Buffer * mBuf;
 #ifndef SS_RBUF
    switch(pst->selector)
    {
-     case KWU_SEL_LWLC:
+     case ODU_SELECTOR_LWLC:
         {
            if(pst->srcEnt == ENTDUAPP)
            {
@@ -296,7 +275,7 @@ Buffer * mBuf;
            }
         }
         break;
-     case KWU_SEL_LC:
+     case ODU_SELECTOR_LC:
         {
 #if (ERRCLASS & ERRCLS_ADD_RES)
            ret1 = cmPkKwuDatReqInfo( (datReq), mBuf);
@@ -375,7 +354,7 @@ Buffer * mBuf;
       switch(pst->selector)
       {
 #ifdef LCKWU
-         case KWU_SEL_LC:
+         case ODU_SELECTOR_LC:
             {
                ret1 = cmPkKwuDatReqInfo( (datReq), mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -390,7 +369,7 @@ Buffer * mBuf;
 #endif /*  ERRCLASS & ERRCLS_ADD_RES  */
             }
             break;
-         case KWU_SEL_LWLC:
+         case ODU_SELECTOR_LWLC:
             {
                CMCHKPK(cmPkPtr,(PTR)datReq, mBuf);
             }
@@ -401,7 +380,7 @@ Buffer * mBuf;
       CMCHKPKLOG(SPkS16, spId, mBuf, EKWU011, pst);
       pst->event = (Event) KWU_EVT_DAT_REQ;
       ret1 = SPstTsk(pst,mBuf);
-      if(pst->selector == KWU_SEL_LC)
+      if(pst->selector == ODU_SELECTOR_LC)
       {
          if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,
                   sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY) != ROK)
@@ -475,7 +454,7 @@ Buffer * mBuf;
 
     switch(pst->selector)
     {
-       case KWU_SEL_LWLC:
+       case ODU_SELECTOR_LWLC:
           {
              /* When the Selector is LWLC, we need to allocate memory, copy
               * the contents and pass the pointer of the allocated memory. The
@@ -499,7 +478,7 @@ Buffer * mBuf;
             CMCHKPK(cmPkPtr,(PTR)datIndInfo, mBuf);
           }
           break;
-       case KWU_SEL_LC:
+       case ODU_SELECTOR_LC:
           {
 #if (ERRCLASS & ERRCLS_ADD_RES)
              ret1 = cmPkKwuDatIndInfo( (datInd), mBuf);
@@ -586,12 +565,12 @@ KwuDatCfmInfo* datCfm;
 
    switch(pst->selector)
    {
-      case KWU_SEL_LWLC:
+      case ODU_SELECTOR_LWLC:
          {
             CMCHKPK(cmPkPtr,(PTR)datCfm, mBuf);
          }
          break;
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
          {
 #if (ERRCLASS & ERRCLS_ADD_RES)
             ret1 = cmPkKwuDatCfmInfo( (datCfm), mBuf);
@@ -660,7 +639,7 @@ KwuDiscSduInfo* discSdu;
 
    switch(pst->selector)
    {
-      case KWU_SEL_LWLC:
+      case ODU_SELECTOR_LWLC:
          {
             /* When the Selector is LWLC, we need to allocate memory, copy
              * the contents and pass the pointer of the allocated memory. The
@@ -684,7 +663,7 @@ KwuDiscSduInfo* discSdu;
            CMCHKPK(cmPkPtr,(PTR)discSduInfo, mBuf);
          }
          break;
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
          {
 #if (ERRCLASS & ERRCLS_ADD_RES)
             ret1 = cmPkKwuDiscSduInfo( (discSdu), mBuf);
@@ -807,12 +786,12 @@ KwuStaIndInfo* staInd;
 
     switch(pst->selector)
     {
-       case KWU_SEL_LWLC:
+       case ODU_SELECTOR_LWLC:
           {
              CMCHKPK(cmPkPtr,(PTR) staInd, mBuf);
           }
           break;
-       case KWU_SEL_LC:
+       case ODU_SELECTOR_LC:
           {
 #if (ERRCLASS & ERRCLS_ADD_RES)
              ret1 = cmPkKwuStaIndInfo( (staInd), mBuf);
@@ -884,7 +863,7 @@ CmLteRlcId rlcId;
     switch(pst->selector)
     {
 #ifdef LCKWU
-       case KWU_SEL_LC:
+       case ODU_SELECTOR_LC:
           {
 #if (ERRCLASS & ERRCLS_ADD_RES)
              ret1 = cmPkLteRlcId( &rlcId, mBuf);
@@ -940,12 +919,12 @@ KwuDiscSduInfo *discCfmSdu;
 
    switch(pst->selector)
    {
-      case KWU_SEL_LWLC:
+      case ODU_SELECTOR_LWLC:
          {
             CMCHKPK(cmPkPtr,(PTR)discCfmSdu, mBuf);
          }
          break;
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
          {
 #if (ERRCLASS & ERRCLS_ADD_RES)
             ret1 = cmPkKwuDiscSduInfo((discCfmSdu), mBuf);
@@ -1015,7 +994,7 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo;
 #ifdef LCKWU
    switch(pst->selector)
    {
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
       {
          cmPkKwuFlowCntrlIndInfo((flowCntrlIndInfo), mBuf);
 
@@ -1030,7 +1009,7 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo;
       }
       break;
       
-      case KWU_SEL_LWLC:
+      case ODU_SELECTOR_LWLC:
       {
          CMCHKPK(cmPkPtr,(PTR) flowCntrlIndInfo, mBuf);
       }
@@ -1266,12 +1245,12 @@ Buffer *mBuf;
 
    switch(pst->selector)
    {
-      case KWU_SEL_LWLC:
+      case ODU_SELECTOR_LWLC:
          {
             CMCHKUNPK(cmUnpkPtr,(PTR *) &datReq, mBuf);
          }
          break;
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
          {
             /* Allocate the memory statically  as there is no free 
              * in RLC */
@@ -1305,7 +1284,7 @@ Buffer *mBuf;
    retVal = (*func)(pst, datReq, mBuf);
    /* If LWLC is configured, we need to
     * free the memory here. */
-   if(pst->selector == KWU_SEL_LWLC)
+   if(pst->selector == ODU_SELECTOR_LWLC)
    {
       retVal = SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,
             sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY);
@@ -1360,12 +1339,12 @@ Buffer *mBuf;
 
     switch(pst->selector)
     {
-      case KWU_SEL_LWLC:
+      case ODU_SELECTOR_LWLC:
          {
             CMCHKUNPK(cmUnpkPtr,(PTR *) &datInd, mBuf);
          }
          break;
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
          {
             /*SGetStaticBuffer used as RRC has an equivalent free but PDCP
              * doesn't free any memory */
@@ -1413,7 +1392,7 @@ Buffer *mBuf;
     retVal = (*func)(pst, datInd, mBuf);
     /* If LWLC is configured and the destination entity is PDCP, we need to
      * free the memory here. */
-    if((pst->selector == KWU_SEL_LWLC) && (pst->dstEnt == ENTPJ))
+    if((pst->selector == ODU_SELECTOR_LWLC) && (pst->dstEnt == ENTPJ))
     {
        retVal = SPutStaticBuffer(pst->region, pst->pool, (Data *)datInd,
                 sizeof(KwuDatIndInfo),SS_SHARABLE_MEMORY);
@@ -1475,12 +1454,12 @@ Buffer *mBuf;
 
    switch(pst->selector)
    {
-      case KWU_SEL_LWLC:
+      case ODU_SELECTOR_LWLC:
          {
             CMCHKUNPK(cmUnpkPtr,(PTR *) &datCfm, mBuf);
          }
          break;
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
          {
             if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datCfm,\
                         sizeof(KwuDatCfmInfo),SS_SHARABLE_MEMORY)) != ROK)
@@ -1548,12 +1527,12 @@ Buffer *mBuf;
    CMCHKUNPK(SUnpkS16, &(spId), mBuf);
    switch(pst->selector)
    {
-      case KWU_SEL_LWLC:
+      case ODU_SELECTOR_LWLC:
          {
             CMCHKUNPK(cmUnpkPtr,(PTR *) &discSdu, mBuf);
          }
          break;
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
          {
             if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&discSdu,\
                         sizeof(KwuDiscSduInfo),SS_SHARABLE_MEMORY)) != ROK)
@@ -1648,12 +1627,12 @@ Buffer *mBuf;
    
    switch(pst->selector)
    {
-      case KWU_SEL_LWLC:
+      case ODU_SELECTOR_LWLC:
          {
             CMCHKUNPK(cmUnpkPtr,(PTR *)&staInd, mBuf);
          }
          break;
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
          {
             if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&staInd,\
                         sizeof(KwuStaIndInfo),SS_SHARABLE_MEMORY)) != ROK)
@@ -1727,7 +1706,7 @@ Buffer *mBuf;
    switch(pst->selector)
    {
 #ifdef LCKWU
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
          {
 #if(ERRCLASS & ERRCLS_DEBUG)
             ret1 = cmUnpkLteRlcId( &rlcId, mBuf);
@@ -1776,12 +1755,12 @@ Buffer         *mBuf;
 
    switch(pst->selector)
    {
-      case KWU_SEL_LWLC:
+      case ODU_SELECTOR_LWLC:
          {
             CMCHKUNPK(cmUnpkPtr,(PTR *) &discSdu, mBuf);
          }
          break;
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
          {
             if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&discSdu,\
                         sizeof(KwuDiscSduInfo),SS_SHARABLE_MEMORY)) != ROK)
@@ -1846,7 +1825,7 @@ Buffer         *mBuf;
    switch(pst->selector)
    {
 #ifdef LCKWU
-      case KWU_SEL_LC:
+      case ODU_SELECTOR_LC:
       {
          if(SGetStaticBuffer(pst->region, 
                      pst->pool, 
@@ -1861,7 +1840,7 @@ Buffer         *mBuf;
       }
       break;
 
-      case KWU_SEL_LWLC:
+      case ODU_SELECTOR_LWLC:
       {
          CMCHKUNPK(cmUnpkPtr,(PTR *) &flowCntrlInfo, mBuf);
       }

diff --git a/src/cm/kwu.h b/src/cm/kwu.h
index 89c4750..3a4dfac 100755 (executable)
--- a/src/cm/kwu.h
+++ b/src/cm/kwu.h
@@ -43,9 +43,6 @@ EXTERN "C" {
 /* KWU Interface Hash Defines */
 
 /* CKW Interface Hash Defines */
-/* selector(coupling) values */
-#define KWU_SEL_LC              0
-#define KWU_SEL_LWLC            2
 
 /***********************************************************************
         Defines for  KWU Interface Events

diff --git a/src/cm/legtp.c b/src/cm/legtp.c
index 6d763d1..56818b3 100644 (file)
--- a/src/cm/legtp.c
+++ b/src/cm/legtp.c
@@ -17,9 +17,13 @@
 *******************************************************************************/
  
 /* This file contains DU APP and EGTP interface functions */
-
-#include "du_egtp.h"
+#include "common_def.h"
+#include "lrg.h"
 #include "legtp.h"
+#include "lkw.x"
+#include "lrg.x"
+#include "du_cfg.h"
+#include "du_egtp.h"
 
 /*******************************************************************
  *

diff --git a/src/cm/lkw.c b/src/cm/lkw.c
index 931e0b4..c449d50 100755 (executable)
--- a/src/cm/lkw.c
+++ b/src/cm/lkw.c
@@ -44,22 +44,11 @@
  
 \f  
 /* 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 interface */
-#include "cm_lte.h"                /* layer manager */
+#include "common_def.h"
 #include "lkw.h"                /* Layer manager */
 
 /* header/extern include files (.x) */
 
-#include "gen.x"                /* general */
-#include "ssi.x"                /* system services interface */
-#include "cm_lib.x"             /* common library header file */
-#include "cm_lte.x"                /* layer manager */
 #include "lkw.x"                /* layer manager */
 
 #ifdef LCLKW

diff --git a/src/cm/lphy_stub.h b/src/cm/lphy_stub.h
index 995912d..9a4bed0 100644 (file)
--- a/src/cm/lphy_stub.h
+++ b/src/cm/lphy_stub.h
@@ -1,15 +1,3 @@
-#include "stdio.h"
-#include "stdbool.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 "gen.x"           /* General */
-#include "ssi.x"   /* System services */
-
 void l1HdlSlotIndicaion(bool);
 S16 buildAndSendSlotIndication();
 S16 duSendEgtpSlotInd();

diff --git a/src/cm/lrg.c b/src/cm/lrg.c
index 658c325..154b0e9 100755 (executable)
--- a/src/cm/lrg.c
+++ b/src/cm/lrg.c
@@ -35,25 +35,9 @@
 */
 
 /* 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 "lrg.h"           /* LRG 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 "lrg.x"           /* LRG Interface includes */
 
 #if (defined(LCLRG))
@@ -95,7 +79,7 @@ RgMngmt * cfg;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfg, EVTLRGCFGREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -193,7 +177,7 @@ RgMngmt * cfg;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfg, EVTMACSCHGENCFGREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -291,7 +275,7 @@ RgMngmt * cfm;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfm, EVTLRGCFGCFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -389,7 +373,7 @@ RgMngmt * cfg;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfg, EVTMACSCHGENCFGCFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -487,7 +471,7 @@ RgMngmt * sts;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, sts, EVTLRGSTSREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -585,7 +569,7 @@ RgMngmt * cfm;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfm, EVTLRGSTSCFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -877,7 +861,7 @@ RgMngmt * usta;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, usta, EVTLRGUSTAIND, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -975,7 +959,7 @@ RgMngmt * sta;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, sta, EVTLRGSCHSTAIND, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1073,7 +1057,7 @@ RgMngmt * cntrl;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cntrl, EVTLRGCNTRLREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1171,7 +1155,7 @@ RgMngmt * cntrl;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cntrl, EVTLRGSCHCNTRLREQ, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1269,7 +1253,7 @@ RgMngmt * cfm;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cfm, EVTLRGCNTRLCFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1367,7 +1351,7 @@ RgMngmt * cntrl;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkRgMngmt(pst, cntrl, EVTLRGSCHCNTRLCFM, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1469,7 +1453,7 @@ Buffer * trcBuf;
       SPutMsg(trcBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       MsgLen msgLen;
       if (SFndLenMsg(trcBuf, &msgLen) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
@@ -1551,7 +1535,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector == LRG_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       MsgLen msgLen, totalMsgLen;
       CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf);
       if (SFndLenMsg(mBuf, &totalMsgLen) != ROK)

diff --git a/src/cm/lrg.h b/src/cm/lrg.h
index a6805ea..9eed9d0 100755 (executable)
--- a/src/cm/lrg.h
+++ b/src/cm/lrg.h
@@ -98,9 +98,6 @@
 
 #define LRG_USTA_DGNVAL_MEM      1
 #define LRG_USTA_DGNVAL_HARQ     2
-/* selector(coupling) values */
-#define LRG_SEL_TC              1
-#define LRG_SEL_LC              0
 
 /* TRACE Macros */
 #define LRG_NO_TRACE            0

diff --git a/src/cm/lsctp.c b/src/cm/lsctp.c
index 01d44e9..793b211 100644 (file)
--- a/src/cm/lsctp.c
+++ b/src/cm/lsctp.c
@@ -17,7 +17,12 @@
 *******************************************************************************/
 
 /* This file contains DU APP and SCTP interface functions */
-
+#include "common_def.h"
+#include "lrg.h"
+#include "legtp.h"
+#include "du_cfg.h"
+#include "lkw.x"
+#include "lrg.x"
 #include "du_mgr.h"
 #include "du_sctp.h"
 

diff --git a/src/cm/mac_sch_interface.c b/src/cm/mac_sch_interface.c
index d870a00..d40204a 100644 (file)
--- a/src/cm/mac_sch_interface.c
+++ b/src/cm/mac_sch_interface.c
@@ -1,31 +1,11 @@
 /* header include files (.h) */
-#include "stdbool.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 "cm_mblk.h"        /* Common LTE Defines */
+#include "common_def.h"
 #include "tfu.h"           /* RGU Interface defines */
 #include "lrg.h"
-//#include "fapi.h"
 
 /* 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 "cm_mblk.x"        /* Common LTE Defines */
 #include "tfu.x"           /* RGU Interface includes */
 #include "lrg.x"
-
 #include "du_app_mac_inf.h"
 #include "mac_sch_interface.h"
 
@@ -76,7 +56,7 @@ int packMacSchSlotInd(Pst *pst, SlotIndInfo *slotInd)
  * ****************************************************************/
 int packMacSchRachInd(Pst *pst, RachIndInfo *rachInd)
 {
-   if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC))
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
    {
       /* TODO */
    }
@@ -105,7 +85,7 @@ int packMacSchRachInd(Pst *pst, RachIndInfo *rachInd)
  * ****************************************************************/
 int packMacSchCrcInd(Pst *pst, CrcIndInfo *crcInd)
 {
-   if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC))
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
    {
       /* TODO */
    }
@@ -134,7 +114,7 @@ int packMacSchCrcInd(Pst *pst, CrcIndInfo *crcInd)
  * ****************************************************************/
 uint8_t packMacSchDlRlcBoInfo(Pst *pst, DlRlcBOInfo *dlBoInfo)
 {
-   if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC))
+   if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC))
    {
       /* TODO */
    }

diff --git a/src/cm/mac_sch_interface.h b/src/cm/mac_sch_interface.h
index 650dca2..1272f68 100644 (file)
--- a/src/cm/mac_sch_interface.h
+++ b/src/cm/mac_sch_interface.h
@@ -25,10 +25,6 @@
 #define EVENT_CRC_IND_TO_SCH         6
 #define EVENT_DL_RLC_BO_INFO_TO_SCH  7
 
-/* selector */
-#define MAC_SCH_LC_SELECTOR 0
-#define MAC_SCH_TC_SELECTOR 1
-#define MAC_SCH_LWLC_SELECTOR 2
 
 /*macros*/
 #define NO_SSB 0

diff --git a/src/cm/nlu.h b/src/cm/nlu.h
index c5b83f5..8a519f4 100755 (executable)
--- a/src/cm/nlu.h
+++ b/src/cm/nlu.h
@@ -31,10 +31,6 @@
 #ifndef __NLUH__
 #define __NLUH__
 
-#define NLU_SEL_LC                             0
-#define NLU_SEL_TC                             1
-#define NLU_SEL_LWLC                           2 
-
 #define EVTNLUBNDREQ                           1
 #define EVTNLUBNDCFM                           2
 #define EVTNLUNHBRREQ                          3

diff --git a/src/cm/rgm.c b/src/cm/rgm.c
index a86cd0d..275468f 100755 (executable)
--- a/src/cm/rgm.c
+++ b/src/cm/rgm.c
@@ -36,25 +36,9 @@
 */
 
 /* 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 "rgm.h"           /* RGM 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 "rgm.x"           /* RGM Interface includes */
 
 #ifdef RGM_LWLC

diff --git a/src/cm/rgr.c b/src/cm/rgr.c
index a425332..a5a386a 100755 (executable)
--- a/src/cm/rgr.c
+++ b/src/cm/rgr.c
@@ -33,31 +33,9 @@
 @brief This file contains the packing/unpacking code for the RGR interface 
        primitives.
 */
-/* 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 */
-/* LTE_ADV_FLAG_REMOVED_START */
-#include "cm_mblk.h"
 /* LTE_ADV_FLAG_REMOVED_END */
+#include "common_def.h"
 #include "rgr.h"           /* RGR 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 */
-/* LTE_ADV_FLAG_REMOVED_START */
-#include "cm_mblk.x"
 /* LTE_ADV_FLAG_REMOVED_END */
 #include "rgr.x"           /* RGR Interface includes */
 
@@ -491,7 +469,7 @@ Buffer *mBuf;
       RETVALUE(RFAILED);
    }
    cmMemset((U8 *)cfgReqInfo, 0, sizeof(RgrCfgReqInfo));
-   if (pst->selector == RGR_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkRgrCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
          SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, sizeof(RgrCfgReqInfo));
          SPutMsg(mBuf);
@@ -9366,7 +9344,7 @@ Buffer *mBuf;
       RETVALUE(RFAILED);
    }
    cmMemset((U8 *)cfgReqInfo, 0, sizeof(RgrSiCfgReqInfo));
-   if (pst->selector == RGR_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkRgrSiCfgReqInfo(cfgReqInfo, mBuf) != ROK) {
          SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, 
                           sizeof(RgrSiCfgReqInfo));
@@ -9677,7 +9655,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == RGR_SEL_LC)
+   if (pst->selector == ODU_SELECTOR_LC)
    {
       if (cmUnpkRgrWarningSiCfgReqInfo(pst, warningSiCfgReqInfo, mBuf) != ROK) 
       {
@@ -10322,7 +10300,7 @@ Buffer *mBuf;
 
    cmMemset((U8 *)loadInfReq, 0, sizeof(RgrLoadInfReqInfo));
 
-   if (pst->selector == RGR_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
       if (cmUnpkRgrLoadInfReqInfo(loadInfReq, mBuf) != ROK) {
          SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, 
                           sizeof(RgrLoadInfReqInfo));

diff --git a/src/cm/rgr.h b/src/cm/rgr.h
index 8e7b268..eeb0360 100755 (executable)
--- a/src/cm/rgr.h
+++ b/src/cm/rgr.h
@@ -324,9 +324,6 @@
 #endif
 #define RGR_MAX_DL_CQI_SUBBAND   13 /*!< Maximum number of Sub-Bands */
 /** @} */
-/* Selector(coupling) values */
-#define RGR_SEL_TC              1   /*!< For Tight Coupling */
-#define RGR_SEL_LC              0   /*!< For Loose coupling */
 
 /* Pack/ Unpack error code */
 #define ERGRXXX                 0

diff --git a/src/cm/rgu.c b/src/cm/rgu.c
index 809f60e..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
@@ -448,7 +433,7 @@ RlcMacData  *dlData
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKPK(cmPkPtr,(PTR) dlData, mBuf);
    }
@@ -490,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));
@@ -534,7 +519,7 @@ Buffer *mBuf
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKUNPK(cmUnpkPtr,(PTR *) &dlData, mBuf);
    }
@@ -619,7 +604,7 @@ RlcMacData  *ulData;
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKPK(cmPkPtr,(PTR)ulData, mBuf);
    }
@@ -700,7 +685,7 @@ Buffer *mBuf
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKUNPK(cmUnpkPtr,(PTR *) &ulData, mBuf);
    }
@@ -863,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);
    }
@@ -956,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);
    }
@@ -1044,7 +1029,7 @@ RlcMacBOStatus  *boStatus
 
       RETVALUE(RFAILED);
    }
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKPK(cmPkPtr,(PTR) boStaInfo, mBuf);
    }
@@ -1116,7 +1101,7 @@ Buffer *mBuf
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKUNPK(cmUnpkPtr,(PTR *) &boSta, mBuf);
    }
@@ -1217,7 +1202,7 @@ RguHarqStatusInd  *harqStatusInd;
       RETVALUE(RFAILED);
    }
 
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKPK(cmPkPtr,(PTR) harqStaInd, mBuf); 
    }
@@ -1254,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)
@@ -1323,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);
    }  
@@ -1402,7 +1387,7 @@ RlcMacSchedRepInfo  * schRep
       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);
    }
@@ -1487,7 +1472,7 @@ Buffer *mBuf
       SPutMsg(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == RGU_SEL_LWLC)
+   if (pst->selector == ODU_SELECTOR_LWLC)
    {
       CMCHKUNPK(cmUnpkPtr,(PTR *) &schRep, mBuf);
    }
@@ -1627,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);
    }
@@ -1768,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);
    }

diff --git a/src/cm/rgu.h b/src/cm/rgu.h
index e0e9cf9..b43785d 100755 (executable)
--- a/src/cm/rgu.h
+++ b/src/cm/rgu.h
@@ -88,10 +88,6 @@ extern "C" {
 #else
 #define RGU_MAX_NUM_UE_PER_TTI  8  /*!< Max UEs Per Tti */ 
 #endif   
-/* selector(coupling) values */
-#define RGU_SEL_TC              1
-#define RGU_SEL_LC              0
-#define RGU_SEL_LWLC            2
 
 /* pack unpack error code */
 #define ERGUXXX                 0

diff --git a/src/cm/tfu.c b/src/cm/tfu.c
index 6e2c750..b32443c 100755 (executable)
--- a/src/cm/tfu.c
+++ b/src/cm/tfu.c
@@ -35,27 +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 "cm_mblk.h"        /* Common LTE Defines */
+#include "common_def.h" 
 #include "tfu.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 "cm_mblk.x"        /* Common LTE Defines */
 #include "tfu.x"           /* RGU Interface includes */
 
 #include "du_app_mac_inf.h"
@@ -881,7 +864,7 @@ TfuRaReqIndInfo * raReqInd;
       TFU_FREE_MEM(raReqInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuRaReqIndInfo(raReqInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -893,7 +876,7 @@ TfuRaReqIndInfo * raReqInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)raReqInd, mBuf) != ROK)
       {
@@ -918,7 +901,7 @@ TfuRaReqIndInfo * raReqInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(raReqInd);
    }
 
@@ -978,7 +961,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -994,7 +977,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuRaReqIndInfo(raReqInd, mBuf) != ROK) {
          TFU_FREE_MEM(raReqInd);
@@ -1007,7 +990,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&raReqInd, mBuf) != ROK)
       {
@@ -1085,7 +1068,7 @@ TfuRecpReqInfo * recpReq;
       TFU_FREE_MEM(recpReq);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuRecpReqInfo(recpReq, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1097,7 +1080,7 @@ TfuRecpReqInfo * recpReq;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)recpReq, mBuf) != ROK)
       {
@@ -1123,7 +1106,7 @@ TfuRecpReqInfo * recpReq;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(recpReq);
    }
 
@@ -1193,7 +1176,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -1207,7 +1190,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&recpReq, mBuf) != ROK)
       {
@@ -1222,7 +1205,7 @@ Buffer *mBuf;
       }
    }
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuRecpReqInfo(recpReq, (Ptr)&recpReq->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(recpReq);
@@ -1235,7 +1218,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR*)&recpReq, mBuf) != ROK)
       {
@@ -1305,7 +1288,7 @@ TfuUlCqiIndInfo * ulCqiInd;
       TFU_FREE_MEM(ulCqiInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuUlCqiIndInfo(ulCqiInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1317,7 +1300,7 @@ TfuUlCqiIndInfo * ulCqiInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)ulCqiInd, mBuf) != ROK)
       {
@@ -1342,7 +1325,7 @@ TfuUlCqiIndInfo * ulCqiInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(ulCqiInd);
    }
 
@@ -1403,7 +1386,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -1419,7 +1402,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuUlCqiIndInfo(ulCqiInd, (Ptr)&ulCqiInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(ulCqiInd);
@@ -1432,7 +1415,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&ulCqiInd, mBuf) != ROK)
       {
@@ -1500,7 +1483,7 @@ TfuHqIndInfo * hqInd;
       TFU_FREE_MEM(hqInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuHqIndInfo(hqInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1512,7 +1495,7 @@ TfuHqIndInfo * hqInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)hqInd, mBuf) != ROK)
       {
@@ -1537,7 +1520,7 @@ TfuHqIndInfo * hqInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(hqInd);
    }
 
@@ -1597,7 +1580,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -1613,7 +1596,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuHqIndInfo(hqInd, (Ptr)&hqInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(hqInd);
@@ -1626,7 +1609,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&hqInd, mBuf) != ROK)
       {
@@ -1693,7 +1676,7 @@ TfuSrIndInfo * srInd;
       TFU_FREE_MEM(srInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuSrIndInfo(srInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1705,7 +1688,7 @@ TfuSrIndInfo * srInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)srInd, mBuf) != ROK)
       {
@@ -1730,7 +1713,7 @@ TfuSrIndInfo * srInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(srInd);
    }
 
@@ -1789,7 +1772,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -1805,7 +1788,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuSrIndInfo(srInd, (Ptr)&srInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(srInd);
@@ -1818,7 +1801,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&srInd, mBuf) != ROK)
       {
@@ -1883,7 +1866,7 @@ TfuDlCqiIndInfo * dlCqiInd;
       TFU_FREE_MEM(dlCqiInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuDlCqiIndInfo(dlCqiInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1895,7 +1878,7 @@ TfuDlCqiIndInfo * dlCqiInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)dlCqiInd, mBuf) != ROK)
       {
@@ -1920,7 +1903,7 @@ TfuDlCqiIndInfo * dlCqiInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(dlCqiInd);
    }
    pst->event = (Event) EVTTFUDLCQIIND;
@@ -1976,7 +1959,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -1992,7 +1975,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuDlCqiIndInfo(dlCqiInd, (Ptr)&dlCqiInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(dlCqiInd);
@@ -2005,7 +1988,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&dlCqiInd, mBuf) != ROK)
       {
@@ -2353,7 +2336,7 @@ TfuDatIndInfo * datInd;
       TFU_FREE_MEM(datInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuDatIndInfo(datInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2365,7 +2348,7 @@ TfuDatIndInfo * datInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if(cmPkPtr((PTR)datInd, mBuf) != ROK)
       {
@@ -2390,7 +2373,7 @@ TfuDatIndInfo * datInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(datInd);
    }
 
@@ -2449,7 +2432,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -2465,7 +2448,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuDatIndInfo(datInd, (Ptr)&datInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(datInd);
@@ -2478,7 +2461,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if(cmUnpkPtr((PTR *)&datInd, mBuf) != ROK)
       {
@@ -2549,7 +2532,7 @@ TfuCrcIndInfo * crcIndInfo;
       TFU_FREE_MEM(crcIndInfo);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuCrcIndInfo(crcIndInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2561,7 +2544,7 @@ TfuCrcIndInfo * crcIndInfo;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)crcIndInfo, mBuf) != ROK)
       {
@@ -2587,7 +2570,7 @@ TfuCrcIndInfo * crcIndInfo;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(crcIndInfo);
    }
 
@@ -2650,7 +2633,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -2666,7 +2649,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuCrcIndInfo(crcIndInfo, (Ptr)&crcIndInfo->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(crcIndInfo);
@@ -2679,7 +2662,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&crcIndInfo, mBuf) != ROK)
       {
@@ -2747,7 +2730,7 @@ TfuTimingAdvIndInfo * timingAdvInd;
       TFU_FREE_MEM(timingAdvInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuTimingAdvIndInfo(timingAdvInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2759,7 +2742,7 @@ TfuTimingAdvIndInfo * timingAdvInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)timingAdvInd, mBuf) != ROK)
       {
@@ -2784,7 +2767,7 @@ TfuTimingAdvIndInfo * timingAdvInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(timingAdvInd);
    }
 
@@ -2844,7 +2827,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -2860,7 +2843,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuTimingAdvIndInfo(timingAdvInd, (Ptr)&timingAdvInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(timingAdvInd);
@@ -2873,7 +2856,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&timingAdvInd, mBuf) != ROK)
       {
@@ -2943,7 +2926,7 @@ TfuDatReqInfo * datReq;
       TFU_FREE_MEM(datReq);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuDatReqInfo(datReq, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2955,7 +2938,7 @@ TfuDatReqInfo * datReq;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if(cmPkPtr((PTR)datReq, mBuf) != ROK)
       {
@@ -2980,7 +2963,7 @@ TfuDatReqInfo * datReq;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(datReq);
    }
 
@@ -3042,7 +3025,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -3058,7 +3041,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuDatReqInfo(datReq, (Ptr)&datReq->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(datReq);
@@ -3071,7 +3054,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == TFU_SEL_LWLC)
+   else if (pst->selector == ODU_SELECTOR_LWLC)
    {
       if(cmUnpkPtr((PTR *)&datReq, mBuf) != ROK)
       {
@@ -3142,7 +3125,7 @@ TfuCntrlReqInfo * cntrlReq;
       TFU_FREE_MEM(cntrlReq);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuCntrlReqInfo(cntrlReq, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3154,7 +3137,7 @@ TfuCntrlReqInfo * cntrlReq;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)cntrlReq, mBuf) != ROK)
       {
@@ -3180,7 +3163,7 @@ TfuCntrlReqInfo * cntrlReq;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(cntrlReq);
    }
 
@@ -3243,7 +3226,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -3259,7 +3242,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuCntrlReqInfo(cntrlReq, (Ptr)&cntrlReq->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(cntrlReq);
@@ -3272,7 +3255,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&cntrlReq, mBuf) != ROK)
       {
@@ -3339,7 +3322,7 @@ TfuTtiIndInfo * ttiInd;
       SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuTtiIndInfo(ttiInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3351,7 +3334,7 @@ TfuTtiIndInfo * ttiInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)ttiInd, mBuf) != ROK)
       {
@@ -3378,7 +3361,7 @@ TfuTtiIndInfo * ttiInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if (SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3437,7 +3420,7 @@ Buffer *mBuf
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&slotInd, sizeof(SlotIndInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3449,7 +3432,7 @@ Buffer *mBuf
       }
    }
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpackSlotIndInfo(slotInd, mBuf) != ROK) {
          SPutSBuf(pst->region, pst->pool, (Data *)slotInd, sizeof(SlotIndInfo));
@@ -3462,7 +3445,7 @@ Buffer *mBuf
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&slotInd, mBuf) != ROK)
       {
@@ -3629,7 +3612,7 @@ Buffer *mBuf
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&slotInd, sizeof(SlotIndInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3641,7 +3624,7 @@ Buffer *mBuf
       }
    }
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpackSlotIndInfo(slotInd, mBuf) != ROK) {
          SPutSBuf(pst->region, pst->pool, (Data *)slotInd, sizeof(SlotIndInfo));
@@ -3654,7 +3637,7 @@ Buffer *mBuf
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&slotInd, mBuf) != ROK)
       {
@@ -3725,7 +3708,7 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr;
       SPutSBuf(pst->region, pst->pool, (Data *)pucchDeltaPwr, sizeof(TfuPucchDeltaPwrIndInfo));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuPucchDeltaPwrIndInfo(pucchDeltaPwr, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3737,7 +3720,7 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)pucchDeltaPwr, mBuf) != ROK)
       {
@@ -3762,7 +3745,7 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(pucchDeltaPwr);
    }
    pst->event = (Event) EVTTFUPUCCHDELPWR;
@@ -3819,7 +3802,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -3834,7 +3817,7 @@ Buffer *mBuf;
       }
    }
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuPucchDeltaPwrIndInfo(pucchDeltaPwr, (Ptr)&pucchDeltaPwr->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(pucchDeltaPwr);
@@ -3847,7 +3830,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&pucchDeltaPwr, mBuf) != ROK)
       {
@@ -15342,7 +15325,7 @@ TfuErrIndInfo * errInd;
       SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuErrIndInfo(errInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -15354,7 +15337,7 @@ TfuErrIndInfo * errInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)errInd, mBuf) != ROK)
       {
@@ -15381,7 +15364,7 @@ TfuErrIndInfo * errInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if (SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -15449,7 +15432,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&errInd, sizeof(TfuErrIndInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -15461,7 +15444,7 @@ Buffer *mBuf;
       }
    }
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuErrIndInfo(errInd, mBuf) != ROK) {
          SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo));
@@ -15474,7 +15457,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&errInd, mBuf) != ROK)
       {

diff --git a/src/cm/tfu.h b/src/cm/tfu.h
index 6a59ca6..641d3a1 100755 (executable)
--- a/src/cm/tfu.h
+++ b/src/cm/tfu.h
@@ -87,10 +87,6 @@
 #define TFU_MAX_HARQ_FDBKS       TFU_MAX_TB /*For Rel8/Rel9 UE*/
 #endif/*LTE_ADV*/
 
-/* Selector */
-#define MAC_SELECTOR_LC   0
-#define MAC_SELECTOR_TC   1
-#define MAC_SELECTOR_LWLC 2
 
 /* Event corresponding to each primitive at this interface */
 #define EVTTFUBNDREQ            1     /*!< Bind Request */
@@ -132,9 +128,6 @@
 #define MAX_ULSCH_PDUS_PER_TTI  1
 
 /* selector(coupling) values */
-#define TFU_SEL_TC              1    /*!< Selector for Tight coupling. */
-#define TFU_SEL_LC              0    /*!< Selector for Loose coupling. */
-#define TFU_SEL_LWLC            2    /*!< Selector for Light-weight loose coupling. */
 #define TFU_MAX_ALLOC_BYTES     4
 /* pack unpack error code */
 #define ETFUXXX                 0

diff --git a/src/cu_stub/cu_f1ap_msg_hdl.c b/src/cu_stub/cu_f1ap_msg_hdl.c
index 2f0bf5d..ad16319 100644 (file)
--- a/src/cu_stub/cu_f1ap_msg_hdl.c
+++ b/src/cu_stub/cu_f1ap_msg_hdl.c
@@ -17,7 +17,8 @@
 *******************************************************************************/
 
 /* This file contains F1AP message handler functions */
-
+#include "common_def.h"
+#include "odu_common_codec.h"
 #include "cu_stub_sctp.h"
 #include "cu_f1ap_msg_hdl.h"
 

diff --git a/src/cu_stub/cu_f1ap_msg_hdl.h b/src/cu_stub/cu_f1ap_msg_hdl.h
index c14e686..36c1b37 100644 (file)
--- a/src/cu_stub/cu_f1ap_msg_hdl.h
+++ b/src/cu_stub/cu_f1ap_msg_hdl.h
@@ -17,9 +17,6 @@
 *******************************************************************************/
 
 /* This file contains all F1AP message handler related functionality */
-#include<stdio.h>
-#include<sys/types.h>
-#include<string.h>
 #include<ProtocolIE-Field.h>
 #include "ProtocolExtensionField.h"
 #include "F1AP-PDU.h"
@@ -29,22 +26,6 @@
 #include "SRB-ToAddMod.h"
 #include "RRCSetup-IEs.h"
 #include "RRCSetup.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 "ss_queue.h"
-#include "ss_task.h"
-#include "ss_msg.h"
-
-#include "gen.x"           /* General */
-#include "ssi.x"   /* System services */
-#include "ss_queue.x"
-#include "ss_task.x"
-#include "ss_msg.x"
-
 #include "du_log.h"
 
 #define ENCODE_FAIL -1

diff --git a/src/cu_stub/cu_stub.c b/src/cu_stub/cu_stub.c
index 23bd42c..cc5cb34 100644 (file)
--- a/src/cu_stub/cu_stub.c
+++ b/src/cu_stub/cu_stub.c
@@ -17,10 +17,12 @@
 *******************************************************************************/
 
 /* This functions contains main() for cu_app */
-
+#include "common_def.h"
+#include "odu_common_codec.h"
 #include "cu_stub.h"
 #include "cu_stub_sctp.h"
 #include "cu_stub_egtp.h"
+#include "du_log.h"
 
 #define CU_ID 1
 #define CU_NAME "ORAN_OAM_CU"

diff --git a/src/cu_stub/cu_stub.h b/src/cu_stub/cu_stub.h
index 62a465c..22ae742 100644 (file)
--- a/src/cu_stub/cu_stub.h
+++ b/src/cu_stub/cu_stub.h
@@ -19,37 +19,6 @@
 #ifndef __CU_MGR_MAIN_H__
 #define __CU_MGR_MAIN_H__
 
-
-#include "stdio.h"
-#include "stdlib.h"
-#include "string.h"
-#include "stdbool.h"
-#include "ctype.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 "ss_queue.h"
-#include "ss_task.h"
-#include "ss_msg.h"
-#include "cm_inet.h"
-#include "cm_llist.h"      /* Common link list  defines  */
-#include "cm_hash.h"       /* Common hashlist  defines */
-
-#include "gen.x"           /* General */
-#include "ssi.x"   /* System services */
-#include "ss_queue.x"
-#include "ss_task.x"
-#include "ss_msg.x"
-#include "cm_lib.x"
-#include "cm_inet.x"
-#include "cm_llist.x"      /* Common link list  defines  */
-#include "cm_hash.x"       /* Common hashlist  defines */
-#include "odu_common_codec.h"
-
-#include "du_log.h"
 #define MAX_IPV6_LEN 16
 #define CU_DU_NAME_LEN_MAX 30      /* Max length of CU/DU name string */
 

diff --git a/src/cu_stub/cu_stub_egtp.c b/src/cu_stub/cu_stub_egtp.c
index 1db83d2..e715736 100644 (file)
--- a/src/cu_stub/cu_stub_egtp.c
+++ b/src/cu_stub/cu_stub_egtp.c
@@ -18,8 +18,10 @@
  
 /* This file contains all EGTP related functionality */
 
-#include <stdio.h>
+#include "common_def.h"
+#include "odu_common_codec.h"
 #include "cu_stub_egtp.h"
+#include "du_log.h"
 
 /* Global variable declaration */
 EgtpGlobalCb egtpCb;

diff --git a/src/cu_stub/cu_stub_sctp.c b/src/cu_stub/cu_stub_sctp.c
index c23a30e..1aba5cd 100644 (file)
--- a/src/cu_stub/cu_stub_sctp.c
+++ b/src/cu_stub/cu_stub_sctp.c
@@ -18,10 +18,12 @@
 
 /* This file contains all SCTP related functionality */
 
-#include <stdio.h> 
+#include "common_def.h" 
+#include "odu_common_codec.h"
 #include "cu_f1ap_msg_hdl.h"
 #include "cu_stub_sctp.h"
 #include "cu_stub_egtp.h"
+#include "du_log.h"
 
 CuSctpDestCb f1Params;
 /**************************************************************************

diff --git a/src/du_app/du_cell_mgr.c b/src/du_app/du_cell_mgr.c
index 73732df..c73cef2 100644 (file)
--- a/src/du_app/du_cell_mgr.c
+++ b/src/du_app/du_cell_mgr.c
@@ -17,10 +17,18 @@
 *******************************************************************************/
 
 /* This file contains message handling functionality for DU cell management */
+#include "common_def.h"
+#include "lrg.h"
+#include "legtp.h"
+#include "lrg.x"
+#include "lkw.x"
+#include "du_cfg.h"
+#include "E2AP-PDU.h"
 #include "du_cell_mgr.h"
+#include<ProtocolIE-Field.h>
+#include "F1AP-PDU.h"
 
 extern DuCfgParams duCfgParam;
-
 extern S16 duBuildAndSendMacCellCfg();
 
 /*******************************************************************

diff --git a/src/du_app/du_cell_mgr.h b/src/du_app/du_cell_mgr.h
index 1f9a6e3..281f617 100644 (file)
--- a/src/du_app/du_cell_mgr.h
+++ b/src/du_app/du_cell_mgr.h
@@ -19,7 +19,6 @@
 /* This file contains message handling functionality for DU APP */
 #ifndef __DU_CELL_MGR_H__
 #define __DU_CELL_MGR_H__
-
 #include "du_mgr.h"
 #include "du_log.h"
 #include "du_f1ap_msg_hdl.h"
@@ -27,8 +26,6 @@
 #include "rgr.h"
 #include "rgr.x"
 
-S16 procF1SetupRsp(F1AP_PDU_t *f1apMsg);
-S16 procCellsToBeActivated(Cells_to_be_Activated_List_t cellsToBeActivated);
 S16 duSendSchGnbCfg();
 S16 duSendSchGnbCfgToMac(RgrCfgReqInfo *cfgReq, U32 trans_id);
 #endif

diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c
index 197d9c5..f343561 100644 (file)
--- a/src/du_app/du_cfg.c
+++ b/src/du_app/du_cfg.c
@@ -17,6 +17,12 @@
 *******************************************************************************/
 
 /* This file contains all utility functions */
+#include "common_def.h"
+#include "legtp.h"
+#include "lrg.h"
+#include "lkw.x"
+#include "lrg.x"
+#include "du_cfg.h"
 #include "du_mgr.h"
 #include "du_sys_info_hdl.h"
 #include "MIB.h"
@@ -774,7 +780,7 @@ S16 duReadCfg()
    pst.dstInst = pst.srcInst;
    pst.dstProcId = pst.srcProcId;
    pst.event = EVTCFG;
-   pst.selector = DU_SELECTOR_TC;
+   pst.selector = ODU_SELECTOR_TC;
    pst.pool= DU_POOL;
 
 

diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h
index eec527e..885b799 100644 (file)
--- a/src/du_app/du_cfg.h
+++ b/src/du_app/du_cfg.h
@@ -186,11 +186,6 @@
 /* Events */
 #define EVTCFG 0
 
-/* Selector */
-#define DU_SELECTOR_LC   0
-#define DU_SELECTOR_TC   1
-#define DU_SELECTOR_LWLC 2
-
 #ifdef EGTP_TEST
 /* Macro definitions for EGTP procedures */
 #define EGTP_LCL_TEID 1     /* EGTP local tunnel id */

diff --git a/src/du_app/du_e2ap_msg_hdl.c b/src/du_app/du_e2ap_msg_hdl.c
index 89b364a..16c4fc2 100644 (file)
--- a/src/du_app/du_e2ap_msg_hdl.c
+++ b/src/du_app/du_e2ap_msg_hdl.c
@@ -15,13 +15,21 @@
 #   limitations under the License.                                             #
 ################################################################################
 *******************************************************************************/
-#include "du_e2ap_msg_hdl.h"
+#include "common_def.h"
+#include "lrg.h"
+#include "lkw.x"
+#include "lrg.x"
+#include "legtp.h"
+#include "du_cfg.h"
 #include "du_mgr_main.h"
 #include "GlobalE2node-gNB-ID.h"
+#include "odu_common_codec.h"
+#include<ProtocolIE-FieldE2.h>
+#include "E2AP-PDU.h"
+#include "du_e2ap_msg_hdl.h"
 
 /* Global variable */
 DuCfgParams duCfgParam;
-
 /*******************************************************************
  *
  * @brief Builds Global gNodeB Params

diff --git a/src/du_app/du_e2ap_msg_hdl.h b/src/du_app/du_e2ap_msg_hdl.h
index 75f1c45..28dc831 100644 (file)
--- a/src/du_app/du_e2ap_msg_hdl.h
+++ b/src/du_app/du_e2ap_msg_hdl.h
@@ -17,31 +17,6 @@
 *******************************************************************************/
 
 /* This file contains all E2AP message handler related functionality */
-#include<stdio.h>
-#include<sys/types.h>
-#include<string.h>
-#include<ProtocolIE-FieldE2.h>
-#include "E2AP-PDU.h"
-#include "PLMN-IdentityE2.h"
-#include "RICeventTriggerDefinition.h"
-#include "odu_common_codec.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 "ss_queue.h"
-#include "ss_task.h"
-#include "ss_msg.h"
-
-#include "gen.x"           /* General */
-#include "ssi.x"   /* System services */
-#include "ss_queue.x"
-#include "ss_task.x"
-#include "ss_msg.x"
-
-#include "du_log.h"
 
 #define ENCODE_FAIL -1
 
@@ -61,11 +36,9 @@ typedef struct e2apDb
 
 E2apMsgDb e2apMsgDb;
 uint8_t BuildAndSendE2SetupReq();
-uint8_t deAllocateE2SetupReqMsg(E2AP_PDU_t *e2apMsg, \
-  E2setupRequest_t *e2SetupReq, uint8_t idx);
 uint8_t SendE2APMsg(Region , Pool );
 void E2APMsgHdlr(Buffer *mBuf);
-
+uint8_t deAllocateE2SetupReqMsg(E2AP_PDU_t *e2apMsg, E2setupRequest_t *e2SetupReq, uint8_t idx);
 /**********************************************************************
          End of file
 **********************************************************************/

diff --git a/src/du_app/du_egtp.c b/src/du_app/du_egtp.c
index 5ba0a22..a75e7bf 100644 (file)
--- a/src/du_app/du_egtp.c
+++ b/src/du_app/du_egtp.c
@@ -17,8 +17,12 @@
 *******************************************************************************/
  
 /* This file contains all EGTP related functionality */
-
-#include <stdio.h>
+#include "common_def.h"
+#include "lrg.h"
+#include "lkw.x"
+#include "lrg.x"
+#include "legtp.h"
+#include "du_cfg.h"
 #include "du_egtp.h"
 #include "du_ue_mgr.h"
 
@@ -222,7 +226,7 @@ S16 egtpFillRspPst(Pst *pst, Pst *rspPst)
    rspPst->dstEnt = pst->srcEnt;
    rspPst->dstInst = pst->srcInst;
    rspPst->dstProcId = pst->srcProcId;
-   rspPst->selector = DU_SELECTOR_LC;
+   rspPst->selector = ODU_SELECTOR_LC;
    rspPst->pool= DU_POOL;
     
    return ROK;

diff --git a/src/du_app/du_f1ap_msg_hdl.c b/src/du_app/du_f1ap_msg_hdl.c
index 3cd438c..0f54288 100644 (file)
--- a/src/du_app/du_f1ap_msg_hdl.c
+++ b/src/du_app/du_f1ap_msg_hdl.c
@@ -17,7 +17,13 @@
 *******************************************************************************/
 
 /* This file contains F1AP message handler functions */
-
+#include "common_def.h"
+#include "lrg.h"
+#include "legtp.h"
+#include "lkw.x"
+#include "lrg.x"
+#include "du_cfg.h"
+#include "E2AP-PDU.h"
 #include "du_mgr.h"
 #include "du_mgr_main.h"
 #include "du_cell_mgr.h"
@@ -60,7 +66,13 @@
 #include "UplinkConfig.h"
 #include "PDSCH-ServingCellConfig.h"
 #include "DUtoCURRCContainer.h"
+#include<ProtocolIE-Field.h>
+#include "ProtocolExtensionField.h"
+#include "F1AP-PDU.h"
 
+S16 procGNBDUCfgUpdAck(F1AP_PDU_t *f1apMsg);
+uint8_t procDlRrcMsgTrans(F1AP_PDU_t *f1apMsg);
+void FreeDUConfigUpdate(F1AP_PDU_t *f1apDuCfg);
 extern char encBuf[ENC_BUF_MAX_LEN];
 extern DuCfgParams duCfgParam;
 uint8_t BuildULTnlInforet=RFAILED;

diff --git a/src/du_app/du_f1ap_msg_hdl.h b/src/du_app/du_f1ap_msg_hdl.h
index b158b9d..8f11449 100644 (file)
--- a/src/du_app/du_f1ap_msg_hdl.h
+++ b/src/du_app/du_f1ap_msg_hdl.h
@@ -17,31 +17,6 @@
 *******************************************************************************/
 
 /* This file contains all F1AP message handler related functionality */
-#include<stdio.h>
-#include<sys/types.h>
-#include<string.h>
-#include<ProtocolIE-Field.h>
-#include "ProtocolExtensionField.h"
-#include "F1AP-PDU.h"
-#include "Cells-to-be-Activated-List.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 "ss_queue.h"
-#include "ss_task.h"
-#include "ss_msg.h"
-
-#include "gen.x"           /* General */
-#include "ssi.x"   /* System services */
-#include "ss_queue.x"
-#include "ss_task.x"
-#include "ss_msg.x"
-
-#include "du_log.h"
-#include "odu_common_codec.h"
 
 #define TRANS_ID 1
 #define RRC_SIZE 1
@@ -56,10 +31,7 @@
 void F1APMsgHdlr(Buffer *mBuf);
 uint8_t BuildAndSendF1SetupReq();
 uint8_t BuildAndSendDUConfigUpdate();
-S16 procGNBDUCfgUpdAck(F1AP_PDU_t *f1apMsg);
-uint8_t procDlRrcMsgTrans(F1AP_PDU_t *f1apMsg);
 uint8_t BuildAndSendInitialRrcMsgTransfer(uint32_t gnbDuUeF1apId, uint16_t crnti, uint8_t *rrcContainer);
-void FreeDUConfigUpdate(F1AP_PDU_t *f1apDuCfg);
 /**********************************************************************
          End of file
 **********************************************************************/

diff --git a/src/du_app/du_mgr.h b/src/du_app/du_mgr.h
index 6b4183f..12bb1da 100644 (file)
--- a/src/du_app/du_mgr.h
+++ b/src/du_app/du_mgr.h
@@ -19,43 +19,8 @@
 /* This file contains message handling functionality for DU cell management */
 #ifndef __DU_MGR_H__
 #define __DU_MGR_H__
-
-#include "stdio.h"
-#include "ctype.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 "cm5.h"           /* Common timer defines */
-#include "cm_tkns.h"       /* Common tokens defines */
-#include "cm_mblk.h"       /* Common memory allocation library defines */
-#include "cm_llist.h"      /* Common link list  defines  */
-#include "cm_hash.h"       /* Common hashlist  defines */
-#include "cm_lte.h"
-#include "cm_inet.h"
-#include "lkw.h"
-#include "lrg.h"
-#include "legtp.h"
-#include "du_app_mac_inf.h"
-
-#include "gen.x"           /* General */
-#include "ssi.x"           /* System services */
-
-#include "cm5.x"           /* Common timer library */
-#include "cm_tkns.x"       /* Common tokens */
-#include "cm_mblk.x"       /* Common memory allocation */
-#include "cm_llist.x"      /* Common link list */
-#include "cm_hash.x"       /* Common hashlist */
-#include "cm_lte.x"
-#include "cm_inet.x"
-#include "cm_lib.x"
-#include "lkw.x"
-#include "lrg.x"
-
-#include "du_cfg.h"
-
 #define DU_PROC  0
+
 /* Memory related configs */
 #define DU_APP_MEM_REGION    0
 #define RLC_UL_MEM_REGION    1
@@ -79,10 +44,6 @@
 #define EVTSTARTPOLL  9
 #define EVENT_RIC_DATA  10
 
-/* Selector */
-#define DU_SELECTOR_LC   0
-#define DU_SELECTOR_TC   1
-#define DU_SELECTOR_LWLC 2
 
 /* SAP IDs */
 #define DU_MAC_SUID 0

diff --git a/src/du_app/du_mgr_ex_ms.c b/src/du_app/du_mgr_ex_ms.c
index 9bec28b..e1f82e7 100644 (file)
--- a/src/du_app/du_mgr_ex_ms.c
+++ b/src/du_app/du_mgr_ex_ms.c
@@ -17,7 +17,14 @@
 *******************************************************************************/
 
 /* This file contains message handling functionality for DU APP */
-
+#include "common_def.h"
+#include "lrg.h"
+#include "legtp.h"
+#include "lkw.h"
+#include "lrg.x"
+#include "lkw.x"
+#include "du_cfg.h"
+#include "E2AP-PDU.h"
 #include "du_sctp.h"
 #include "du_f1ap_msg_hdl.h"
 #include "du_e2ap_msg_hdl.h"

diff --git a/src/du_app/du_mgr_main.c b/src/du_app/du_mgr_main.c
index a9a55ab..1f0cdf0 100644 (file)
--- a/src/du_app/du_mgr_main.c
+++ b/src/du_app/du_mgr_main.c
@@ -17,7 +17,12 @@
 *******************************************************************************/
 
 /* This file is the entry point for DU APP */
-
+#include "common_def.h"
+#include "lrg.h"
+#include "legtp.h"
+#include "lrg.x"
+#include "lkw.x"
+#include "du_cfg.h"
 #include "du_mgr_main.h"
 #include "du_sctp.h"
 #include "du_egtp.h"

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index 45abfe4..199ba76 100644 (file)
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -17,7 +17,13 @@
 *******************************************************************************/
 
 /* This file contains message handling functionality for DU APP */
-
+#include "common_def.h"
+#include "lrg.h"
+#include "legtp.h"
+#include "lkw.h"
+#include "lrg.x"
+#include "lkw.x"
+#include "du_cfg.h"
 #include "du_mgr.h"
 #include "du_sctp.h"
 #include "du_f1ap_msg_hdl.h"
@@ -112,7 +118,7 @@ S16 duBuildRlcCfg(Inst inst)
    genCfg->lmPst.region    = (inst == RLC_UL_INST) ?
       RLC_UL_MEM_REGION:RLC_DL_MEM_REGION;
    genCfg->lmPst.pool      = RLC_POOL;
-   genCfg->lmPst.selector  = DU_SELECTOR_LC;
+   genCfg->lmPst.selector  = ODU_SELECTOR_LC;
 
     /* Fill Header */
    kwMngmt.hdr.msgType             = TCFG;
@@ -128,10 +134,10 @@ S16 duBuildRlcCfg(Inst inst)
    kwMngmt.hdr.response.mem.region = (inst == RLC_UL_INST) ?
       RLC_UL_MEM_REGION:RLC_DL_MEM_REGION;
    kwMngmt.hdr.response.mem.pool   = DU_POOL;
-   kwMngmt.hdr.response.selector   = DU_SELECTOR_LC;
+   kwMngmt.hdr.response.selector   = ODU_SELECTOR_LC;
 
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTKW;
    pst.dstInst   = inst;
@@ -181,7 +187,7 @@ S16 duBuildRlcLsapCfg(Ent ent, Inst inst, U8 lsapInst)
    kwMngmt.hdr.response.mem.pool   = RLC_POOL;
 
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTKW;
    pst.dstProcId = DU_PROC;
@@ -203,7 +209,7 @@ S16 duBuildRlcLsapCfg(Ent ent, Inst inst, U8 lsapInst)
       lSap->ent         = ENTRG;
       lSap->inst        = lsapInst;
       lSap->sapId       = lsapInst;      /* SapId will be stored as suId in MAC */
-      lSap->selector    = (inst == RLC_UL_INST) ? DU_SELECTOR_LWLC : DU_SELECTOR_TC;
+      lSap->selector    = (inst == RLC_UL_INST) ? ODU_SELECTOR_LWLC : ODU_SELECTOR_TC;
       kwMngmt.hdr.elmId.elmnt  = STRGUSAP;
       DU_LOG("\nDU_APP : RLC MAC Lower Sap Cfg Req sent for inst %d", inst);
 
@@ -215,7 +221,7 @@ S16 duBuildRlcLsapCfg(Ent ent, Inst inst, U8 lsapInst)
       lSap->inst      = (inst == RLC_UL_INST) ?
          RLC_DL_INST : RLC_UL_INST;
       lSap->sapId       = 0;
-      lSap->selector = DU_SELECTOR_LC;
+      lSap->selector = ODU_SELECTOR_LC;
       kwMngmt.hdr.elmId.elmnt  = STUDXSAP;
       DU_LOG("\nDU_APP : RLC DL/UL Lower Sap Cfg Req sent for inst %d", inst);
    }
@@ -250,7 +256,7 @@ S16 duBuildRlcUsapCfg(U8 elemId, Ent ent, Inst inst)
 
    uSap   = &(kwMngmt.t.cfg.s.sap);
 
-   uSap->selector   = DU_SELECTOR_LC;
+   uSap->selector   = ODU_SELECTOR_LC;
    uSap->mem.region = (inst == RLC_UL_INST) ?
       RLC_UL_MEM_REGION:RLC_DL_MEM_REGION;
    uSap->mem.pool = RLC_POOL;
@@ -276,7 +282,7 @@ S16 duBuildRlcUsapCfg(U8 elemId, Ent ent, Inst inst)
    kwMngmt.hdr.response.mem.pool   = RLC_POOL;
 
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTKW;
    pst.dstProcId = DU_PROC;
@@ -702,7 +708,7 @@ S16 duBuildMacGenCfg()
    genCfg->lmPst.route     = RTESPEC;
    genCfg->lmPst.region    = MAC_MEM_REGION;
    genCfg->lmPst.pool      = RG_POOL;
-   genCfg->lmPst.selector  = DU_SELECTOR_LC;
+   genCfg->lmPst.selector  = ODU_SELECTOR_LC;
 
     /* Fill Header */
    rgMngmt.hdr.msgType             = TCFG;
@@ -718,10 +724,10 @@ S16 duBuildMacGenCfg()
    rgMngmt.hdr.response.route      = RTESPEC;
    rgMngmt.hdr.response.mem.region = MAC_MEM_REGION;
    rgMngmt.hdr.response.mem.pool   = RG_POOL;
-   rgMngmt.hdr.response.selector   = DU_SELECTOR_LC;
+   rgMngmt.hdr.response.selector   = ODU_SELECTOR_LC;
 
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTRG;
    pst.dstInst   = macCfgInst;
@@ -772,7 +778,7 @@ S16 duBuildMacUsapCfg(SpId sapId)
    uSap->inst       = sapId;
    uSap->prior      = PRIOR0;
    uSap->route      = RTESPEC;
-   uSap->selector   = DU_SELECTOR_LC ;
+   uSap->selector   = ODU_SELECTOR_LC ;
 
    /* fill header */
    rgMngmt.hdr.msgType             = TCFG;
@@ -783,7 +789,7 @@ S16 duBuildMacUsapCfg(SpId sapId)
    rgMngmt.hdr.response.mem.pool   = RG_POOL;
    
    /* fill pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTRG;
    pst.dstInst   = macCfgInst;
@@ -907,7 +913,7 @@ S16 duBindUnbindRlcToMacSap(U8 inst, U8 action)
    kwMngmt.hdr.response.mem.pool   = RLC_POOL;
 
    /* Fill pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTKW;
    pst.dstProcId = DU_PROC;
@@ -988,7 +994,7 @@ S16 duFillEgtpPst(Pst *pst, Event event)
    pst->dstInst = (Inst)EGTP_INST;
    pst->dstProcId = pst->srcProcId;
    pst->event = event;
-   pst->selector = DU_SELECTOR_LC;
+   pst->selector = ODU_SELECTOR_LC;
    pst->pool= DU_POOL;
   
    RETVALUE(ROK);
@@ -1387,7 +1393,7 @@ S16 duSendSchCfg()
    cfg->genCfg.lmPst.route     = RTESPEC;
    cfg->genCfg.lmPst.region    = MAC_MEM_REGION;
    cfg->genCfg.lmPst.pool      = RG_POOL;
-   cfg->genCfg.lmPst.selector  = DU_SELECTOR_LC;
+   cfg->genCfg.lmPst.selector  = ODU_SELECTOR_LC;
 
    /* Fill Header */
    rgMngmt.hdr.msgType             = TCFG;
@@ -1398,7 +1404,7 @@ S16 duSendSchCfg()
    rgMngmt.hdr.response.mem.pool   = RG_POOL;
 
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTRG;
    pst.dstProcId = DU_PROC;
@@ -1558,7 +1564,7 @@ S16 duBuildAndSendMacCellCfg()
    duMacCellCfg->transId = getTransId(); /* transaction ID */
    
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LWLC;
+   pst.selector  = ODU_SELECTOR_LWLC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTRG;
    pst.dstInst   = 0;
@@ -1668,7 +1674,7 @@ uint16_t duHandleSlotInd(Pst *pst, SlotInfo *slotInfo)
    duSendEgtpSlotInd();    
 #endif
 
-   if((pst->selector == DU_SELECTOR_LWLC) || (pst->selector == DU_SELECTOR_TC)) 
+   if((pst->selector == ODU_SELECTOR_LWLC) || (pst->selector == ODU_SELECTOR_TC)) 
       DU_FREE_SHRABL_BUF(MAC_MEM_REGION, pst->pool, slotInfo, sizeof(SlotInfo));
 
    return ROK;
@@ -1713,7 +1719,7 @@ uint16_t duBuildAndSendMacCellStartReq()
          cellStartInfo->cellId = duCb.actvCellLst[id]->cellInfo.nrEcgi.cellId;
  
          /* Fill Pst */
-         pst.selector  = DU_MAC_LWLC;
+         pst.selector  = ODU_SELECTOR_LWLC;
          pst.srcEnt    = ENTDUAPP;
          pst.dstEnt    = ENTRG;
          pst.dstInst   = 0;
@@ -1763,7 +1769,7 @@ uint16_t duBuildAndSendMacCellStopReq()
    cellStopInfo->cellId = duCb.actvCellLst[0]->cellId;
  
    /* Fill Pst */
-   pst.selector  = DU_MAC_LWLC;
+   pst.selector  = ODU_SELECTOR_LWLC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTRG;
    pst.dstInst   = 0;
@@ -1812,7 +1818,7 @@ uint16_t duHandleStopInd(Pst *pst, MacCellStopInfo *cellStopId)
          }
       }
        }
-   if((pst->selector == DU_SELECTOR_LWLC) || (pst->selector == DU_SELECTOR_TC))
+   if((pst->selector == ODU_SELECTOR_LWLC) || (pst->selector == ODU_SELECTOR_TC))
       DU_FREE_SHRABL_BUF(MAC_MEM_REGION, pst->pool, cellStopId, sizeof(MacCellStopInfo));
 
    return ROK;

diff --git a/src/du_app/du_sctp.c b/src/du_app/du_sctp.c
index 25bccb3..f448a57 100644 (file)
--- a/src/du_app/du_sctp.c
+++ b/src/du_app/du_sctp.c
@@ -17,8 +17,12 @@
 *******************************************************************************/
 
 /* This file contains all SCTP related functionality */
-
-#include <stdio.h> 
+#include "common_def.h"
+#include "lrg.h"
+#include "legtp.h"
+#include "lrg.x"
+#include "lkw.x"
+#include "du_cfg.h"
 #include "du_sctp.h"
 #include "lsctp.h"
 
@@ -401,7 +405,7 @@ S16 duFillSctpPst(Pst *pst, Event event)
    pst->dstInst = (Inst)SCTP_INST;
    pst->dstProcId = pst->srcProcId;
    pst->event = event;
-   pst->selector = DU_SELECTOR_LC;
+   pst->selector = ODU_SELECTOR_LC;
    pst->pool= DU_POOL;
    SPstTsk(pst, mBuf); 
 
@@ -479,7 +483,7 @@ void sendToDuApp(Buffer *mBuf, Event event)
    pst.dstInst = (Inst)DU_INST;
    pst.dstProcId = pst.srcProcId;
    pst.event = event;
-   pst.selector = DU_SELECTOR_LC;
+   pst.selector = ODU_SELECTOR_LC;
    pst.pool= DU_POOL;
    pst.region = DFLT_REGION;
 
@@ -577,7 +581,7 @@ S16 sctpNtfyHdlr(CmInetSctpNotification *ntfy, U8 *itfState)
    pst.dstInst = (Inst)DU_INST;
    pst.dstProcId = pst.srcProcId;
    pst.event = EVENT_SCTP_NTFY;
-   pst.selector = DU_SELECTOR_LC;
+   pst.selector = ODU_SELECTOR_LC;
    pst.pool= DU_POOL;
    pst.region = DFLT_REGION;
    

diff --git a/src/du_app/du_sys_info_hdl.c b/src/du_app/du_sys_info_hdl.c
index f1c01ef..17a12c1 100644 (file)
--- a/src/du_app/du_sys_info_hdl.c
+++ b/src/du_app/du_sys_info_hdl.c
@@ -17,7 +17,12 @@
 *******************************************************************************/
 
 /* This file contains ASN codec for MIB and SIB1 msgs */
-
+#include "common_def.h"
+#include "lrg.h"
+#include "lkw.x"
+#include "lrg.x"
+#include "legtp.h"
+#include "du_cfg.h"
 #include "du_mgr.h"
 #include "du_log.h"
 #include "BCCH-BCH-Message.h"
@@ -49,6 +54,7 @@
 #include "MCC.h"
 #include "SIB1.h"
 #include "du_sys_info_hdl.h"
+
 void FreeSib1Msg(SIB1_t *sib1Msg);
 uint8_t FreqInfoUlret = RFAILED;
 uint8_t RachCfgCommonret = RFAILED;
@@ -57,6 +63,7 @@ uint8_t UlCfgCommSibret = RFAILED;
 uint8_t FreqInfoDlret = RFAILED;
 uint8_t DlCfgCommSibret = RFAILED;
 uint8_t CommonSerachSpaceListret = RFAILED;
+
 /*******************************************************************
  *
  * @brief Builds MIB

diff --git a/src/du_app/du_ue_mgr.c b/src/du_app/du_ue_mgr.c
index 6077666..1a2941b 100644 (file)
--- a/src/du_app/du_ue_mgr.c
+++ b/src/du_app/du_ue_mgr.c
@@ -16,7 +16,15 @@
 ################################################################################
 *******************************************************************************/
  /* This file contains UE management handling functionality for DU APP */
+#include "common_def.h"
+#include "lrg.h"
+#include "lrg.x"
+#include "lkw.x"
+#include "legtp.h"
+#include "du_cfg.h"
 #include "du_ue_mgr.h"
+#include<ProtocolIE-Field.h>
+#include "F1AP-PDU.h"
 
 #ifdef EGTP_TEST
 U32 sduId = 0;
@@ -103,7 +111,7 @@ S16 duSendUeCreateReqToRlc()
    } /* End of entity configuration for loop */
 
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LWLC;
+   pst.selector  = ODU_SELECTOR_LWLC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTKW;
    pst.dstInst   = RLC_UL_INST;
@@ -153,7 +161,7 @@ S16 duHdlEgtpDlData(EgtpMsg  *egtpMsg)
    datReqInfo.lcType = CM_LTE_LCH_DTCH;
 #endif
    /* Filling pst and Sending to RLC DL */
-   pst.selector  = DU_SELECTOR_LWLC;
+   pst.selector  = ODU_SELECTOR_LWLC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTKW;
    pst.dstInst   = RLC_DL_INST;
@@ -246,7 +254,7 @@ uint8_t duBuildAndSendDlCcchInd(uint16_t cellId, uint16_t crnti, \
        DU_FREE(dlCcchMsg, dlCcchMsgSize);
 
        /* Fill Pst */
-       pst.selector  = DU_MAC_LWLC;
+       pst.selector  = ODU_SELECTOR_LWLC;
        pst.srcEnt    = ENTDUAPP;
        pst.dstEnt    = ENTRG;
        pst.dstInst   = 0;
@@ -894,7 +902,7 @@ uint8_t duBuildAndSendUeCreateReqToMac(uint16_t cellId, uint8_t ueIdx)
    memset(&pst, 0, sizeof(Pst));
 
    /* Fill Pst */
-   pst.selector  = DU_MAC_LWLC;
+   pst.selector  = ODU_SELECTOR_LWLC;
    pst.srcEnt    = ENTDUAPP;
    pst.srcInst   = DU_INST;
    pst.dstEnt    = ENTRG;

diff --git a/src/phy_stub/l1_bdy1.c b/src/phy_stub/l1_bdy1.c
index cedcc3c..f357ddd 100644 (file)
--- a/src/phy_stub/l1_bdy1.c
+++ b/src/phy_stub/l1_bdy1.c
@@ -18,18 +18,10 @@
 
 /*This file contains stub for PHY to handle messages to/from MAC CL */
 
-#include <stdint.h>
-
-#include "envdep.h"
-#include "gen.h"
-#include "ssi.h"
-
-#include "gen.x"
-#include "ssi.x"
-
+#include "common_def.h"
 #include "lwr_mac.h"
 #include "lwr_mac_phy.h"
-#ifdef FAPI
+#ifdef INTEL_FAPI
 #include "fapi.h"
 #endif
 #include "lphy_stub.h"
@@ -46,7 +38,7 @@ uint16_t slotValue = 0;
 bool     rachIndSent = false;
 
 EXTERN void phyToMac ARGS((uint16_t msgType, uint32_t msgLen,void *msg));
-#ifdef FAPI
+#ifdef INTEL_FAPI
 EXTERN void fillTlvs ARGS((fapi_uint16_tlv_t *tlv, uint16_t tag, uint16_t
 length, uint16_t value, uint32_t *msgLen));
 EXTERN void fillMsgHeader ARGS((fapi_msg_t *hdr, uint16_t msgType, uint16_t msgLen));
@@ -71,7 +63,7 @@ EXTERN void handlePhyMessages(uint16_t msgType, uint32_t msgSize, void *msg);
  * ****************************************************************/
 S16 l1BldAndSndParamRsp(void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    uint8_t index = 0;
    uint32_t msgLen = 0;
        fapi_param_resp_t *fapiParamRsp;
@@ -184,7 +176,7 @@ S16 l1BldAndSndParamRsp(void *msg)
 
 S16 l1BldAndSndConfigRsp(void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    uint32_t msgLen = 0;
    fapi_config_resp_t *fapiConfigRsp;
 
@@ -229,7 +221,7 @@ S16 l1BldAndSndConfigRsp(void *msg)
 
 PUBLIC void l1HdlParamReq(uint32_t msgLen, void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    DU_LOG("\nPHY_STUB: Received Param Request in PHY");
  
    /* Build and send PARAM RESPONSE */
@@ -261,7 +253,7 @@ PUBLIC void l1HdlParamReq(uint32_t msgLen, void *msg)
 
 PUBLIC void l1HdlConfigReq(uint32_t msgLen, void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
        fapi_config_req_t *configReq = (fapi_config_req_t *)msg;
 
    DU_LOG("\nPHY_STUB: Received Config Request in PHY");
@@ -296,7 +288,7 @@ PUBLIC void l1HdlConfigReq(uint32_t msgLen, void *msg)
  * ****************************************************************/
 uint16_t l1BuildAndSendCrcInd(uint16_t slot, uint16_t sfn)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    uint8_t idx = 0;
    fapi_crc_ind_t  *crcInd;
    
@@ -333,7 +325,7 @@ uint16_t l1BuildAndSendCrcInd(uint16_t slot, uint16_t sfn)
    return ROK;
 } /* l1BuildAndSendCrcInd */
 
-#ifdef FAPI
+#ifdef INTEL_FAPI
 /*******************************************************************
  *
  * @brief Build and send Rx data indication
@@ -438,7 +430,7 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_
  * ****************************************************************/
 uint16_t l1BuildAndSendRachInd(uint16_t slot, uint16_t sfn)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    uint8_t   rachPduIdx = 0; 
    uint8_t   preamIdx = 0;
    fapi_rach_pdu_t  *rachPdu;
@@ -499,7 +491,7 @@ uint16_t l1BuildAndSendRachInd(uint16_t slot, uint16_t sfn)
  * ****************************************************************/
 PUBLIC uint16_t l1BuildAndSendSlotIndication()
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    fapi_slot_ind_t *slotIndMsg;
 
    MAC_ALLOC(slotIndMsg, sizeof(fapi_slot_ind_t));
@@ -554,7 +546,7 @@ PUBLIC uint16_t l1BuildAndSendSlotIndication()
 
 PUBLIC S16 l1HdlStartReq(uint32_t msgLen, void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    fapi_start_req_t *startReq = (fapi_start_req_t *)msg;
 
    if(clGlobalCp.phyState == PHY_STATE_CONFIGURED)
@@ -591,7 +583,7 @@ PUBLIC S16 l1HdlStartReq(uint32_t msgLen, void *msg)
 
 PUBLIC S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    fapi_dl_tti_req_t *dlTtiReq;
    dlTtiReq = (fapi_dl_tti_req_t *)msg;
 
@@ -652,7 +644,7 @@ PUBLIC S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg)
 
 PUBLIC S16 l1HdlTxDataReq(uint16_t msgLen, void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    fapi_tx_data_req_t *txDataReq;
    txDataReq = (fapi_tx_data_req_t *)msg;
 
@@ -682,7 +674,7 @@ PUBLIC S16 l1HdlTxDataReq(uint16_t msgLen, void *msg)
 
 PUBLIC S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    fapi_ul_tti_req_t *ulTtiReq;
 
    DU_LOG("\nPHY STUB: Received UL TTI Request");
@@ -741,7 +733,7 @@ PUBLIC S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg)
  * ****************************************************************/
 PUBLIC uint16_t l1BuildAndSendStopInd()
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    fapi_stop_ind_t *stopIndMsg = NULLP;
    uint32_t msgLen = 0;
 
@@ -783,7 +775,7 @@ PUBLIC uint16_t l1BuildAndSendStopInd()
 
 PUBLIC S16 l1HdlStopReq(uint32_t msgLen, void *msg)
 {
-#ifdef FAPI
+#ifdef INTEL_FAPI
    fapi_stop_req_t *stopReq = (fapi_stop_req_t *)msg;
 
    if(clGlobalCp.phyState == PHY_STATE_RUNNING)
@@ -825,7 +817,7 @@ void l1ProcessFapiRequest(uint8_t msgType, uint32_t msgLen, void *msg)
 {
    switch(msgType)
    {
-#ifdef FAPI
+#ifdef INTEL_FAPI
       case FAPI_PARAM_REQUEST:
          l1HdlParamReq(msgLen, msg);
          break;

diff --git a/src/phy_stub/l1_bdy2.c b/src/phy_stub/l1_bdy2.c
index ebca842..2edaa5b 100644 (file)
--- a/src/phy_stub/l1_bdy2.c
+++ b/src/phy_stub/l1_bdy2.c
@@ -18,11 +18,7 @@
 
 /* This file handles slot indication */
 
-#include <stdio.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <time.h>
+#include "common_def.h"
 #include "lphy_stub.h"
 #include "du_log.h"
 

diff --git a/src/ric_stub/ric_e2ap_msg_hdl.c b/src/ric_stub/ric_e2ap_msg_hdl.c
index b8ddf2b..a568eb4 100644 (file)
--- a/src/ric_stub/ric_e2ap_msg_hdl.c
+++ b/src/ric_stub/ric_e2ap_msg_hdl.c
@@ -17,11 +17,15 @@
 *******************************************************************************/
 
 /* This file contains E2AP message handler functions */
-
+#include "common_def.h"
+#include "odu_common_codec.h"
+#include "ric_stub.h"
 #include "ric_stub_sctp.h"
 #include "ric_e2ap_msg_hdl.h"
 #include "GlobalE2node-gNB-ID.h"
-#include "odu_common_codec.h"
+#include "ProtocolIE-FieldE2.h"
+#include "E2AP-PDU.h"
+#include "du_log.h"
 
 Bool ricSubsStatus;
 

diff --git a/src/ric_stub/ric_e2ap_msg_hdl.h b/src/ric_stub/ric_e2ap_msg_hdl.h
index d1ed8a5..f172ac8 100644 (file)
--- a/src/ric_stub/ric_e2ap_msg_hdl.h
+++ b/src/ric_stub/ric_e2ap_msg_hdl.h
@@ -17,28 +17,6 @@
 *******************************************************************************/
 
 /* This file contains all E2AP message handler related functionality */
-#include<stdio.h>
-#include<sys/types.h>
-#include<string.h>
-#include "ProtocolIE-FieldE2.h"
-#include "E2AP-PDU.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 "ss_queue.h"
-#include "ss_task.h"
-#include "ss_msg.h"
-
-#include "gen.x"           /* General */
-#include "ssi.x"   /* System services */
-#include "ss_queue.x"
-#include "ss_task.x"
-#include "ss_msg.x"
-
-#include "du_log.h"
 
 #define ENCODE_FAIL -1
 #define TRANS_ID 1

diff --git a/src/ric_stub/ric_stub.c b/src/ric_stub/ric_stub.c
index e314439..60e5c01 100644 (file)
--- a/src/ric_stub/ric_stub.c
+++ b/src/ric_stub/ric_stub.c
@@ -17,9 +17,11 @@
 *******************************************************************************/
 
 /* This functions contains main() for ric_app */
-
+#include "common_def.h"
+#include "odu_common_codec.h"
 #include "ric_stub.h"
 #include "ric_stub_sctp.h"
+#include "du_log.h"
 
 #define RIC_ID 1
 #define RIC_NAME "ORAN_OAM_RIC"

diff --git a/src/ric_stub/ric_stub.h b/src/ric_stub/ric_stub.h
index 2b8fc45..07378c4 100644 (file)
--- a/src/ric_stub/ric_stub.h
+++ b/src/ric_stub/ric_stub.h
@@ -19,37 +19,6 @@
 #ifndef __RIC_MGR_MAIN_H__
 #define __RIC_MGR_MAIN_H__
 
-
-#include "stdio.h"
-#include "stdlib.h"
-#include "string.h"
-#include "stdbool.h"
-#include "ctype.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 "ss_queue.h"
-#include "ss_task.h"
-#include "ss_msg.h"
-#include "cm_inet.h"
-#include "cm_llist.h"      /* Common link list  defines  */
-#include "cm_hash.h"       /* Common hashlist  defines */
-
-#include "gen.x"           /* General */
-#include "ssi.x"   /* System services */
-#include "ss_queue.x"
-#include "ss_task.x"
-#include "ss_msg.x"
-#include "cm_lib.x"
-#include "cm_inet.x"
-#include "cm_llist.x"      /* Common link list  defines  */
-#include "cm_hash.x"       /* Common hashlist  defines */
-#include "odu_common_codec.h"
-
-#include "du_log.h"
 #define MAX_IPV6_LEN 16
 #define RIC_DU_NAME_LEN_MAX 30      /* Max length of RIC/DU name string */
 

diff --git a/src/ric_stub/ric_stub_sctp.c b/src/ric_stub/ric_stub_sctp.c
index a32a9b3..f040b95 100644 (file)
--- a/src/ric_stub/ric_stub_sctp.c
+++ b/src/ric_stub/ric_stub_sctp.c
@@ -18,13 +18,18 @@
 
 /* This file contains all SCTP related functionality */
 
-#include <stdio.h> 
+#include "common_def.h"
+#include "odu_common_codec.h"
 #include "ric_e2ap_msg_hdl.h"
 #include "ric_stub_sctp.h"
+#include "ric_stub.h"
+#include "E2AP-PDU.h"
+#include "du_log.h"
 
 CuSctpDestCb ricParams;
-
-
+RicSctpParams sctpCfg;
+S16 fillAddrLst(CmInetNetAddrLst *addrLstPtr, SctpIpAddr *ipAddr);
+S16 fillDestNetAddr(CmInetNetAddr *destAddrPtr, SctpIpAddr *dstIpPtr);
 /**************************************************************************
  * @brief Function to configure the Sctp Params during config Request
  *

diff --git a/src/ric_stub/ric_stub_sctp.h b/src/ric_stub/ric_stub_sctp.h
index 33355d8..fbcefe1 100644 (file)
--- a/src/ric_stub/ric_stub_sctp.h
+++ b/src/ric_stub/ric_stub_sctp.h
@@ -20,15 +20,6 @@
 
 #ifndef __RIC_SCTP_H__
 #define __RIC_SCTP_H__
-
-#include "stdbool.h"
-#include "ric_stub.h"
-#include "cm_inet.h"
-#include "cm_tpt.h"
-
-#include "cm_inet.x"
-#include "cm_tpt.x"
-
 #define MAX_RETRY 5
 
 /* Global variable declaration */
@@ -37,7 +28,6 @@ bool nonblocking;      /* Blocking/Non-blocking socket */
 bool connUp;           /* Is connection up */
 int  assocId;          /* Assoc Id of connected assoc */
   
-RicSctpParams sctpCfg;            /* SCTP configurations at DU */
 typedef struct
 {
    uint16_t           numFd;
@@ -68,8 +58,6 @@ EXTERN S16 sctpActvInit();
 EXTERN S16 sctpSend(Buffer *mBuf);
 S16 sctpCfgReq();
 S16 sctpStartReq();
-S16 fillAddrLst(CmInetNetAddrLst *addrLstPtr, SctpIpAddr *ipAddr);
-S16 fillDestNetAddr(CmInetNetAddr *destAddrPtr, SctpIpAddr *dstIpPtr);
 S16 sctpSetSockOpts(CmInetFd *sock_Fd);
 S16 sctpAccept(CmInetFd *lstnSock_Fd, CmInetAddr *peerAddr, CmInetFd *sock_Fd);
 S16 sctpSockPoll();