Merge remote-tracking branch 'origin/remove_targets_arch' into integration_2022_wk39

openair2/ENB_APP/NB_IoT_config.c

@@ -39,7 +39,7 @@
 #include "SystemInformationBlockType2.h"
 
 #include "PHY/phy_extern.h"
-#include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
+#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
 #include "common/config/config_userapi.h"
 #include "RRC_config_tools.h"
 #include "RRC_paramsvalues.h"

openair2/ENB_APP/enb_config.c

@@ -46,7 +46,7 @@
 #include "LAYER2/MAC/mac_proto.h"
 #include "PHY/phy_extern.h"
 #include "PHY/INIT/phy_init.h"
-#include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
+#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
 #include "nfapi_vnf.h"
 #include "nfapi_pnf.h"
 #include "targets/RT/USER/lte-softmodem.h"

openair2/GNB_APP/gnb_config.c

@@ -50,7 +50,7 @@
 // #include "LAYER2/MAC/extern.h"
 // #include "LAYER2/MAC/proto.h"
 #include "PHY/INIT/phy_init.h"
-#include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
+#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
 #include "nfapi_vnf.h"
 #include "nfapi_pnf.h"
 

openair2/LAYER2/MAC/mac.h

@@ -74,7 +74,7 @@
 #include "PHY/defs_common.h" // for PRACH_RESOURCES_t
 #include "PHY/LTE_TRANSPORT/transport_common.h"
 
-#include "targets/ARCH/COMMON/common_lib.h"
+#include "sdr/COMMON/common_lib.h"
 
 /** @defgroup _mac  MAC
  * @ingroup _oai2

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -32,7 +32,7 @@
 
 //#include "defs.h"
 #include "mac_proto.h"
-#include "../../ARCH/COMMON/common_lib.h"
+#include "sdr/COMMON/common_lib.h"
 //#undef MALLOC
 #include "assertions.h"
 #include "PHY/types.h"

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -43,7 +43,7 @@
 #include <string.h>
 
 /* Commmon */
-#include "targets/ARCH/COMMON/common_lib.h"
+#include "sdr/COMMON/common_lib.h"
 #include "COMMON/platform_constants.h"
 #include "common/ran_context.h"
 #include "collection/linear_alloc.h"

openair2/MCE_APP/mce_config.c

@@ -45,7 +45,7 @@
 #include "LAYER2/MAC/mac_proto.h"
 #include "PHY/phy_extern.h"
 #include "PHY/INIT/phy_init.h"
-#include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
+#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
 #include "nfapi_vnf.h"
 #include "nfapi_pnf.h"
 

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -45,7 +45,7 @@
 #include "openair2/RRC/NR_UE/rrc_vars.h"
 #include "openair2/GNB_APP/L1_nr_paramdef.h"
 #include "openair2/GNB_APP/gnb_paramdef.h"
-#include "targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
+#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
 #include <stdio.h>
 
 #define MAX_IF_MODULES 100

openair2/PHY_INTERFACE/IF_Module.h

@@ -1,5 +1,4 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ /* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The OpenAirInterface Software Alliance licenses this file to You under
@@ -39,6 +38,8 @@
 #include "nfapi_interface.h"
 #include "platform_types.h"
 #include <common/utils/threadPool/thread-pool.h>
+#include <sdr/COMMON/common_lib.h>
+
 
 #define MAX_NUM_DL_PDU 100
 #define MAX_NUM_UL_PDU 100
@@ -135,7 +136,6 @@ typedef struct {
     int CC_id;
     nfapi_config_request_t *cfg;
 } PHY_Config_t;
-#include <targets/ARCH/COMMON/common_lib.h>
 
 typedef struct IF_Module_s{
 //define the function pointer

openair2/PHY_INTERFACE/phy_stub_UE.c

@@ -27,7 +27,7 @@
 #include "openair2/PHY_INTERFACE/phy_stub_UE.h"
 #include "openair2/ENB_APP/L1_paramdef.h"
 #include "openair2/ENB_APP/enb_paramdef.h"
-#include "targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
+#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
 #include "common/config/config_load_configmodule.h"
 #include "common/config/config_userapi.h"
 #include <arpa/inet.h>