code cleanup, no feature

cmake_targets/CMakeLists.txt

@@ -985,8 +985,6 @@ Message("CPU_Affinity flag is ${CPU_AFFINITY}")
 #    ???!!! TO BE DOCUMENTED OPTIONS !!!???
 ##############################################################
 
-add_boolean_option(NO_RRM                  True  "DO WE HAVE A RADIO RESSOURCE MANAGER: NO")
-
 add_boolean_option(OAI_NW_DRIVER_TYPE_ETHERNET False "????")
 add_boolean_option(DEADLINE_SCHEDULER False "Use the Linux scheduler SCHED_DEADLINE: kernel >= 3.14")
 add_boolean_option(CPU_AFFINITY False "Enable CPU Affinity of threads (only valid without deadline scheduler). It is enabled only with >2 CPUs")
@@ -1047,7 +1045,6 @@ add_boolean_option(JUMBO_FRAME             True  "ENABLE LARGE SDU in ACCESS STR
 ##########################
 # RLC LAYER OPTIONS
 ##########################
-add_boolean_option(OPENAIR2                True  "Access Stratum layer 2 built in executable")
 add_boolean_option(TRACE_RLC_PAYLOAD       False "Fatal assert in this case")
 add_boolean_option(RLC_STOP_ON_LOST_PDU    False "Fatal assert in this case")
 
@@ -1075,8 +1072,6 @@ add_boolean_option(TRACE_RLC_UM_TX_STATUS  False "TRACE for RLC UM, TO BE CHANGE
 ##########################
 # PDCP LAYER OPTIONS
 ##########################
-#add_boolean_option(PDCP_USE_NETLINK            False "For eNB, PDCP communicate with a NETLINK socket if connected to network driver, else could use a RT-FIFO")
-#add_boolean_option(PDCP_USE_NETLINK_QUEUES     False "When PDCP_USE_NETLINK is true, incoming IP packets are stored in queues")
 #add_boolean_option(LINK_ENB_PDCP_TO_IP_DRIVER  False "For eNB, PDCP communicate with a IP driver")
 #add_boolean_option(LINK_ENB_PDCP_TO_GTPV1U     True  "For eNB, PDCP communicate with GTP-U protocol (eNB<->S-GW)")
 

common/utils/LOG/log_extern.h

@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-#include"log.h"
+#include "log.h"
 
 extern log_t *g_log;
 

executables/nr-gnb.c

@@ -76,10 +76,6 @@
 #include "gnb_paramdef.h"
 
 
-#ifndef OPENAIR2
-  #include "UTIL/OTG/otg_extern.h"
-#endif
-
 #include "s1ap_eNB.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
 #include <executables/softmodem-common.h>

executables/nr-ru.c

@@ -71,10 +71,6 @@ static int DEFBFW[] = {0x00007fff};
 #include "GNB_APP/gnb_paramdef.h"
 #include "common/config/config_userapi.h"
 
-#ifndef OPENAIR2
-  #include "UTIL/OTG/otg_extern.h"
-#endif
-
 #include "s1ap_eNB.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
 #include <openair1/PHY/TOOLS/phy_scope_interface.h>

executables/nr-softmodem-common.h

@@ -30,12 +30,8 @@
 #include "PHY/types.h"
 #include <threadPool/thread-pool.h>
 
-#if defined(ENABLE_USE_MME)
 #include "s1ap_eNB.h"
-#ifdef PDCP_USE_NETLINK
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
-#endif
-#endif
 
 /* help strings definition for command line options, used in CMDLINE_XXX_DESC macros and printed when -h option is used */
 #define CONFIG_HLP_RFCFGF        "Configuration file for front-end (e.g. LMS7002M)\n"

executables/nr-softmodem.c

@@ -66,10 +66,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 
 //#include "PHY/TOOLS/time_meas.h"
 
-#ifndef OPENAIR2
-  #include "UTIL/OTG/otg_vars.h"
-#endif
-
 #include "intertask_interface.h"
 
 #include "PHY/INIT/phy_init.h"
@@ -692,15 +688,10 @@ int main( int argc, char **argv ) {
   // initialize mscgen log after ITTI
   MSC_INIT(MSC_E_UTRAN, ADDED_QUEUES_MAX+TASK_MAX);
   init_opt();
-#ifdef PDCP_USE_NETLINK
-
-  if(!IS_SOFTMODEM_NOS1)
-    netlink_init();
-
-#if defined(PDCP_USE_NETLINK_QUEUES)
-  pdcp_netlink_init();
-#endif
-#endif
+  if(PDCP_USE_NETLINK)
+    if(!IS_SOFTMODEM_NOS1)
+      netlink_init();
+  
 #ifndef PACKAGE_VERSION
 #  define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
 #endif

executables/nr-ue.c

@@ -19,6 +19,7 @@
  *      contact@openairinterface.org
  */
 
+#include <openair1/PHY/impl_defs_top.h>
 #include "executables/nr-uesoftmodem.h"
 #include "PHY/phy_extern_nr_ue.h"
 #include "PHY/INIT/phy_init.h"
@@ -87,11 +88,7 @@
  *
  */
 
-#ifndef NO_RAT_NR
-  #define DURATION_RX_TO_TX           (NR_UE_CAPABILITY_SLOT_RX_TO_TX)  /* for NR this will certainly depends to such UE capability which is not yet defined */
-#else
-  #define DURATION_RX_TO_TX           (6)   /* For LTE, this duration is fixed to 4 and it is linked to LTE standard for both modes FDD/TDD */
-#endif
+
 #define RX_JOB_ID 0x1010
 #define TX_JOB_ID 100
 

executables/nr-uesoftmodem.c

@@ -63,10 +63,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "enb_config.h"
 //#include "PHY/TOOLS/time_meas.h"
 
-#ifndef OPENAIR2
-  #include "UTIL/OTG/otg_vars.h"
-#endif
-
 #include "intertask_interface.h"
 
 #include "PHY/INIT/phy_init.h"

openair1/PHY/CODING/defs_NB_IoT.h

@@ -30,14 +30,6 @@
 
 #include <stdint.h>  // for uint8/16/32_t
 
-/* check if this ifndef is required for NB-IoT ?!
-//#ifndef NO_OPENAIR1
-//#include "PHY/defs_NB_IoT.h"
-//#else
-//#include "PHY/TOOLS/time_meas.h"
-//#endif
-*/
-
 #define CRC24_A_NB_IoT 0
 #define CRC24_B_NB_IoT 1
 #define CRC16_NB_IoT 2

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_init_mem.h

@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include "nrLDPC_types.h"
 
-#ifndef malloc32_clear
 /**
    \brief Allocates 32 byte aligned memory and initializes to zero
    \param size Input size in bytes
@@ -46,7 +45,6 @@ static inline void* malloc32_clear(size_t size)
     memset(ptr, 0, size);
     return ptr;
 }
-#endif
 
 /**
    \brief Allocates and initializes the internal decoder processing buffers

openair1/PHY/CODING/nrLDPC_defs.h

@@ -56,4 +56,4 @@ typedef int(*nrLDPC_encoderfunc_t)(unsigned char **,unsigned char **,int,int,sho
    \param p_profiler LDPC profiler statistics
 */
 typedef int32_t(*nrLDPC_decoderfunc_t)(t_nrLDPC_dec_params* , int8_t*, int8_t* , t_nrLDPC_procBuf* , t_nrLDPC_time_stats* );
-#endif
\ No newline at end of file
+#endif

openair1/PHY/CODING/nrLDPC_extern.h

@@ -32,4 +32,4 @@ extern nrLDPC_decoderfunc_t nrLDPC_decoder;
 extern nrLDPC_encoderfunc_t nrLDPC_encoder;
 // inline functions:
 #include "openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_init_mem.h"
-#endif
\ No newline at end of file
+#endif

openair1/PHY/LTE_TRANSPORT/dci.c

@@ -50,8 +50,6 @@
 //#define DEBUG_DCI_DECODING 1
 //#define DEBUG_PHY
 
-//#undef ALL_AGGREGATION
-
 //extern uint16_t phich_reg[MAX_NUM_PHICH_GROUPS][3];
 //extern uint16_t pcfich_reg[4];
 

openair1/PHY/LTE_TRANSPORT/dci_NB_IoT.h

@@ -32,11 +32,8 @@
 #ifndef __DCI_NB_IOT_H__
 #define __DCI_NB_IOT_H__
 
-//#ifndef USER_MODE
-//#include "PHY/types.h"
-//#else
 #include <stdint.h>
-//#endif
+
 
 typedef enum 
 {

openair1/PHY/LTE_TRANSPORT/print_stats.c

@@ -36,10 +36,8 @@
 #include "PHY/extern.h"
 #include "SCHED/extern.h"
 
-#ifdef OPENAIR2
   #include "openair2/LAYER2/MAC/proto.h"
   #include "openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
-#endif
 
 extern int mac_get_rrc_status(uint8_t Mod_id,uint8_t eNB_flag,uint8_t index);
 
@@ -434,10 +432,8 @@ int dump_ue_stats(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc,char *buffer, int length
           break;
       }
 
-#ifdef OPENAIR2
       RRC_status = mac_UE_get_rrc_status(ue->Mod_id, 0);
       len += sprintf(&buffer[len],"[UE PROC] RRC status = %d\n",RRC_status);
-#endif
       len += sprintf(&buffer[len], "[UE PROC] Transmission Mode %d \n",ue->transmission_mode[eNB]);
       len += sprintf(&buffer[len], "[UE PROC] PBCH err conseq %d, PBCH error total %d, PBCH FER %d\n",
                      ue->pbch_vars[eNB]->pdu_errors_conseq,

openair1/PHY/LTE_TRANSPORT/uci_NB_IoT.h

@@ -321,4 +321,4 @@ HLC_subband_cqi_mcs_CBA_20MHz_NB_IoT;
 #define MAX_ACK_PAYLOAD_NB_IoT 18
 #define MAX_RI_PAYLOAD_NB_IoT 6
 
-#endif
\ No newline at end of file
+#endif

openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c

@@ -50,9 +50,6 @@
 //#define DEBUG_DCI_DECODING 1
 //#define DEBUG_PHY
 
-//#undef ALL_AGGREGATION
-
-
 uint16_t extract_crc(uint8_t *dci,uint8_t dci_len)
 {
 
@@ -2802,7 +2799,6 @@ uint16_t dci_decoding_procedure(PHY_VARS_UE *ue,
     if (dci_cnt>old_dci_cnt)
       return(dci_cnt);
 
-    //#ifdef ALL_AGGREGATION
     // Now check UE_SPEC format 1 search spaces at aggregation 8
     old_dci_cnt=dci_cnt;
     dci_decoding_procedure0(pdcch_vars,0,mode,subframe,
@@ -2836,7 +2832,6 @@ uint16_t dci_decoding_procedure(PHY_VARS_UE *ue,
     if (dci_cnt>old_dci_cnt)
       return(dci_cnt);
 
-    //#endif //ALL_AGGREGATION
   } else if (tmode == 3) {
 
 
@@ -2946,7 +2941,6 @@ uint16_t dci_decoding_procedure(PHY_VARS_UE *ue,
     if (dci_cnt>old_dci_cnt)
       return(dci_cnt);
 
-    //#ifdef ALL_AGGREGATION
     // Now check UE_SPEC format 2_2A search spaces at aggregation 8
     LOG_D(PHY," Now check UE_SPEC format 2_2A search spaces at aggregation 8 dci length: %d[bits] %d[bytes]\n",format2A_size_bits,format2A_size_bytes);
     old_dci_cnt=dci_cnt;
@@ -3082,7 +3076,6 @@ uint16_t dci_decoding_procedure(PHY_VARS_UE *ue,
     if (dci_cnt>old_dci_cnt)
       return(dci_cnt);
 
-    //#ifdef ALL_AGGREGATION
     // Now check UE_SPEC format 2_2A search spaces at aggregation 8
     old_dci_cnt=dci_cnt;
     dci_decoding_procedure0(pdcch_vars,0,mode,
@@ -3214,7 +3207,6 @@ uint16_t dci_decoding_procedure(PHY_VARS_UE *ue,
     if (dci_cnt>old_dci_cnt)
       return(dci_cnt);
 
-    //#ifdef ALL_AGGREGATION
 
     // Now check UE_SPEC format 1E_2A_M10PRB search spaces at aggregation 8
     old_dci_cnt=dci_cnt;
@@ -3249,7 +3241,6 @@ uint16_t dci_decoding_procedure(PHY_VARS_UE *ue,
     if (dci_cnt>old_dci_cnt)
       return(dci_cnt);
 
-    //#endif  //ALL_AGGREGATION
 
   }
 

openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c

@@ -51,7 +51,6 @@
 #include <cblas.h>
 #include "linear_preprocessing_rec.h"
 
-#define NOCYGWIN_STATIC
 //#define DEBUG_MMSE
 
 

openair1/PHY/LTE_UE_TRANSPORT/ulsch_modulation.c

@@ -42,7 +42,6 @@
 
 //#define DEBUG_ULSCH_MODULATION
 
-#ifndef OFDMA_ULSCH
 void dft_lte(int32_t *z,int32_t *d, int32_t Msc_PUSCH, uint8_t Nsymb)
 {
 
@@ -371,7 +370,6 @@ void dft_lte(int32_t *z,int32_t *d, int32_t Msc_PUSCH, uint8_t Nsymb)
   //  printf("\n");
 }
 
-#endif
 void ulsch_modulation(int32_t **txdataF,
                       short amp,
                       uint32_t frame,
@@ -690,57 +688,10 @@ void ulsch_modulation(int32_t **txdataF,
 
   // Transform Precoding
 
-#ifdef OFDMA_ULSCH
-
-  for (i=0; i<ulsch_Msymb; i++) {
-    ulsch->z[i] = ulsch->d[i];
-  }
-
-#else
   dft_lte(ulsch->z,ulsch->d,Msc_PUSCH,ulsch->Nsymb_pusch);
-#endif
 
   DevAssert(txdataF);
 
-#ifdef OFDMA_ULSCH
-  re_offset0 = frame_parms->first_carrier_offset + (ulsch->harq_processes[harq_pid]->first_rb*12);
-
-  if (re_offset0>frame_parms->ofdm_symbol_size) {
-    re_offset0 -= frame_parms->ofdm_symbol_size;
-    //    re_offset0++;
-  }
-
-  //  printf("re_offset0 %d\n",re_offset0);
-
-
-  for (j=0,l=0; l<(nsymb-ulsch->srs_active); l++) {
-    re_offset = re_offset0;
-    symbol_offset = (int)frame_parms->ofdm_symbol_size*(l+(subframe*nsymb));
-#ifdef DEBUG_ULSCH_MODULATION
-    printf("symbol %d (subframe %d): symbol_offset %d\n",l,subframe,symbol_offset);
-#endif
-    txptr = &txdataF[0][symbol_offset];
-
-    if (((frame_parms->Ncp == 0) && ((l==3) || (l==10)))||
-        ((frame_parms->Ncp == 1) && ((l==2) || (l==8)))) {
-    }
-    // Skip reference symbols
-    else {
-
-      //      printf("copying %d REs\n",Msc_PUSCH);
-      for (i=0; i<Msc_PUSCH; i++,j++) {
-#ifdef DEBUG_ULSCH_MODULATION
-        printf("re_offset %d (%p): %d,%d\n", re_offset,&ulsch->z[j],((int16_t*)&ulsch->z[j])[0],((int16_t*)&ulsch->z[j])[1]);
-#endif
-        txptr[re_offset++] = ulsch->z[j];
-
-        if (re_offset==frame_parms->ofdm_symbol_size)
-          re_offset = 0;
-      }
-    }
-  }
-
-# else  // OFDMA_ULSCH = 0
   re_offset0 = frame_parms->first_carrier_offset + (ulsch->harq_processes[harq_pid]->first_rb*12);
 
   if (re_offset0>frame_parms->ofdm_symbol_size) {
@@ -777,8 +728,5 @@ void ulsch_modulation(int32_t **txdataF,
     }
   }
 
-#endif
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_ULSCH_MODULATION, VCD_FUNCTION_OUT);
-
 }
 

openair1/PHY/NR_UE_TRANSPORT/dci_nr.h

@@ -33,13 +33,7 @@
 #ifndef __PHY_NR_UE_TRANSPORT_DCI_NR__H__
 #define __PHY_NR_UE_TRANSPORT_DCI_NR__H__
 
-#ifndef USER_MODE
-#include "PHY/types.h"
-#else
 #include <stdint.h>
-#endif
-
-
 
 #define MAX_DCI_SIZE_BITS 45
 

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c

@@ -42,12 +42,6 @@
 #include "PHY/NR_REFSIG/nr_refsig.h"
 #include "PHY/NR_REFSIG/dmrs_nr.h"
 
-#ifndef USER_MODE
-#define NOCYGWIN_STATIC static
-#else
-#define NOCYGWIN_STATIC
-#endif
-
 /* dynamic shift for LLR computation for TM3/4
  * set as command line argument, see lte-softmodem.c
  * default value: 0

openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c

@@ -40,9 +40,7 @@
 //#define DEBUG_PBCH 
 //#define DEBUG_PBCH_ENCODING
 
-#ifdef OPENAIR2
   //#include "PHY_INTERFACE/defs.h"
-#endif
 
 #define PBCH_A 24
 

openair1/PHY/defs_L1_NB_IoT.h

@@ -48,7 +48,6 @@
 #ifdef MEX
   #define msg mexPrintf
 #else
-  #ifdef OPENAIR2
     #if ENABLE_RAL
       #include "collection/hashtable/hashtable.h"
       #include "COMMON/ral_messages_types.h"
@@ -56,9 +55,6 @@
     #endif
     #include "common/utils/LOG/log.h"
     #define msg(aRGS...) LOG_D(PHY, ##aRGS)
-  #else
-    #define msg printf
-  #endif
 #endif
 //use msg in the real-time thread context
 #define msg_nrt printf
@@ -196,19 +192,6 @@ typedef struct {
   NB_IoT_UE_DLSCH_t   *dlsch_rn_MCH[10];
 
 } PHY_VARS_RN_NB_IoT;
-/*
-#ifdef OCP_FRAMEWORK
-#include <enums.h>
-#else
-//typedef enum {normal_txrx=0,rx_calib_ue=1,rx_calib_ue_med=2,rx_calib_ue_byp=3,debug_prach=4,no_L2_connect=5,calib_prach_tx=6,rx_dump_frame=7,loop_through_memory=8} runmode_t;
-*/
-// enum transmission_access_mode {
-//   NO_ACCESS=0,
-//   POSTPONED_ACCESS,
-//   CANCELED_ACCESS,
-//   UNKNOWN_ACCESS,
-//   SCHEDULED_ACCESS,
-//   CBA_ACCESS};
 
 typedef enum  {
   eNodeB_3GPP_NB_IoT=0,   // classical eNodeB function

openair1/PHY/defs_UE.h

@@ -87,7 +87,6 @@
   #define LOG_W(x, ...) mexPrintf(__VA_ARGS__)
   #define LOG_M(x, ...) mexPrintf(__VA_ARGS__)
 #else
-  #ifdef OPENAIR2
     #if ENABLE_RAL
       #include "collection/hashtable/hashtable.h"
       #include "COMMON/ral_messages_types.h"
@@ -95,9 +94,6 @@
     #endif
     #include "common/utils/LOG/log.h"
     #define msg(aRGS...) LOG_D(PHY, ##aRGS)
-  #else
-    #define msg printf
-  #endif
 #endif
 
 

openair1/PHY/defs_nr_UE.h

@@ -51,16 +51,12 @@
 #ifdef MEX
   #define msg mexPrintf
 #else
-  #ifdef OPENAIR2
     #if ENABLE_RAL
       #include "common/utils/hashtable/hashtable.h"
       #include "COMMON/ral_messages_types.h"
       #include "UTIL/queue.h"
     #endif
     #define msg(aRGS...) LOG_D(PHY, ##aRGS)
-  #else
-    #define msg printf
-  #endif
 #endif
 //use msg in the real-time thread context
 #define msg_nrt printf

openair1/PHY/phy_extern.h

@@ -55,12 +55,6 @@ extern char mode_string[4][20];
 extern unsigned char NB_RU;
 
 
-#ifndef OPENAIR2
-extern unsigned char NB_eNB_INST;
-extern uint16_t NB_UE_INST;
-extern unsigned char NB_RN_INST;
-#endif
-
 extern int flag_LA;
 extern double sinr_bler_map[MCS_COUNT][2][MCS_TABLE_LENGTH_MAX];
 extern double sinr_bler_map_up[MCS_COUNT][2][16];

openair1/PHY/phy_extern_nr_ue.h

@@ -63,12 +63,6 @@ extern char mode_string[4][20];
 
 extern unsigned char NB_RU;
 
-#ifndef OPENAIR2
-extern unsigned char NB_eNB_INST;
-extern uint16_t NB_UE_INST;
-extern unsigned char NB_RN_INST;
-#endif
-
 extern int flag_LA;
 extern double sinr_bler_map[MCS_COUNT][2][MCS_TABLE_LENGTH_MAX];
 extern double sinr_bler_map_up[MCS_COUNT][2][16];

openair1/PHY/phy_extern_ue.h

@@ -53,12 +53,6 @@ extern int flagMag;
 extern char mode_string[4][20];
 
 
-#ifndef OPENAIR2
-extern unsigned char NB_eNB_INST;
-extern uint16_t NB_UE_INST;
-extern unsigned char NB_RN_INST;
-#endif
-
 extern int flag_LA;
 extern double sinr_bler_map[MCS_COUNT][2][MCS_TABLE_LENGTH_MAX];
 extern double sinr_bler_map_up[MCS_COUNT][2][16];

openair1/PHY/phy_vars.h

@@ -55,13 +55,6 @@ const short conjugate2[8]__attribute__((aligned(16))) = {1,-1,1,-1,1,-1,1,-1};
 
 unsigned char NB_RU=0;
 
-#ifndef OPENAIR2
-//unsigned char NB_eNB_INST=0;
-//uint16_t NB_UE_INST=0;
-//unsigned char NB_RN_INST=0;
-//unsigned char NB_INST=0;
-#endif
-
 int number_of_cards;
 
 

openair1/PHY/phy_vars_nr_ue.h

@@ -57,13 +57,6 @@ const short conjugate2[8]__attribute__((aligned(16))) = {1,-1,1,-1,1,-1,1,-1};
 
 unsigned char NB_RU=0;
 
-#ifndef OPENAIR2
-unsigned char NB_eNB_INST=0;
-uint16_t NB_UE_INST=0;
-unsigned char NB_RN_INST=0;
-unsigned char NB_INST=0;
-#endif
-
 
 int number_of_cards;
 

openair1/PHY/phy_vars_ue.h

@@ -47,14 +47,6 @@ const short conjugate2[8]__attribute__((aligned(16))) = {1,-1,1,-1,1,-1,1,-1};
 #include "SIMULATION/ETH_TRANSPORT/vars.h"
 
 
-#ifndef OPENAIR2
-  unsigned char NB_eNB_INST=0;
-  uint16_t NB_UE_INST=0;
-  unsigned char NB_RN_INST=0;
-  unsigned char NB_INST=0;
-#endif
-
-
 int number_of_cards;
 
 

openair1/PHY/types_NB_IoT.h

@@ -22,11 +22,6 @@
 #ifndef __openair_TYPES_NB_IOT_H__
 #define __openair_TYPES_NB_IOT_H__
 
-#ifdef USER_MODE
 #include <stdint.h>
-#else
-#include <linux/types.h>
-#endif
-
 
 #endif /*__openair_TYPES_NB_IOT_H__ */

openair1/SCHED_NR_UE/fapi_nr_ue_l1.h

@@ -44,4 +44,4 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response);
 int8_t nr_ue_phy_config_request(nr_phy_config_t *phy_config);
 
 
-#endif
\ No newline at end of file
+#endif

openair1/SIMULATION/LTE_PHY/gpib_send.c

@@ -19,10 +19,10 @@
  *      contact@openairinterface.org
  */
 
-#include<stdio.h>
-#include<string.h>
-#include<gpib/ib.h>
-#include"gpib_send.h"
+#include <stdio.h>
+#include <string.h>
+#include <gpib/ib.h>
+#include "gpib_send.h"
 void gpib_send(unsigned int gpib_board, unsigned int gpib_device, char *command_string )
 {
   unsigned short addlist[2] = {gpib_device, NOADDR};

openair2/COMMON/mac_rrc_primitives.h

@@ -22,9 +22,7 @@
 #ifndef __MAC_RRC_PRIMITIVES_H__
 #define __MAC_RRC_PRIMITIVES_H__
 
-#ifndef OPENAIR2_IN
-  #include "LAYER2/RLC/rlc.h"
-#endif
+#include "LAYER2/RLC/rlc.h"
 #include "COMMON/platform_types.h"
 #include "COMMON/platform_constants.h"
 #include "openair2/RRC/LTE/rrc_defs.h"
@@ -306,8 +304,6 @@ typedef struct {
 
 
 
-#ifndef OPENAIR2_IN
-
 typedef struct {  //RRC_INTERFACE_FUNCTIONS
   unsigned int Frame_index;
   unsigned short UE_index[NB_MODULES_MAX][NB_SIG_CNX_UE];
@@ -375,10 +371,6 @@ typedef struct {
 } MAC_RLC_XFACE;
 
 
-#endif
-
-
-
 //#define IDLE 0
 #define NEED_RADIO_CONFIG 3
 #define RADIO_CONFIG_TX 2

openair2/COMMON/rrm_config_structs.h

-/*
- * 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
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*
-                               rrm_config_structs.h
-                             -------------------
-  AUTHOR  : Linus GASSER modified by Lionel GAUTHIER Raymond KNOPP
-  COMPANY : EURECOM
-  EMAIL   : linus.gasser@epfl.ch
-  EMAIL   : lionel.gauthier@eurecom.fr
-  EMAIL   : raymond.knopp@eurecom.fr
-
-
-
- ***************************************************************************/
-#ifdef OLD_RRC_CELLULAR
-#    ifndef __RRM_CONFIG_STRUCTS_H__
-#        define __RRM_CONFIG_STRUCTS_H__
-
-#        include "platform_types.h"
-#        include "platform_constants.h"
-#        include "rrm_constants.h"
-#        include "rlc.h"
-
-typedef volatile struct {
-  uint32_t             e_r;
-  int             timer_poll;
-  int             timer_poll_prohibit;
-  int             timer_discard;
-  int             timer_poll_periodic;
-  int             timer_status_prohibit;
-  int             timer_status_periodic;
-  int             timer_rst;
-  int             timer_mrw;
-  int             missing_pdu_indicator;
-  uint32_t             pdu_size;
-  //      int                                 in_sequence_delivery; // not implemented
-  uint8_t              max_rst;
-  uint8_t              max_dat;
-  uint16_t             poll_pdu;
-  uint16_t             poll_sdu;
-  uint8_t              poll_window;
-  uint32_t             tx_window_size;
-  uint32_t             rx_window_size;
-  uint8_t              max_mrw;
-  uint8_t              last_transmission_pdu_poll_trigger;
-  uint8_t              last_retransmission_pdu_poll_trigger;
-  enum RLC_SDU_DISCARD_MODE sdu_discard_mode;
-  uint32_t             send_mrw;
-} AM;
-
-typedef volatile struct {
-  uint32_t             e_r;
-  uint32_t             timer_discard;
-  uint32_t             sdu_discard_mode;
-  uint32_t             segmentation_indication;
-  uint32_t             delivery_of_erroneous_sdu;
-} TM;
-
-typedef volatile struct {
-  uint32_t             e_r;
-  uint32_t             timer_discard;
-  uint32_t             sdu_discard_mode;
-} UM;
-
-typedef volatile struct {
-  uint8_t              logch_identity;
-  uint8_t              mac_logch_priority;
-} MAP_INFO;
-
-typedef volatile struct {
-  uint32_t             rlc_mode;
-  AM              am;
-  TM              tm;
-  UM              um;
-} RLC_INFO;
-
-typedef volatile struct {
-  int             header_compression_algorithm;
-} PDCP_INFO;
-
-
-
-
-typedef volatile struct {
-  rb_type_t       rb_type;
-  RLC_INFO        rlc_info;
-  PDCP_INFO       pdcp_info;
-  uint16_t             rb_id;
-  // Added for OPENAIR MAC
-  //LCHAN_DESC      Lchan_desc;
-
-} RADIOBEARER;
-
-
-typedef volatile struct {
-  int             TIMER300;
-  int             TIMER302;
-  int             TIMER305;
-  int             TIMER307;
-  int             TIMER308;
-  int             TIMER312;
-  int             TIMER313;
-  int             TIMER314;
-  int             TIMER315;
-} L3TIMERS_;
-
-typedef volatile struct {
-  int             COUNTERN300;
-  int             COUNTERN302;
-  int             COUNTERN308;
-  int             COUNTERN312;
-  int             COUNTERN313;
-} L3COUNTERS_;
-
-
-typedef volatile struct {
-  int             MaxNumRemote;
-  L3TIMERS_       Timers;
-  L3COUNTERS_     Counters;
-} L3_;
-
-
-typedef volatile struct {
-  uint8_t              rrm_action;   // ACTION_NULL,ADD,REMOVE,MODIFY
-  uint8_t              rrm_element;  // rb,trch,cctrch
-  uint8_t              rrm_element_index;    // rb/trch/cctrch index
-} RRM_COMMAND_MT;
-
-typedef volatile struct {
-  uint8_t              rrm_action;   // ACTION_NULL,ADD,REMOVE,MODIFY
-  uint8_t              mobile;
-  uint8_t              rrm_element;  // rb,trch,cctrch
-  uint8_t              rrm_element_index;    // rb/trch/cctrch index
-} RRM_COMMAND_RG;
-
-
-typedef volatile struct {
-  uint8_t              nb_commands;
-  RRM_COMMAND_RG  rrm_commands[JRRM_MAX_COMMANDS_PER_TRANSACTION];
-
-
-  RADIOBEARER     bearer[MAX_RB_RG];
-  L3_             L3;
-
-} RG_CONFIG;
-
-typedef volatile struct {
-  uint8_t              nb_commands;
-  RRM_COMMAND_MT  rrm_commands[JRRM_MAX_COMMANDS_PER_TRANSACTION];
-
-  RADIOBEARER     bearer[MAX_RB_MOBILE];
-  L3_             L3;
-
-} MT_CONFIG;
-
-#        ifdef NODE_RG
-typedef volatile struct {
-  RG_CONFIG       rg_config;
-  MT_CONFIG       mt_config[MAX_MOBILES_PER_RG];
-} RRM_VARS;
-
-#        else
-/* NODE_RG */
-typedef volatile struct {
-  MT_CONFIG       mt_config[MAX_MANAGED_RG_PER_MOBILE];
-
-
-
-} RRM_VARS;
-#        endif
-/* NODE_RG */
-//typedef   MT_CONFIG MAIN_MOBILE ;
-//typedef   RG_CONFIG MAIN_RADIO_GATEWAY;
-
-#    endif
-#endif

openair2/GNB_APP/gnb_config.h

@@ -42,10 +42,7 @@
 #include "ngap_messages_types.h"
 #include "f1ap_messages_types.h"
 
-#ifdef CMAKER
 #include "rrc_messages_types.h"
-#endif
-
 #include "intertask_interface.h"
 #include "RRC/NR/nr_rrc_defs.h"
 

openair2/LAYER2/MAC/defs_NB_IoT.h

@@ -9,11 +9,9 @@
  */
 #ifndef __LAYER2_MAC_DEFS_NB_IOT_H__
 #define __LAYER2_MAC_DEFS_NB_IOT_H__
-#ifdef USER_MODE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#endif
 //#include "COMMON/openair_defs.h"
 #include "COMMON/platform_constants.h"
 #include "COMMON/mac_rrc_primitives.h"

openair2/LAYER2/MAC/mac_vars.h

@@ -105,13 +105,11 @@ eNB_ULSCH_INFO eNB_ulsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][MAX_MOBILES_PER_EN
 eNB_DLSCH_INFO eNB_dlsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][MAX_MOBILES_PER_ENB]; // eNBxUE = 8x8
 
 
-#ifdef OPENAIR2
   unsigned char NB_eNB_INST = 0;
   uint16_t NB_UE_INST = 0;
   uint16_t NB_THREAD_INST = 0;
   unsigned char NB_RN_INST = 0;
   unsigned char NB_INST = 0;
-#endif
 
 
 DCI0_5MHz_TDD_1_6_t UL_alloc_pdu;

openair2/LAYER2/MAC/ue_procedures.c

@@ -77,13 +77,6 @@ static int mbms_mch_i=0;
 //static int num_msi_per_CSA[28];
 
 
-/*
- *
-#ifndef USER_MODE
-#define msg debug_msg
-#endif
- */
-
 mapping BSR_names[] = {
   {"NONE", 0},
   {"SHORT BSR", 1},
@@ -1251,65 +1244,6 @@ int ue_query_mch_fembms(module_id_t module_idP, uint8_t CC_id, uint32_t frameP,
   }
 
 
-
-  
-#ifdef OLD
-          // Acount for sf_allocable in CSA
-        int num_sf_alloc = 0;
-
-        for (l = 0; l < 8; l++) {
-          if (UE_mac_inst[module_idP].commonSF_Alloc_r9_mbsfn_SubframeConfig[l] == NULL)
-            continue;
-
-          if (UE_mac_inst[module_idP].commonSF_Alloc_r9_mbsfn_SubframeConfig[l]->subframeAllocation.present != LTE_MBSFN_SubframeConfig__subframeAllocation_PR_oneFrame)
-            continue;
-
-          uint32_t common_mbsfn_SubframeConfig = UE_mac_inst[module_idP].commonSF_Alloc_r9_mbsfn_SubframeConfig[l]->subframeAllocation.choice.oneFrame.buf[0];
-
-
-          for (j = 0; j < 6; j++)
-            num_sf_alloc += ((common_mbsfn_SubframeConfig & (0x80 >> j)) == (0x80 >> j));
-            //num_sf_alloc=1;
-        }
-	
-	num_sf_alloc = 10;
-
-        num_non_mbsfn_SubframeConfig = (UE_mac_inst[module_idP].non_mbsfn_SubframeConfig->subframeAllocation_r14.buf[0]<<1 | UE_mac_inst[module_idP].non_mbsfn_SubframeConfig->subframeAllocation_r14.buf[0]>>7);
-	int ones=0;
-	for(j=0; j < 16; j++){
-		if(num_non_mbsfn_SubframeConfig & 1)
-			ones++;
-		num_non_mbsfn_SubframeConfig>>=1;
-	}
-
-        for (l = 0; l < 28; l++) {
-          if (UE_mac_inst[module_idP].pmch_stop_mtch[l] >= 1/*num_sf_alloc*/) {
-            if (UE_mac_inst[module_idP].pmch_stop_mtch[l] != 2047) {
-              if (UE_mac_inst[module_idP].pmch_Config[UE_mac_inst[module_idP].msi_pmch] != NULL){
-                mtch_mcs = UE_mac_inst[module_idP].pmch_Config[UE_mac_inst[module_idP].msi_pmch]->dataMCS_r9;
-    	       //int common_mbsfn_alloc_offset = UE_mac_inst[module_idP].commonSF_Alloc_r9_mbsfn_SubframeConfig[0]->radioframeAllocationOffset;
-               long common_mbsfn_period  = 1 << UE_mac_inst[module_idP].commonSF_Alloc_r9_mbsfn_SubframeConfig[0]->radioframeAllocationPeriod;
-               long commonSF_AllocPeriod = 4 << UE_mac_inst[module_idP].commonSF_AllocPeriod_r9;
-               if(UE_mac_inst[module_idP].common_num_sf_alloc >= UE_mac_inst[module_idP].pmch_stop_mtch[l]){
-                       //LOG_E(MAC,"Attemp to UE_mac_inst[module_idP].common_num_sf_alloc %d\n",UE_mac_inst[module_idP].common_num_sf_alloc);
-
-                       mtch_mcs = -1;
-               }/*else
-                       OG_W(MAC,"Attemp to UE_mac_inst[module_idP].common_num_sf_alloc %d\n",UE_mac_inst[module_idP].common_num_sf_alloc);*/
-                       LOG_D(MAC,"Attemp to UE_mac_inst[module_idP].common_num_sf_alloc %d num_sf_alloc %d commonSF_AllocPeriod %ld, common_mbsfn_period %ld num_non_mbsfn_SubframeConfig %x ones %d\n",UE_mac_inst[module_idP].common_num_sf_alloc,num_sf_alloc, commonSF_AllocPeriod,common_mbsfn_period,num_non_mbsfn_SubframeConfig,ones);
-                UE_mac_inst[module_idP].common_num_sf_alloc++;
-                UE_mac_inst[module_idP].common_num_sf_alloc = UE_mac_inst[module_idP].common_num_sf_alloc % (num_sf_alloc * commonSF_AllocPeriod / common_mbsfn_period-(1+ones)*(commonSF_AllocPeriod/4)); //TODO
-              }
-              else
-                mtch_mcs = -1;
-
-              mch_lcid = (uint8_t)l;
-              break;
-            }
-          }
-        }
-#endif
-
 {
  	 // Acount for sf_allocable in Common SF Allocation
  	 int num_sf_alloc = 0;
@@ -1869,49 +1803,7 @@ int ue_query_mch(module_id_t module_idP, uint8_t CC_id, uint32_t frameP, uint32_
 	//}
   }
 
-#ifdef OLD
-        // Acount for sf_allocable in CSA
-        int num_sf_alloc = 0;
 
-        for (l = 0; l < 8; l++) {
-          if (UE_mac_inst[module_idP].commonSF_Alloc_r9_mbsfn_SubframeConfig[l] == NULL)
-            continue;
-
-          if (UE_mac_inst[module_idP].commonSF_Alloc_r9_mbsfn_SubframeConfig[l]->subframeAllocation.present != LTE_MBSFN_SubframeConfig__subframeAllocation_PR_oneFrame)
-            continue;
-
-          uint32_t common_mbsfn_SubframeConfig = UE_mac_inst[module_idP].commonSF_Alloc_r9_mbsfn_SubframeConfig[l]->subframeAllocation.choice.oneFrame.buf[0];
-
-          for (j = 0; j < 6; j++)
-            num_sf_alloc += ((common_mbsfn_SubframeConfig & (0x80 >> j)) == (0x80 >> j));
-	    //num_sf_alloc=1;
-        }
-
-        for (l = 0; l < 28; l++) {
-          if (UE_mac_inst[module_idP].pmch_stop_mtch[l] >= 1/*num_sf_alloc*/) {
-            if (UE_mac_inst[module_idP].pmch_stop_mtch[l] != 2047) {
-              if (UE_mac_inst[module_idP].pmch_Config[UE_mac_inst[module_idP].msi_pmch] != NULL){
-                mtch_mcs = UE_mac_inst[module_idP].pmch_Config[UE_mac_inst[module_idP].msi_pmch]->dataMCS_r9;
-               long common_mbsfn_period  = 1 << UE_mac_inst[module_idP].commonSF_Alloc_r9_mbsfn_SubframeConfig[0]->radioframeAllocationPeriod;
-               long commonSF_AllocPeriod = 4 << UE_mac_inst[module_idP].commonSF_AllocPeriod_r9;
-               if(UE_mac_inst[module_idP].common_num_sf_alloc >= UE_mac_inst[module_idP].pmch_stop_mtch[l]){
-		       //LOG_E(MAC,"Attemp to UE_mac_inst[module_idP].common_num_sf_alloc %d\n",UE_mac_inst[module_idP].common_num_sf_alloc);
-
-                       mtch_mcs = -1;
-	       }/*else
-		       LOG_W(MAC,"Attemp to UE_mac_inst[module_idP].common_num_sf_alloc %d\n",UE_mac_inst[module_idP].common_num_sf_alloc);*/
-               	UE_mac_inst[module_idP].common_num_sf_alloc++;
-           	UE_mac_inst[module_idP].common_num_sf_alloc = UE_mac_inst[module_idP].common_num_sf_alloc % (num_sf_alloc * commonSF_AllocPeriod / common_mbsfn_period);
-	      }
-              else
-                mtch_mcs = -1;
-
-              mch_lcid = (uint8_t)l;
-              break;
-            }
-          }
-        }
-#endif
 
 {
  	 // Acount for sf_allocable in Common SF Allocation

openair2/LAYER2/PDCP_v10.1.0/pdcp.h

@@ -67,9 +67,7 @@ typedef struct {
 } pdcp_params_t;
 
 
-#ifndef PDCP_USE_NETLINK
-  #define PDCP_USE_NETLINK          ( get_pdcp_optmask() & PDCP_USE_NETLINK_BIT)
-#endif
+#define PDCP_USE_NETLINK          ( get_pdcp_optmask() & PDCP_USE_NETLINK_BIT)
 #define LINK_ENB_PDCP_TO_IP_DRIVER  ( get_pdcp_optmask() & LINK_ENB_PDCP_TO_IP_DRIVER_BIT)
 #define LINK_ENB_PDCP_TO_GTPV1U     ( get_pdcp_optmask() & LINK_ENB_PDCP_TO_GTPV1U_BIT)
 #define UE_NAS_USE_TUN              ( get_pdcp_optmask() & UE_NAS_USE_TUN_BIT)
@@ -501,7 +499,6 @@ typedef struct {
 #define REORDERING_WINDOW_SN_7BIT 64
 #define REORDERING_WINDOW_SN_12BIT 2048
 
-extern signed int             pdcp_2_nas_irq;
 extern pdcp_stats_t              UE_pdcp_stats[MAX_MOBILES_PER_ENB];
 extern pdcp_stats_t              eNB_pdcp_stats[NUMBER_OF_eNB_MAX];
 

openair2/LAYER2/RLC/TM_v9.3.0/rlc_tm_init.h

@@ -37,7 +37,6 @@
 //-----------------------------------------------------------------------------
 #        include "rlc_tm_entity.h"
 #        include "mem_block.h"
-//#        include "rrm_config_structs.h"
 #        include "rlc_tm_structs.h"
 //#        include "rlc.h"
 #        include "platform_types.h"

openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_control_primitives.c

@@ -27,7 +27,6 @@
 #include "rlc_um.h"
 #include "rlc_primitives.h"
 #include "list.h"
-#include "rrm_config_structs.h"
 #include "LAYER2/MAC/mac_extern.h"
 #include "common/utils/LOG/log.h"
 

openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_very_simple_test.h

@@ -33,7 +33,6 @@
 //-----------------------------------------------------------------------------
 #        include "rlc_um_entity.h"
 #        include "mem_block.h"
-#        include "rrm_config_structs.h"
 #        include "rlc_um_structs.h"
 #        include "rlc_um_constants.h"
 //-----------------------------------------------------------------------------

openair2/NETWORK_DRIVER/MESH/common.c

@@ -389,36 +389,19 @@ void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct class
   pdcph.sourceL2Id = 0;
   pdcph.destinationL2Id = 0;
 
-
-
-#ifdef PDCP_USE_NETLINK
   bytes_wrote = nas_netlink_send((char *)&pdcph,NAS_PDCPH_SIZE);
 #ifdef NAS_DEBUG_SEND
   printk("[NAS] Wrote %d bytes (header for %d byte skb) to PDCP via netlink\n",
          bytes_wrote,skb->len);
 #endif
-#else
-  bytes_wrote = rtf_put(NAS2PDCP_FIFO, &pdcph, NAS_PDCPH_SIZE);
-#ifdef NAS_DEBUG_SEND
-  printk("[NAS] Wrote %d bytes (header for %d byte skb) to PDCP fifo\n",
-         bytes_wrote,skb->len);
-#endif
-#endif //PDCP_USE_NETLINK
 
   if (bytes_wrote != NAS_PDCPH_SIZE) {
     printk("NAS_COMMON_QOS_SEND: problem while writing PDCP's header (bytes wrote = %d )\n",bytes_wrote);
     printk("rb_id %ld, Wrote %d, Header Size %lu\n", pdcph.rb_id , bytes_wrote, NAS_PDCPH_SIZE);
-#ifndef PDCP_USE_NETLINK
-    rtf_reset(NAS2PDCP_FIFO);
-#endif //PDCP_USE_NETLINK
     return;
   }
 
-#ifdef  PDCP_USE_NETLINK
   bytes_wrote += nas_netlink_send((char *)skb->data,skb->len);
-#else
-  bytes_wrote += rtf_put(NAS2PDCP_FIFO, skb->data, skb->len);
-#endif //PDCP_USE_NETLINK
 
   if (bytes_wrote != skb->len+NAS_PDCPH_SIZE) {
     printk("NAS_COMMON_QOS_SEND: Inst %d, RB_ID %ld: problem while writing PDCP's data, bytes_wrote = %d, Data_len %d, PDCPH_SIZE %lu\n",
@@ -427,9 +410,6 @@ void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct class
            bytes_wrote,
            skb->len,
            NAS_PDCPH_SIZE); // congestion
-#ifndef PDCP_USE_NETLINK
-    rtf_reset(NAS2PDCP_FIFO);
-#endif //PDCP_USE_NETLINK
     return;
   }
 
@@ -449,69 +429,6 @@ void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct class
 #endif
 }
 
-#ifndef PDCP_USE_NETLINK
-//---------------------------------------------------------------------------
-void nas_COMMON_QOS_receive()
-{
-  //---------------------------------------------------------------------------
-  uint8_t sapi;
-  struct pdcp_data_ind_header_s     pdcph;
-  unsigned char data_buffer[2048];
-  struct classifier_entity *rclass;
-  struct nas_priv *priv;
-  int bytes_read;
-
-  // Start debug information
-#ifdef NAS_DEBUG_RECEIVE
-  printk("NAS_COMMON_QOS_RECEIVE - begin \n");
-#endif
-
-  // End debug information
-
-  bytes_read =  rtf_get(PDCP2PDCP_USE_RT_FIFO,&pdcph, NAS_PDCPH_SIZE);
-
-  while (bytes_read>0) {
-    if (bytes_read != NAS_PDCPH_SIZE) {
-      printk("NAS_COMMON_QOS_RECEIVE: problem while reading PDCP header\n");
-      return;
-    }
-
-    priv=netdev_priv(nasdev[pdcph.inst]);
-    rclass = nas_COMMON_search_class_for_rb(pdcph.rb_id,priv);
-
-    bytes_read+= rtf_get(PDCP2PDCP_USE_RT_FIFO,
-                         data_buffer,
-                         pdcph.data_size);
-
-#ifdef NAS_DEBUG_RECEIVE
-    printk("NAS_COMMON_QOS_RECEIVE - Got header for RB %d, Inst %d \n",
-           pdcph.rb_id,
-           pdcph.inst);
-#endif
-
-    if (rclass) {
-#ifdef NAS_DEBUG_RECEIVE
-      printk("[NAS][COMMON] Found corresponding connection in classifier for RAB\n");
-#endif //NAS_DEBUG_RECEIVE
-
-      nas_COMMON_receive(pdcph.data_size,
-                         (void *)data_buffer,
-                         pdcph.inst,
-                         rclass,
-                         pdcph.rb_id);
-    }
-
-    bytes_read =  rtf_get(PDCP2PDCP_USE_RT_FIFO, &pdcph, NAS_PDCPH_SIZE);
-  }
-
-
-
-#ifdef NAS_DEBUG_RECEIVE
-  printk("NAS_COMMON_QOS_RECEIVE - end \n");
-#endif
-}
-
-#else
 void nas_COMMON_QOS_receive(struct nlmsghdr *nlh)
 {
 
@@ -542,7 +459,6 @@ void nas_COMMON_QOS_receive(struct nlmsghdr *nlh)
   }
 
 }
-#endif //PDCP_USE_NETLINK
 
 //---------------------------------------------------------------------------
 struct cx_entity *nas_COMMON_search_cx(nasLocalConnectionRef_t lcr,struct nas_priv *priv)

openair2/NETWORK_DRIVER/MESH/device.c

@@ -53,10 +53,8 @@
 
 struct net_device *nasdev[NB_INSTANCES_MAX];
 
-#ifdef PDCP_USE_NETLINK
 extern void nas_netlink_release(void);
 extern int nas_netlink_init(void);
-#endif
 
 //int bytes_wrote;
 //int bytes_read;
@@ -82,38 +80,6 @@ int find_inst(struct net_device *dev)
 
 //---------------------------------------------------------------------------
 
-#ifndef PDCP_USE_NETLINK
-//void interrupt(void){
-void *nas_interrupt(void)
-{
-  //---------------------------------------------------------------------------
-  uint8_t cxi;
-
-  //  struct nas_priv *priv=netdev_priv(dev_id);
-  //  unsigned int flags;
-
-  //  priv->lock = SPIN_LOCK_UNLOCKED;
-
-#ifdef DEBUG_INTERRUPT
-  printk("INTERRUPT - begin\n");
-#endif
-  //  spin_lock_irqsave(&priv->lock,flags);
-  cxi=0;
-  //  mesh_GC_receive();
-  //  mesh_DC_receive(naspriv->cx+cxi);
-#ifndef PDCP_USE_NETLINK
-  nas_COMMON_QOS_receive();
-#endif
-  //  spin_unlock_irqrestore(&priv->lock,flags);
-#ifdef DEBUG_INTERRUPT
-  printk("INTERRUPT: end\n");
-#endif
-  //  return 0;
-  return NULL;
-}
-#endif //NETLINK
-
-//---------------------------------------------------------------------------
 // Called by ifconfig when the device is activated by ifconfig
 int nas_open(struct net_device *dev)
 {
@@ -121,15 +87,6 @@ int nas_open(struct net_device *dev)
   printk("OPEN: begin\n");
   //  MOD_INC_USE_COUNT;
   // Address has already been set at init
-#ifndef PDCP_USE_NETLINK
-
-  if (pdcp_2_nas_irq==-EBUSY) {
-    printk("OPEN: irq failure\n");
-    return -EBUSY;
-  }
-
-#endif //PDCP_USE_NETLINK
-
   /*
   netif_start_queue(dev);
   //
@@ -449,16 +406,6 @@ int init_module (void)
 
   printk("Starting NASMESH, number of IMEI paramters %d, IMEI %X%X\n",m_arg,nas_IMEI[0],nas_IMEI[1]);
 
-#ifndef PDCP_USE_NETLINK
-
-  if (pdcp_2_nas_irq == -EBUSY || pdcp_2_nas_irq == -EINVAL) {
-    printk("[NAS][INIT] No interrupt resource available\n");
-    return -EBUSY;
-  } else
-    printk("[NAS][INIT]: Interrupt %d\n", pdcp_2_nas_irq);
-
-#endif //NETLINK
-
   for (inst=0; inst<NB_INSTANCES_MAX; inst++) {
     printk("[NAS][INIT] nasmesh_init_module: begin init instance %d\n",inst);
 
@@ -493,15 +440,11 @@ int init_module (void)
     }
   }
 
-#ifdef PDCP_USE_NETLINK
-
   if ((err=nas_netlink_init()) == -1)
     printk("[NAS][INIT] NETLINK failed\n");
 
   printk("[NAS][INIT] NETLINK INIT\n");
 
-#endif //NETLINK
-
   return err;
 
 }
@@ -516,22 +459,6 @@ void cleanup_module(void)
 
   printk("[NAS][CLEANUP]nasmesh_cleanup_module: begin\n");
 
-#ifndef PDCP_USE_NETLINK
-
-  if (pdcp_2_nas_irq!=-EBUSY) {
-    pdcp_2_nas_irq=0;
-    // Start IRQ linux
-    //    free_irq(priv->irq, NULL);
-    // End IRQ linux
-
-  }
-
-#else // NETLINK
-
-
-
-#endif //NETLINK
-
   for (inst=0; inst<NB_INSTANCES_MAX; inst++) {
 #ifdef DEBUG_DEVICE
     printk("nasmesh_cleanup_module: unregister and free net device instance %d\n",inst);
@@ -541,9 +468,7 @@ void cleanup_module(void)
     free_netdev(nasdev[inst]);
   }
 
-#ifdef PDCP_USE_NETLINK
   nas_netlink_release();
-#endif //PDCP_USE_NETLINK
   printk("nasmesh_cleanup_module: end\n");
 }
 

openair2/NETWORK_DRIVER/MESH/local.h

@@ -178,10 +178,4 @@ extern struct net_device *nasdev[NB_INSTANCES_MAX];
 
 extern uint8_t NAS_NULL_IMEI[14];
 
-//global variables shared with RRC
-#ifndef PDCP_USE_NETLINK
-  extern int pdcp_2_nas_irq;
-#endif
-
-
 #endif

openair2/NETWORK_DRIVER/MESH/mesh.c

@@ -293,10 +293,6 @@ int nas_mesh_DC_send_cx_establish_request(struct cx_entity *cx,struct nas_priv *
     nas_tool_print_buffer((char *)p,p->length);
 #endif
     ++cx->retry;
-#ifdef PDCP_USE_NETLINK
-#else
-    //    bytes_wrote = rtf_put(cx->sap[NAS_DC_INPUT_SAPI], p, p->length);
-#endif
     cx->countimer=gpriv->timer_establishment;
 
     if (bytes_wrote==p->length) {
@@ -353,11 +349,6 @@ int nas_mesh_DC_send_cx_release_request(struct cx_entity *cx,
     p->length =  NAS_TL_SIZE + sizeof(struct NASConnReleaseReq);
     p->nasUEDCPrimitive.conn_release_req.localConnectionRef = cx->lcr;
     p->nasUEDCPrimitive.conn_release_req.releaseCause = NAS_CX_RELEASE_UNDEF_CAUSE;
-#ifdef PDCP_USE_NETLINK
-
-#else
-    //      bytes_wrote = rtf_put(cx->sap[NAS_DC_INPUT_SAPI], p, p->length);
-#endif
 
     if (bytes_wrote==p->length) {
       cx->state=NAS_IDLE;
@@ -441,22 +432,12 @@ void nas_mesh_DC_send_sig_data_request(struct sk_buff *skb,
   p->nasUEDCPrimitive.data_transfer_req.localConnectionRef = cx->lcr;
   p->nasUEDCPrimitive.data_transfer_req.priority = 3;  // TBD
   p->nasUEDCPrimitive.data_transfer_req.nasDataLength = (skb->len)+1; //adds category character
-#ifdef PDCP_USE_NETLINK
-#else
-  //  bytes_wrote = rtf_put(cx->sap[NAS_DC_INPUT_SAPI], p, p->length);
-#endif
 
   if (bytes_wrote!=p->length) {
     printk("NAS_MESH_DC_SEND_SIG: Header sent failure in DC-FIFO\n");
     return;
   }
 
-#ifdef PDCP_USE_NETLINK
-#else
-  //  bytes_wrote += rtf_put(cx->sap[NAS_DC_INPUT_SAPI], &data_type, 1);
-  //  bytes_wrote += rtf_put(cx->sap[NAS_DC_INPUT_SAPI], skb->data, skb->len);
-#endif
-
   if (bytes_wrote != p->length + skb->len + 1) {
     printk("NAS_MESH_DC_SEND_SIG: Data sent failure in DC-FIFO\n");
     return;
@@ -511,22 +492,12 @@ void nas_mesh_DC_send_peer_sig_data_request(struct cx_entity *cx, uint8_t sig_ca
   p->nasUEDCPrimitive.data_transfer_req.localConnectionRef = cx->lcr;
   p->nasUEDCPrimitive.data_transfer_req.priority = 3;  // TBD
   p->nasUEDCPrimitive.data_transfer_req.nasDataLength = (nas_length)+1; //adds category character
-#ifdef PDCP_USE_NETLINK
-#else
-  //  bytes_wrote = rtf_put(cx->sap[NAS_DC_INPUT_SAPI], p, p->length);
-#endif
 
   if (bytes_wrote!=p->length) {
     printk("NAS_MESH_DC_PEER_SEND_SIG: Header sent failure in DC-FIFO\n");
     return;
   }
 
-#ifdef PDCP_USE_NETLINK
-#else
-  //  bytes_wrote += rtf_put(cx->sap[NAS_DC_INPUT_SAPI], &data_type, 1);
-  //  bytes_wrote += rtf_put(cx->sap[NAS_DC_INPUT_SAPI], (char *)nas_data, nas_length);
-#endif
-
   if (bytes_wrote != p->length + nas_length + 1) {
     printk("NAS_MESH_DC_PEER_SEND_SIG: Data sent failure in DC-FIFO\n");
     return;
@@ -665,9 +636,6 @@ void nas_mesh_DC_decode_sig_data_ind(struct cx_entity *cx, struct nas_ue_dc_elem
   }
 
   // End debug information
-#ifndef PDCP_USE_NETLINK
-  //  nas_COMMON_receive(p->length, p->nasUEDCPrimitive.data_transfer_ind.nasDataLength, cx->sap[NAS_DC_OUTPUT_SAPI]);
-#endif
 #ifdef NAS_DEBUG_DC
   printk("NAS_MESH_DC_RECEIVE: DATA_TRANSFER_IND reception\n");
   printk(" Local Connection reference %u\n",p->nasUEDCPrimitive.data_transfer_ind.localConnectionRef);
@@ -842,20 +810,12 @@ int nas_mesh_DC_receive(struct cx_entity *cx,struct nas_priv *gpriv)
   }
 
   // End debug information
-#ifdef PDCP_USE_NETLINK
-#else
-  //  bytes_read = rtf_get(cx->sap[NAS_DC_OUTPUT_SAPI] , gpriv->rbuffer, NAS_TL_SIZE);
-#endif
 
   if (bytes_read>0) {
     struct nas_ue_dc_element *p;
 
     p= (struct nas_ue_dc_element *)(gpriv->rbuffer);
     //get the rest of the primitive
-#ifdef PDCP_USE_NETLINK
-#else
-    //    bytes_read += rtf_get(cx->sap[NAS_DC_OUTPUT_SAPI], (uint8_t *)p+NAS_TL_SIZE, p->length-NAS_TL_SIZE);
-#endif
 
     if (bytes_read!=p->length) {
       printk("NAS_MESH_DC_RECEIVE: Problem while reading primitive header\n");
@@ -982,19 +942,11 @@ int nas_mesh_GC_receive(struct nas_priv *gpriv)
 #ifdef NAS_DEBUG_GC
   printk("NAS_MESH_GC_RECEIVE - begin \n");
 #endif
-#ifdef PDCP_USE_NETLINK
-#else
-  //  bytes_read = rtf_get(gpriv->sap[NAS_GC_SAPI], gpriv->rbuffer, NAS_TL_SIZE);
-#endif
 
   if (bytes_read>0) {
     struct nas_ue_gc_element *p;
     p= (struct nas_ue_gc_element *)(gpriv->rbuffer);
     //get the rest of the primitive
-#ifdef PDCP_USE_NETLINK
-#else
-    //      bytes_read += rtf_get(gpriv->sap[NAS_GC_SAPI], (uint8_t *)p+NAS_TL_SIZE, p->length-NAS_TL_SIZE);
-#endif
 
     if (bytes_read!=p->length) {
       printk("NAS_MESH_GC_RECEIVE: Problem while reading primitive's header\n");
@@ -1004,10 +956,6 @@ int nas_mesh_GC_receive(struct nas_priv *gpriv)
     // start decoding message
     switch (p->type) {
     case INFO_BROADCAST_IND :
-#ifdef PDCP_USE_NETLINK
-#else
-      //    bytes_read += rtf_get(gpriv->sap[NAS_GC_SAPI], (uint8_t *)p+p->length, p->nasUEGCPrimitive.broadcast_ind.nasDataLength);
-#endif
       if (bytes_read!=p->length+p->nasUEGCPrimitive.broadcast_ind.nasDataLength) {
         printk("NAS_MESH_GC_RECEIVE: INFO_BROADCAST_IND reception, Problem while reading primitive's data\n");
         return bytes_read;

openair2/NETWORK_DRIVER/MESH/proto_extern.h

@@ -110,14 +110,6 @@ void nas_COMMON_del_send(struct sk_buff *skb,
                          struct cx_entity *cx,
                          struct classifier_entity *gc,int inst, struct nas_priv *gpriv);
 
-#ifndef PDCP_USE_NETLINK
-/**
-\fn void nas_COMMON_QOS_receive()
-\brief Retrieve PDU from PDCP for connection
- */
-void nas_COMMON_QOS_receive(void);
-#endif //PDCP_USE_NETLINK
-
 /**
 \fn struct rb_entity *nas_COMMON_add_rb(struct cx_entity *cx, nasRadioBearerId_t rabi, nasQoSTrafficClass_t qos)
 \brief Add a radio-bearer descriptor
@@ -168,7 +160,6 @@ struct classifier_entity
  */
 void nas_COMMON_flush_rb(struct cx_entity *cx);
 
-#ifdef PDCP_USE_NETLINK
 /**
 \fn int nas_netlink_send(unsigned char *data,unsigned int len)
 \brief Request the transfer of data by PDCP via netlink socket
@@ -185,7 +176,6 @@ int nas_netlink_send(unsigned char *data,unsigned int len);
  */
 void nas_COMMON_QOS_receive(struct nlmsghdr *nlh);
 
-#endif //PDCP_USE_NETLINK
 //nasmesh.c
 
 /**
@@ -305,13 +295,10 @@ void nas_tool_print_buffer(char * buffer,int length);
 void nas_print_rb_entity(struct rb_entity *rb);
 void nas_print_classifier(struct classifier_entity *gc);
 
-#ifdef PDCP_USE_NETLINK
 // nas_netlink.c
 
 void nas_netlink_release(void);
 int nas_netlink_init(void);
 
-#endif
-
 /** @} */
 #endif

openair2/RRC/LITE/rrc_common.c

@@ -97,35 +97,6 @@ rrc_init_global_param(
 //-----------------------------------------------------------------------------
 {
 
-  //#ifdef USER_MODE
-  //  Rrc_xface = (RRC_XFACE*)malloc16(sizeof(RRC_XFACE));
-  //#endif //USRE_MODE
-
-  //  Rrc_xface->openair_rrc_top_init = openair_rrc_top_init;
-  //  Rrc_xface->openair_rrc_eNB_init = openair_rrc_eNB_init;
-  //  Rrc_xface->openair_rrc_UE_init  = openair_rrc_ue_init;
-  //  Rrc_xface->mac_rrc_data_ind     = mac_rrc_data_ind;
-  //Rrc_xface->mac_rrc_data_req     = mac_rrc_data_req;
-  // Rrc_xface->rrc_data_indP        = (void *)rlcrrc_data_ind;
-  //  Rrc_xface->rrc_rx_tx            = rrc_rx_tx;
-  //  Rrc_xface->mac_rrc_meas_ind     = mac_rrc_meas_ind;
-  //  Rrc_xface->get_rrc_status       = get_rrc_status;
-
-  //Rrc_xface->rrc_get_status = ...
-
-  //  Mac_rlc_xface->mac_out_of_sync_ind=mac_out_of_sync_ind;
-
-#ifndef NO_RRM
-  //  Rrc_xface->fn_rrc=fn_rrc;
-#endif
-  //  LOG_D(RRC, "[RRC]INIT_GLOBAL_PARAM: Mac_rlc_xface %p, rrc_rlc_register %p,rlcrrc_data_ind%p\n",Mac_rlc_xface,Mac_rlc_xface->rrc_rlc_register_rrc,rlcrrc_data_ind);
-  /*
-   if((Mac_rlc_xface==NULL) || (Mac_rlc_xface->rrc_rlc_register_rrc==NULL) ||
-   (rlcrrc_data_ind==NULL)) {
-   LOG_E(RRC,"Data structured is not initialized \n");
-   return -1;
-   }
-   */
   rrc_rlc_register_rrc (rrc_data_ind, NULL); //register with rlc
 
   DCCH_LCHAN_DESC.transport_block_size = 4;

openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.h

@@ -28,7 +28,6 @@
 * \email: raymond.knopp@eurecom.fr ,navid.nikaein@eurecom.fr, michele.paffetti@studio.unibo.it
 */
 
-#ifdef USER_MODE
 #include <stdio.h>
 #include <sys/types.h>
 #include <stdlib.h> /* for atoi(3) */
@@ -36,9 +35,6 @@
 #include <string.h> /* for strerror(3) */
 #include <sysexits.h> /* for EX_* exit codes */
 #include <errno.h>  /* for errno */
-#else
-#include <linux/module.h>  /* Needed by all modules */
-#endif
 
 #include <asn_application.h>
 #include <asn_internal.h> /* for _ASN_DEFAULT_STACK_MAX */

openair2/RRC/LTE/rrc_UE.c

@@ -393,15 +393,7 @@ char openair_rrc_ue_init( const module_id_t ue_mod_idP, const unsigned char eNB_
   init_SI_UE(&ctxt,eNB_index);
   LOG_D(RRC,PROTOCOL_RRC_CTXT_FMT"  INIT: phy_sync_2_ch_ind\n",
         PROTOCOL_RRC_CTXT_ARGS(&ctxt));
-#ifndef NO_RRM
-  send_msg(&S_rrc,msg_rrc_phy_synch_to_CH_ind(ctxt.module_id,eNB_index,UE_rrc_inst[ctxt.module_id].Mac_id));
-#endif
-#ifndef NO_RRM
-  send_msg(&S_rrc,msg_rrc_phy_synch_to_CH_ind(ctxt.module_id,eNB_index,UE_rrc_inst[ctxt.module_id].Mac_id));
-#endif
-#ifdef NO_RRM //init ch SRB0, SRB1 & BDTCH
   openair_rrc_on_ue(&ctxt);
-#endif
   return 0;
 }
 
@@ -2249,9 +2241,6 @@ rrc_ue_decode_dcch(
     }
   }
 
-#ifndef NO_RRM
-  send_msg(&S_rrc,msg_rrc_end_scan_req(ctxt_pP->module_id,eNB_indexP));
-#endif
 }
 
 const char siWindowLength[9][5] = {"1ms","2ms","5ms","10ms","15ms","20ms","40ms","80ms","ERR"};
@@ -2530,14 +2519,6 @@ int decode_BCCH_MBMS_DLSCH_Message(
         break;
     }
   }*/
-  /*if ((rrc_get_sub_state(ctxt_pP->module_id) == RRC_SUB_STATE_IDLE_SIB_COMPLETE)
-  #if defined(ENABLE_USE_MME)
-      && (UE_rrc_inst[ctxt_pP->module_id].initialNasMsg.data != NULL)
-  #endif
-     ) {
-    rrc_ue_generate_RRCConnectionRequest(ctxt_pP, 0);
-    rrc_set_sub_state( ctxt_pP->module_id, RRC_SUB_STATE_IDLE_CONNECTING );
-  }*/
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_UE_DECODE_BCCH, VCD_FUNCTION_OUT );
   return 0;
 }

openair2/RRC/LTE/rrc_defs.h

@@ -173,13 +173,6 @@ extern pthread_mutex_t slrb_mutex;
 //the thread function
 void *send_UE_status_notification(void *);
 
-
-
-//#include "COMMON/openair_defs.h"
-#ifndef USER_MODE
-  //#include <rtai.h>
-#endif
-
 #include "LTE_SystemInformationBlockType1.h"
 #include "LTE_SystemInformation.h"
 #include "LTE_RRCConnectionReconfiguration.h"
@@ -217,12 +210,6 @@ void *send_UE_status_notification(void *);
 #define NB_SIG_CNX_UE 2 //MAX_MANAGED_RG_PER_MOBILE
 #define NB_CNX_UE 2//MAX_MANAGED_RG_PER_MOBILE
 
-#ifndef NO_RRM
-  #include "L3_rrc_interface.h"
-  #include "rrc_rrm_msg.h"
-  #include "rrc_rrm_interface.h"
-#endif
-
 
 #include "intertask_interface.h"
 

openair2/RRC/LTE/rrc_eNB.c

@@ -7287,9 +7287,6 @@ rrc_eNB_decode_ccch(
                 PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
                 rrcConnectionReestablishmentRequest->ue_Identity.physCellId,
                 ue_context_p->ue_context.reestablishment_cause);
-#ifndef NO_RRM
-          send_msg(&S_rrc, msg_rrc_MR_attach_ind(ctxt_pP->module_id, Mac_id));
-#else
           ue_context_p->ue_context.primaryCC_id = CC_id;
           //LG COMMENT Idx = (ue_mod_idP * NB_RB_MAX) + DCCH;
           Idx = DCCH;
@@ -7343,7 +7340,6 @@ rrc_eNB_decode_ccch(
                                    );
           }
 
-#endif //NO_RRM
         }
         break;
 
@@ -7532,9 +7528,6 @@ rrc_eNB_decode_ccch(
           }
         }
 
-#ifndef NO_RRM
-        send_msg(&S_rrc, msg_rrc_MR_attach_ind(ctxt_pP->module_id, Mac_id));
-#else
         ue_context_p->ue_context.primaryCC_id = CC_id;
         //LG COMMENT Idx = (ue_mod_idP * NB_RB_MAX) + DCCH;
         Idx = DCCH;
@@ -7587,7 +7580,6 @@ rrc_eNB_decode_ccch(
                                  );
         }
 
-#endif //NO_RRM
         break;
 
       default:

openair2/RRC/LTE/rrc_rrm_interface.c

-/*
- * 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
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*!
-*******************************************************************************
-
-\file     rrm_sock.c
-
-\brief    RRM (Radio Ressource Manager ) Socket: communication withe other medium:
-          - RRC ,
-          - CMM ,
-          - PUSU
-
-\author   BURLOT Pascal
-
-\date     10/07/08
-
-
-\par     Historique:
-        P.BURLOT 2009-01-20
-            + send a message via fifo:
-                - sending header
-                - and data if any
-
-*******************************************************************************
-*/
-
-#ifndef RRC_RRM_FIFOS_XFACE
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <errno.h>
-  #include <string.h>
-  #include <unistd.h>
-
-  #include <sys/socket.h>
-  #include <sys/un.h>
-
-#else
-
-  #include<rtai_fifos.h>
-
-#endif
-
-#include "rrc_rrm_interface.h"
-#include "defs.h"
-//! \brief  Taille maximale de la charge utile
-#define SIZE_MAX_PAYLOAD  2048
-//! \brief PID de l'espace utilisateur (Netlink mode)
-//#define PID_USERSPACE   0xAA
-
-
-
-
-
-#ifndef RRC_RRM_FIFOS_XFACE
-
-/*!
-*******************************************************************************
-\brief  This function opens a unix socket for the rrm communication
-\return  The return value is a socket handle
-*/
-int open_socket(
-  sock_rrm_t *s,    ///< socket descriptor
-  char *path_local,   ///< local socket path if unix socket
-  char *path_dest,    ///< host  Socket path if unix socket
-  int rrm_inst        ///< instance of the rrm entity
-) {
-  /* Unix socket */
-  int   socket_fd ;
-  int   len ;
-
-  if ((socket_fd = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1) {
-    perror("unix socket");
-    return -1 ;
-  }
-
-  memset(&(s->un_local_addr), 0, sizeof(struct  sockaddr_un));
-  s->un_local_addr.sun_family = AF_UNIX;
-  sprintf(s->un_local_addr.sun_path,"%s%d", path_local, rrm_inst );
-  unlink(s->un_local_addr.sun_path);
-  msg("local %s\n",s->un_local_addr.sun_path);
-  len = strlen((s->un_local_addr).sun_path) + sizeof((s->un_local_addr).sun_family);
-
-  if (bind(socket_fd, (struct sockaddr *)&(s->un_local_addr), len) == -1) {
-    perror("bind");
-    return -1 ;
-  }
-
-  memset(&(s->un_dest_addr), 0, sizeof(struct   sockaddr_un));
-  s->un_dest_addr.sun_family = AF_UNIX;
-  sprintf(s->un_dest_addr.sun_path,"%s%d", path_dest, rrm_inst );
-  msg("Dest %s\n",s->un_dest_addr.sun_path);
-  s->s = socket_fd ;
-  return socket_fd ;
-}
-/*!
-*******************************************************************************
-\brief  This function closes a RRM socket
-\return none
-*/
-void close_socket(
-  sock_rrm_t *sock  ///< the socket handle
-) {
-  shutdown(sock->s, SHUT_RDWR);
-  close(sock->s);
-}
-
-/*!
-*******************************************************************************
-\brief  This function send a buffer message to the unix socket
-\return if OK then "0" is returned else "-1"
-*/
-char BUFF[2048];
-int send_msg_sock(
-  sock_rrm_t *s,   ///< socket descriptor
-  msg_t *smsg       ///< the message to send
-) {
-  /* Unix socket */
-  int         ret   = 0 ;
-  //  char        *buf    = NULL;
-  struct  msghdr    msghd ;
-  struct  iovec     iov;
-  int         taille  = sizeof(msg_head_t)  ;
-
-  if ( smsg == NULL ) {
-    return -1 ;
-  }
-
-  if ( smsg->data != NULL ) {
-    taille += smsg->head.size ;
-  }
-
-  //buf = RRM_MALLOC(char, taille);
-  //if (buf ==NULL)
-  //return -1 ;
-  memcpy( BUFF, &(smsg->head), sizeof(msg_head_t) ) ;
-  memcpy( BUFF+sizeof(msg_head_t), smsg->data, smsg->head.size ) ;
-  iov.iov_base    = (void *)BUFF;
-  iov.iov_len     = taille ;
-  msghd.msg_name        = (void *)&(s->un_dest_addr);
-  msghd.msg_namelen     = sizeof(s->un_dest_addr);
-  msghd.msg_iov         = &iov;
-  msghd.msg_iovlen      = 1;
-  msghd.msg_control     = NULL ;
-  msghd.msg_controllen  =   0 ;
-
-  if ( sendmsg(s->s, &msghd, 0) < 0 ) {
-    ret = -1;
-    msg("socket %d, dest %s\n",s->s,s->un_dest_addr.sun_path);
-    perror("sendmsg:unix socket");
-  }
-
-  //RRM_FREE(buf) ;
-  //RRM_FREE(msg->data) ;
-  //RRM_FREE(msg) ;
-  return ret ;
-}
-
-/*!
-*******************************************************************************
-\brief  This function read a buffer from a unix socket
-\return the function returns a message pointer. If the pointeur is NULL, a error
-        is happened.
-*/
-char *recv_msg(
-  sock_rrm_t *s   ///< socket descriptor
-) {
-  /* Unix socket */
-  char        *buf = NULL;
-  char        *smsg = NULL;
-  struct  msghdr    msghd ;
-  struct  iovec     iov;
-  int         size_msg ;
-  msg_head_t      *head  ;
-  int         ret ;
-  int taille =  SIZE_MAX_PAYLOAD ;
-  buf         = RRM_CALLOC( char,taille);
-
-  if ( buf == NULL ) {
-    return NULL ;
-  }
-
-  iov.iov_base      = (void *)buf;
-  iov.iov_len       = taille ;
-  msghd.msg_name      = (void *)&(s->un_dest_addr);
-  msghd.msg_namelen   = sizeof(s->un_dest_addr);
-  msghd.msg_iov       = &iov;
-  msghd.msg_iovlen    = 1;
-  msghd.msg_control   = NULL ;
-  msghd.msg_controllen= 0 ;
-  ret = recvmsg(s->s, &msghd, 0 ) ;
-
-  if ( ret <= 0  ) {
-    // non-blocking socket
-    // perror("PB recvmsg_un");
-    RRM_FREE(buf);
-    return NULL ;
-  }
-
-  if (msghd.msg_flags != 0 ) {
-    fprintf(stderr,"error recvmsg_un: 0x%02x\n", msghd.msg_flags) ;
-    RRM_FREE(buf);
-    return NULL ;
-  }
-
-  head    = (msg_head_t *) buf  ;
-  size_msg  = sizeof(msg_head_t) + head->size ;
-  smsg    = RRM_CALLOC(char, size_msg ) ;
-
-  if ( smsg != NULL ) {
-    memcpy( smsg, buf, size_msg ) ;
-  }
-
-  RRM_FREE( buf ) ;
-  return smsg ;
-}
-
-#else  //XFACE
-
-int send_msg_fifo(int *s, msg_t *fmsg) {
-  int   ret   = 0, ret1;
-  int  taille = sizeof(msg_head_t)  ;
-  msg("write on fifos %d, msg %p\n",*s,fmsg);
-
-  if ( fmsg == NULL ) {
-    return -1 ;
-  }
-
-  // envoi le header
-  ret1 = rtf_put (*s,(char *) &(fmsg->head), taille);
-
-  if(ret1 <0) {
-    msg("rtf_put H ERR %d\n",ret1);
-    rtf_reset(*s);
-    return ret1;
-  }
-
-  ret=ret1;
-
-  // envoi les datas si elles sont definis
-  if ( fmsg->data != NULL ) {
-    ret1 += rtf_put (*s,(char *) fmsg->data, fmsg->head.size);
-
-    if(ret1 <0) {
-      msg("rtf_put D ERR %d\n",ret1);
-      rtf_reset(*s);
-      return ret1;
-    }
-  }
-
-  ret+=ret1;
-  return ret;
-}
-
-#endif //XFACE
-
-int send_msg(void *s, msg_t *smsg) {
-  send_msg_sock((sock_rrm_t *)s, smsg);
-}

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -133,18 +133,6 @@
 
 #include "common/ran_context.h"
 
-//#include "PHY/defs.h"
-/*#ifndef USER_MODE
-#define msg printk
-#ifndef errno
-int errno;
-#endif
-#else
-# if !defined (msg)
-#   define msg printf
-# endif
-#endif*/
-
 //#define XER_PRINT
 
 typedef struct xer_sprint_string_s {

openair2/RRC/NR/rrc_gNB.c

@@ -3305,57 +3305,6 @@ void *rrc_gnb_task(void *args_p) {
       case GTPV1U_GNB_DELETE_TUNNEL_RESP:
         break;
 
-      /*
-      #if defined(ENABLE_USE_MME)
-
-            // Messages from S1AP
-          case S1AP_DOWNLINK_NAS:
-            rrc_eNB_process_S1AP_DOWNLINK_NAS(msg_p, msg_name_p, instance, &rrc_gNB_mui);
-            break;
-
-          case S1AP_INITIAL_CONTEXT_SETUP_REQ:
-            rrc_eNB_process_S1AP_INITIAL_CONTEXT_SETUP_REQ(msg_p, msg_name_p, instance);
-            break;
-
-          case S1AP_UE_CTXT_MODIFICATION_REQ:
-            rrc_eNB_process_S1AP_UE_CTXT_MODIFICATION_REQ(msg_p, msg_name_p, instance);
-            break;
-
-          case S1AP_PAGING_IND:
-            LOG_D(RRC, "[eNB %d] Received Paging message from S1AP: %s\n", instance, msg_name_p);
-            rrc_eNB_process_PAGING_IND(msg_p, msg_name_p, instance);
-            break;
-
-          case S1AP_E_RAB_SETUP_REQ:
-            rrc_eNB_process_S1AP_E_RAB_SETUP_REQ(msg_p, msg_name_p, instance);
-            LOG_D(RRC, "[eNB %d] Received the message %s\n", instance, msg_name_p);
-            break;
-
-          case S1AP_E_RAB_MODIFY_REQ:
-            rrc_eNB_process_S1AP_E_RAB_MODIFY_REQ(msg_p, msg_name_p, instance);
-            break;
-
-          case S1AP_E_RAB_RELEASE_COMMAND:
-            rrc_eNB_process_S1AP_E_RAB_RELEASE_COMMAND(msg_p, msg_name_p, instance);
-            break;
-
-          case S1AP_UE_CONTEXT_RELEASE_REQ:
-            rrc_eNB_process_S1AP_UE_CONTEXT_RELEASE_REQ(msg_p, msg_name_p, instance);
-            break;
-
-          case S1AP_UE_CONTEXT_RELEASE_COMMAND:
-            rrc_eNB_process_S1AP_UE_CONTEXT_RELEASE_COMMAND(msg_p, msg_name_p, instance);
-            break;
-
-          case GTPV1U_ENB_DELETE_TUNNEL_RESP:
-            ///Nothing to do. Apparently everything is done in S1AP processing
-            //LOG_I(RRC, "[eNB %d] Received message %s, not processed because procedure not synched\n",
-            //instance, msg_name_p);
-            AssertFatal(false, "Removed double mechanism for same feature: now delete_tunnel() function should be called\n");
-            break;
-
-      #endif
-      */
       /* Messages from gNB app */
       case NRRRC_CONFIGURATION_REQ:
         LOG_I(NR_RRC, "[gNB %ld] Received %s : %p\n", instance, msg_name_p,&NRRRC_CONFIGURATION_REQ(msg_p));

openair2/RRC/NR_UE/rrc_list.h

@@ -111,4 +111,4 @@
 #define RRC_LIST_ENTRY(list, i)         \
         list.entries[i]
 
-#endif
\ No newline at end of file
+#endif

openair2/SIMULATION/NR_RRC/itti_sim.c

@@ -60,10 +60,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"
 
-#ifndef OPENAIR2
-  #include "UTIL/OTG/otg_vars.h"
-#endif
-
 #include "intertask_interface.h"
 
 

openair2/UTIL/OMG/makefile_old

-include $(OPENAIR_TARGETS)/Makefile.common
-ifdef TEST_OMG
-
-CC= gcc
-
-OBJstatic = OMG.c common.c static.c
-OBJrwp = OMG.c common.c job.c rwp.c
-OBJrwalk = OMG.c common.c job.c rwalk.c
-OBJtrace = OMG.c common.c job.c trace.c mobility_parser.c hashtable.c
-OBJsumo = OMG.c common.c sumo.c client_traci_OMG.c socket_traci_OMG.c storage_traci_OMG.c id_manager.c
-
-OBJ = OMG.c common.c static.c job.c rwp.c rwalk.c trace.c sumo.c mobility_parser.c hashtable.c client_traci_OMG.c socket_traci_OMG.c storage_traci_OMG.c id_manager.c
-
-CFLAGS += -m32 -DTEST_OMG
-
-.PHONY: help staticOMG rwpOMG clean
-
-help:
-	@echo '  "make staticOMG" to compile the STATIC version'
-	@echo '  "make rwpOMG" to compile the RWP version'
-	@echo '  "make rwalkOMG" to compile the RWALK version'
-	@echo '  "make traceOMG" to compile the TRACE version'
-	@echo '  "make sumoOMG" to compile the SUMO version'
-	@echo '  "make clean" to remove the generated files and restore the original distribution'
-	@echo '  "make OMG" to compile the complete version'
-
-
-staticOMG:	${OBJstatic} 
-	${CC} ${OBJstatic} -o staticOMG $(CFLAGS)
-
-	
-rwpOMG:	${OBJrwp} 
-	${CC} ${OBJrwp} -lm -o rwpOMG $(CFLAGS)
-	@#-lm: used to link to math lib
-	 
-traceOMG:${OBJtrace} 
-	${CC} ${OBJtrace} -lm -o traceOMG $(CFLAGS)
-
-rwalkOMG:	${OBJrwalk} 
-	${CC} ${OBJrwalk} -lm -o rwalkOMG $(CFLAGS)
-
-sumoOMG:	${OBJsumo} 
-	${CC} ${OBJsumo} -lm -o rwalkOMG $(CFLAGS)
-
-OMG:	${OBJ} 
-	${CC} ${OBJ} -lm -o OMG $(CFLAGS)
-
-clean:
-	@echo "Cleaning"
-	@rm OMG
-	@#rm rwpOMG
-	@#rm rwalkOMG
-	@#rm traceOMG
-	@#rm staticOMG
-        @#rm OMG
-	
-else
-
-TOP_DIR      = ../..
-OPENAIR1_TOP = ../..
-OPENAIR2_TOP = ../../../openair2
-OPENAIR3_TOP = ../../../openair3
-OPENAIR3     = $(OPENAIR3_DIR)
-
-CFLAGS += -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
-
-
-CFLAGS += -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE 
-
-#CFLAGS += -DXFORMS
-
-ifdef DEBUG_PHY
-CFLAGS += -DDEBUG_PHY
-endif
-
-ifdef PDCP_USE_NETLINK
-CFLAGS += -DPDCP_USE_NETLINK -DLINUX -DDEBUG_CONTROL
-endif
-
-include $(OPENAIR1_DIR)/PHY/Makefile.inc
-include $(OPENAIR1_DIR)/SCHED/Makefile.inc
-include $(OPENAIR2_DIR)/LAYER2/Makefile.inc
-include $(OPENAIR1_DIR)/SIMULATION/ETH_TRANSPORT/Makefile.inc
-
-SIMULATION_OBJS  = $(TOP_DIR)/SIMULATION/TOOLS/gauss.o  
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/random_channel.o  
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/rangen_double.o  
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/taus.o  
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/TOOLS/multipath_channel.o
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/RF/rf.o
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/RF/adc.o
-SIMULATION_OBJS += $(TOP_DIR)/SIMULATION/RF/dac.o
-
-OBJ = $(PHY_OBJS) $(SIMULATION_OBJS) $(ETHERNET_TRANSPORT_OBJS) $(TOOLS_OBJS) $(SCHED_OBJS) $(STATS_OBJS)
-
-all: physim
-
-
-$(OBJ) : %.o : %.c
-	$(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DPHY_CONTEXT=1 -I$(TOP_DIR) $(L2_incl) -o $@ $<
-
-$(L2_OBJS) : %.o : %.c
-	$(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 -I$(TOP_DIR) $(L2_incl) -o $@ $<
-
-physim : $(OBJ) $(L2_OBJS) OMG.c common.c static.c job.c rwp.c rwalk.c hashtable.c mobility_parser.c trace.c -I$(TOP_DIR) $(L2_incl) -o physim $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(L2_OBJS) -lm -lforms -L/usr/local/lib -lforms -lX11 -L/usr/X11R6/lib -lXpm -lblas -lpthread
-
-clean:
-	rm -f physim
-	rm -f $(OBJ)
-	rm -f $(L2_OBJS)
-	rm -f *.o
-	rm -f *.exe*
-
-cleanl1:
-	rm -f physim
-	rm -f $(OBJ)
-	rm -f *.o
-	rm -f *.exe
-cleanl2:
-	rm -f $(L2_OBJS)
-
-endif
-

openair2/UTIL/OTG/otg_kpi.c

@@ -37,8 +37,8 @@ unsigned int start_log_GP=0;
 unsigned int start_log_GP_bg=0;
 unsigned int start_log_jitter=0;
 
-#include"otg_kpi.h"
-#include"otg_externs.h"
+#include "otg_kpi.h"
+#include "otg_externs.h"
 
 extern unsigned char NB_eNB_INST;
 extern uint16_t NB_UE_INST;

openair2/UTIL/OTG/otg_rx_socket.h

@@ -32,7 +32,7 @@
 #ifndef __OTG_RX_SOCKET_H__
 #define __OTG_RX_SOCKET_H__
 
-#include"otg.h"
+#include "otg.h"
 
 
 //-----------------------begin func proto-------------------

openair2/UTIL/OTG/otg_tx_socket.c

@@ -30,7 +30,7 @@
 * \warning
 */
 
-#include"otg_tx_socket.h"
+#include "otg_tx_socket.h"
 #include "otg_vars.h"
 
 

openair2/UTIL/OTG/otg_tx_socket.h

@@ -37,8 +37,8 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include"otg.h"
-#include"otg_tx.h"
+#include "otg.h"
+#include "otg_tx.h"
 
 
 //-----------------------begin func proto-------------------

openair3/GTPV1-U/gtpv1u_eNB_defs.h

@@ -111,14 +111,6 @@ typedef struct gtpv1u_data_s {
   uint16_t              seq_num;
   uint8_t               restart_counter;
 
-#ifdef GTPU_IN_KERNEL
-  char                 *interface_name;
-  int                   interface_index;
-
-  struct iovec         *malloc_ring;
-  void                 *sock_mmap_ring[16];
-  int                   sock_desc[16]; // indexed by marking
-#endif
 } gtpv1u_data_t;
 
 int

openair3/GTPV1-U/gtpv1u_gNB_defs.h

@@ -102,14 +102,6 @@ typedef struct nr_gtpv1u_data_s {
   uint16_t              seq_num;
   uint8_t               restart_counter;
 
-#ifdef GTPU_IN_KERNEL
-  char                 *interface_name;
-  int                   interface_index;
-
-  struct iovec         *malloc_ring;
-  void                 *sock_mmap_ring[16];
-  int                   sock_desc[16]; // indexed by marking
-#endif
 } nr_gtpv1u_data_t;
 
 

targets/ARCH/COMMON/common_lib.h

@@ -57,9 +57,7 @@
 #define RAU_REMOTE_THIRDPARTY_RADIO_HEAD 2
 #define MAX_WRITE_THREAD_PACKAGE     10
 #define MAX_WRITE_THREAD_BUFFER_SIZE 8
-#ifndef MAX_CARDS
-  #define MAX_CARDS 8
-#endif
+#define MAX_CARDS 8
 
 typedef int64_t openair0_timestamp;
 typedef volatile int64_t openair0_vtimestamp;

targets/COMMON/create_tasks.c

@@ -25,7 +25,6 @@
 # include "targets/RT/USER/lte-softmodem.h"
 # include "common/ran_context.h"
 
-#ifdef OPENAIR2
   #include "sctp_eNB_task.h"
   #include "x2ap_eNB.h"
   #include "s1ap_eNB.h"
@@ -36,7 +35,6 @@
     #include "lteRALenb.h"
   #endif
   #include "RRC/LTE/rrc_defs.h"
-#endif
 # include "f1ap_cu_task.h"
 # include "f1ap_du_task.h"
 # include "enb_app.h"

targets/COMMON/create_tasks_mbms.c

@@ -25,7 +25,6 @@
 # include "targets/RT/USER/lte-softmodem.h"
 # include "common/ran_context.h"
 
-#ifdef OPENAIR2
     #include "sctp_eNB_task.h"
     #include "x2ap_eNB.h"
     #include "s1ap_eNB.h"
@@ -40,7 +39,6 @@
     #include "lteRALenb.h"
   #endif
   #include "RRC/LTE/rrc_defs.h"
-#endif
 # include "f1ap_cu_task.h"
 # include "f1ap_du_task.h"
 # include "enb_app.h"

targets/COMMON/create_tasks_ue.c

@@ -23,7 +23,6 @@
 # include "create_tasks.h"
 # include "common/utils/LOG/log.h"
 
-#ifdef OPENAIR2
   #include "sctp_eNB_task.h"
   #include "s1ap_eNB.h"
   #include "openair3/NAS/UE/nas_ue_task.h"
@@ -34,7 +33,6 @@
     #include "lteRALenb.h"
   #endif
   #include "RRC/LTE/rrc_defs.h"
-#endif
 # include "enb_app.h"
 
 int create_tasks_ue(uint32_t ue_nb) {

targets/RT/USER/lte-enb.c

@@ -88,10 +88,6 @@
 #include "enb_config.h"
 #include "targets/RT/USER/lte-softmodem.h"
 
-#ifndef OPENAIR2
-  #include "UTIL/OTG/otg_extern.h"
-#endif
-
 #include "s1ap_eNB.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
 

targets/RT/USER/lte-softmodem.c

@@ -82,10 +82,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "enb_config.h"
 //#include "PHY/TOOLS/time_meas.h"
 
-#ifndef OPENAIR2
-  #include "UTIL/OTG/otg_vars.h"
-#endif
-
 
 #include "create_tasks.h"
 

targets/RT/USER/lte-ue.c

@@ -2067,7 +2067,6 @@ void init_UE_threads_stub(int inst)
 }
 
 
-#ifdef OPENAIR2
 void fill_ue_band_info(void)
 {
   LTE_UE_EUTRA_Capability_t *UE_EUTRA_Capability = UE_rrc_inst[0].UECap->UE_EUTRA_Capability;
@@ -2092,7 +2091,6 @@ void fill_ue_band_info(void)
       }
   }
 }
-#endif
 
 int setup_ue_buffers(PHY_VARS_UE **phy_vars_ue,
                      openair0_config_t *openair0_cfg)

targets/RT/USER/lte-uesoftmodem.c

@@ -75,10 +75,6 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"
 
-#ifndef OPENAIR2
-  #include "UTIL/OTG/otg_vars.h"
-#endif
-
 #include "create_tasks.h"
 #include "system.h"