Moving all common header file into common_def.h file

[o-du/l2.git] / src / 5gnrmac / lwr_mac_handle_phy.c

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;