commit before merge

openair1/SIMULATION/NR_PHY/nr_unitary_defs.h

@@ -55,10 +55,17 @@ signed char quantize(double D, double x, unsigned char B) {
   return ((char) qxd);
 }
 
-int8_t nr_ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP, uint8_t eNB_id, uint16_t rnti, sub_frame_t subframe) {
-  AssertFatal(1==0,"Shouldn't be here ...\n");
-  return 0;
-}
+int8_t
+mac_rrc_data_req_ue(
+  const module_id_t Mod_idP,
+  const int         CC_id,
+  const frame_t     frameP,
+  const rb_id_t     Srb_id,
+  const uint8_t     Nb_tb,
+  uint8_t    *const buffer_pP,
+  const mac_enb_index_t eNB_indexP,
+  const uint8_t     mbsfn_sync_area
+		    ) { return(0);}
 
 int oai_nfapi_rach_ind(nfapi_rach_indication_t *rach_ind) {return(0);}
 NR_IF_Module_t *NR_IF_Module_init(int Mod_id){return(NULL);}

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -52,7 +52,7 @@
 #include "openair1/SIMULATION/TOOLS/sim.h"
 #include "openair1/SIMULATION/RF/rf.h"
 #include "openair1/SIMULATION/NR_PHY/nr_unitary_defs.h"
-#include "openair1/SIMULATION/NR_PHY/nr_dummy_functions.c"
+//#include "openair1/SIMULATION/NR_PHY/nr_dummy_functions.c"
 #include "LAYER2/NR_MAC_UE/mac_proto.h"
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
 

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -75,7 +75,7 @@ typedef enum {
 } SFN_C_TYPE;
 
 typedef enum {
-  RA_IDLE = 0,
+  RA_UE_IDLE = 0,
   WAIT_RAR = 1,
   WAIT_CONTENTION_RESOLUTION = 2,
   RA_SUCCEEDED = 3

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -81,12 +81,12 @@ typedef enum {
   WAIT_Msg3 = 2,
   Msg4 = 3,
   WAIT_Msg4_ACK = 4
-} RA_state_t;
+} RA_gNB_state_t;
 
 /*! \brief gNB template for the Random access information */
 typedef struct {
   /// Flag to indicate this process is active
-  RA_state_t state;
+  RA_gNB_state_t state;
   /// BWP id of RA process
   int bwp_id;
   /// CORESET0 configured flag