move definitions from defs_nr_UE.h back to nr-ue.c to fix compilation of LTE UE

executables/nr-ue.c

@@ -85,6 +85,18 @@
  *
  */
 
+#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
+
+typedef enum {
+  pss = 0,
+  pbch = 1,
+  si = 2
+} sync_mode_t;
+
 void init_nr_ue_vars(PHY_VARS_NR_UE *ue,
                      uint8_t UE_id,
                      uint8_t abstraction_flag)
@@ -117,6 +129,11 @@ void init_nr_ue_vars(PHY_VARS_NR_UE *ue,
  * \param arg is a pointer to a \ref PHY_VARS_NR_UE structure.
  */
 
+typedef struct syncData_s {
+  UE_nr_rxtx_proc_t proc;
+  PHY_VARS_NR_UE *UE;
+} syncData_t;
+
 static void UE_synch(void *arg) {
   syncData_t *syncD=(syncData_t *) arg;
   int i, hw_slot_offset;

openair1/PHY/defs_nr_UE.h

@@ -115,14 +115,6 @@
 #include <pthread.h>
 #include "targets/ARCH/COMMON/common_lib.h"
 
-#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
-
-#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
-
 /// Context data structure for gNB subframe processing
 typedef struct {
   /// Component Carrier index
@@ -1090,16 +1082,5 @@ typedef struct nr_rxtx_thread_data_s {
   PHY_VARS_NR_UE    *UE;
 }  nr_rxtx_thread_data_t;
 
-typedef struct syncData_s {
-  UE_nr_rxtx_proc_t proc;
-  PHY_VARS_NR_UE *UE;
-} syncData_t;
-
-typedef enum {
-  pss = 0,
-  pbch = 1,
-  si = 2
-} sync_mode_t;
-
 #include "SIMULATION/ETH_TRANSPORT/defs.h"
 #endif

openair1/PHY/defs_nr_common.h

@@ -232,7 +232,7 @@ typedef struct {
   ///
   uint8_t RA_SCALING_FACTOR_BI;
   /// Indicating whether it is 2-step or 4-step RA
-  uint8_t RA_TYPE;
+  nr_ra_type_e RA_TYPE;
   /// UE configured maximum output power
   int RA_PCMAX;
   /// Corresponding RA-RNTI for UL-grant