Merge branch 'RU-RAU-split' of http://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split

openair2/COMMON/platform_types.h

@@ -217,6 +217,9 @@ typedef struct protocol_ctxt_s {
   sub_frame_t subframe;      /*!< \brief  LTE sub frame number.*/
   eNB_index_t eNB_index;     /*!< \brief  valid for UE indicating the index of connected eNB(s)      */
   boolean_t   configured;  /*!< \brief  flag indicating whether the instance is configured or not  */
+#ifdef Rel14
+  boolean_t		brOption;
+#endif
 } protocol_ctxt_t;
 // warning time hardcoded
 #define PROTOCOL_CTXT_TIME_MILLI_SECONDS(CtXt_h) ((CtXt_h)->frame*10+(CtXt_h)->subframe)

openair2/LAYER2/MAC/config.c

@@ -417,7 +417,12 @@ void config_sib2(int Mod_idP,
 void config_dedicated(int Mod_idP, 
 		      int CC_idP, 
 		      uint16_t rnti, 
-		      struct PhysicalConfigDedicated  *physicalConfigDedicated) {
+		      struct PhysicalConfigDedicated  *physicalConfigDedicated) 
+{
+    eNB_MAC_INST *eNB = RC.mac[Mod_idP];
+
+    int    UE_id = find_UE_id(Mod_idP, rnti);
+    eNB->UE_list.UE_template[CC_idP][UE_id].physicalConfigDedicated = physicalConfigDedicated;
 
 }
 

openair2/LAYER2/MAC/defs.h

@@ -755,8 +755,10 @@ typedef struct {
 
 #ifdef Rel14
   uint8_t rach_resource_type;
-
-
+ uint16_t mpdcch_repetition_cnt;
+  struct PhysicalConfigDedicated  *physicalConfigDedicated;
+  frame_t Msg2_frame;
+  sub_frame_t Msg2_subframe;
 #endif
 
 } UE_TEMPLATE;

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -396,7 +396,11 @@ void rx_sdu(const module_id_t enb_mod_idP,
 			   rx_lengths[i],
 			   ENB_FLAG_YES,
 			   enb_mod_idP,
-			   0);
+                  0
+            #ifdef Rel14
+                  ,(eNB->common_channels[CC_idP].RA_template[ii].rach_resource_type>0)
+            #endif
+                  );
 	  
 	  
           if (num_ce >0) {  // handle msg3 which is not RRCConnectionRequest