Merge remote-tracking branch 'origin/RA-notation' into develop_integration_w46

openair2/LAYER2/MAC/extern.h

@@ -35,7 +35,7 @@
 
 #ifdef USER_MODE
 //#include "stdio.h"
-#endif //USER_MODE
+#endif				//USER_MODE
 #include "PHY/defs.h"
 #include "defs.h"
 
@@ -56,8 +56,8 @@ extern UE_RRC_INST *UE_rrc_inst;
 extern UE_MAC_INST *UE_mac_inst;
 
 
-extern eNB_ULSCH_INFO eNB_ulsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUMBER_OF_UE_MAX]; // eNBxUE = 8x8
-extern eNB_DLSCH_INFO eNB_dlsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUMBER_OF_UE_MAX]; // eNBxUE = 8x8
+extern eNB_ULSCH_INFO eNB_ulsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUMBER_OF_UE_MAX];	// eNBxUE = 8x8
+extern eNB_DLSCH_INFO eNB_dlsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUMBER_OF_UE_MAX];	// eNBxUE = 8x8
 
 
 
@@ -79,28 +79,26 @@ extern uint32_t RRC_CONNECTION_FLAG;
 
 extern uint8_t rb_table[34];
 
-extern DCI0_5MHz_TDD_1_6_t       UL_alloc_pdu;
+extern DCI0_5MHz_TDD_1_6_t UL_alloc_pdu;
 
-extern DCI1A_5MHz_TDD_1_6_t      RA_alloc_pdu;
-extern DCI1A_5MHz_TDD_1_6_t      DLSCH_alloc_pdu1A;
-extern DCI1A_5MHz_TDD_1_6_t      BCCH_alloc_pdu;
+extern DCI1A_5MHz_TDD_1_6_t RA_alloc_pdu;
+extern DCI1A_5MHz_TDD_1_6_t DLSCH_alloc_pdu1A;
+extern DCI1A_5MHz_TDD_1_6_t BCCH_alloc_pdu;
 
-extern DCI1A_5MHz_TDD_1_6_t      CCCH_alloc_pdu;
-extern DCI1_5MHz_TDD_t           DLSCH_alloc_pdu;
+extern DCI1A_5MHz_TDD_1_6_t CCCH_alloc_pdu;
+extern DCI1_5MHz_TDD_t DLSCH_alloc_pdu;
 
-extern DCI0_5MHz_FDD_t       UL_alloc_pdu_fdd;
+extern DCI0_5MHz_FDD_t UL_alloc_pdu_fdd;
 
-extern DCI1A_5MHz_FDD_t      DLSCH_alloc_pdu1A_fdd;
-extern DCI1A_5MHz_FDD_t      RA_alloc_pdu_fdd;
-extern DCI1A_5MHz_FDD_t      BCCH_alloc_pdu_fdd;
+extern DCI1A_5MHz_FDD_t DLSCH_alloc_pdu1A_fdd;
+extern DCI1A_5MHz_FDD_t RA_alloc_pdu_fdd;
+extern DCI1A_5MHz_FDD_t BCCH_alloc_pdu_fdd;
 
-extern DCI1A_5MHz_FDD_t      CCCH_alloc_pdu_fdd;
-extern DCI1_5MHz_FDD_t       DLSCH_alloc_pdu_fdd;
+extern DCI1A_5MHz_FDD_t CCCH_alloc_pdu_fdd;
+extern DCI1_5MHz_FDD_t DLSCH_alloc_pdu_fdd;
 
 extern DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu1;
 extern DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu2;
 extern DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu1E;
 
-#endif //DEF_H
-
-
+#endif				//DEF_H

openair2/LAYER2/MAC/flexran_agent_mac_proto.h

@@ -17,7 +17,7 @@
  *-------------------------------------------------------------------------------
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
- */ 
+ */
 
 /*! \file flexran_agent_mac_proto.h
  * \brief MAC functions for FlexRAN agent
@@ -39,150 +39,178 @@
 /*
  * slice specific scheduler 
  */
-typedef void (*slice_scheduler)(module_id_t mod_id, 
-				int slice_id, 
-				uint32_t frame, 
-				uint32_t subframe,
-				int *mbsfn_flag,
-				Protocol__FlexranMessage **dl_info);
+typedef void (*slice_scheduler) (module_id_t mod_id,
+				 int slice_id,
+				 uint32_t frame,
+				 uint32_t subframe,
+				 int *mbsfn_flag,
+				 Protocol__FlexranMessage ** dl_info);
 
 
 
 /*
  * top level flexran scheduler used by the eNB scheduler
  */
-void flexran_schedule_ue_spec_default(mid_t mod_id, 
-				      uint32_t frame, 
+void flexran_schedule_ue_spec_default(mid_t mod_id,
+				      uint32_t frame,
 				      uint32_t subframe,
-				      int *mbsfn_flag, 
-				      Protocol__FlexranMessage **dl_info);
+				      int *mbsfn_flag,
+				      Protocol__FlexranMessage ** dl_info);
 /*
  * slice specific scheduler for embb
  */
 void
-flexran_schedule_ue_spec_embb(mid_t   mod_id,
-			      int       slice_id, 
-			      uint32_t      frame,
-			      uint32_t      subframe,
-			      int           *mbsfn_flag,
-			      Protocol__FlexranMessage **dl_info);
+flexran_schedule_ue_spec_embb(mid_t mod_id,
+			      int slice_id,
+			      uint32_t frame,
+			      uint32_t subframe,
+			      int *mbsfn_flag,
+			      Protocol__FlexranMessage ** dl_info);
 /*
  * slice specific scheduler for urllc
  */
 void
-flexran_schedule_ue_spec_urllc(mid_t   mod_id,
-			      int       slice_id, 
-			      uint32_t      frame,
-			      uint32_t      subframe,
-			      int           *mbsfn_flag,
-			      Protocol__FlexranMessage **dl_info);
+flexran_schedule_ue_spec_urllc(mid_t mod_id,
+			       int slice_id,
+			       uint32_t frame,
+			       uint32_t subframe,
+			       int *mbsfn_flag,
+			       Protocol__FlexranMessage ** dl_info);
 
 /*
  * slice specific scheduler for mmtc
  */
 void
-flexran_schedule_ue_spec_mmtc(mid_t   mod_id,
-			      int       slice_id, 
-			      uint32_t      frame,
-			      uint32_t      subframe,
-			      int           *mbsfn_flag,
-			      Protocol__FlexranMessage **dl_info);
+flexran_schedule_ue_spec_mmtc(mid_t mod_id,
+			      int slice_id,
+			      uint32_t frame,
+			      uint32_t subframe,
+			      int *mbsfn_flag,
+			      Protocol__FlexranMessage ** dl_info);
 /*
  * slice specific scheduler for best effort traffic 
  */
 void
-flexran_schedule_ue_spec_be(mid_t   mod_id,
-			    int       slice_id, 
-			    uint32_t      frame,
-			    uint32_t      subframe,
-			    int           *mbsfn_flag,
-			    Protocol__FlexranMessage **dl_info);
+flexran_schedule_ue_spec_be(mid_t mod_id,
+			    int slice_id,
+			    uint32_t frame,
+			    uint32_t subframe,
+			    int *mbsfn_flag,
+			    Protocol__FlexranMessage ** dl_info);
 
 /*
  * common flexran scheduler function
  */
 void
-flexran_schedule_ue_spec_common(mid_t   mod_id,
-				int       slice_id, 
-				uint32_t      frame,
-				uint32_t      subframe,
-				int           *mbsfn_flag,
-				Protocol__FlexranMessage **dl_info);
-
-uint16_t flexran_nb_rbs_allowed_slice(float rb_percentage, 
-				      int total_rbs);
-
-int flexran_slice_member(int UE_id, 
-			 int slice_id);
-
-int flexran_slice_maxmcs(int slice_id) ;
-
-void _store_dlsch_buffer (module_id_t Mod_id,
-			  int         slice_id,
-			  frame_t     frameP,
-			  sub_frame_t subframeP);
-
-
-void _assign_rbs_required (module_id_t Mod_id,
-			   int         slice_id,
-			   frame_t     frameP,
-			   sub_frame_t subframe,
-			   uint16_t    nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-			   uint16_t    nb_rbs_allowed_slice[MAX_NUM_CCs][MAX_NUM_SLICES], 
-			   int         min_rb_unit[MAX_NUM_CCs]);
-
-void _dlsch_scheduler_pre_processor (module_id_t   Mod_id,
-				     int           slice_id,
-				     frame_t       frameP,
-				     sub_frame_t   subframeP,
-				     int           N_RBG[MAX_NUM_CCs],
-				     int           *mbsfn_flag);
-
-void _dlsch_scheduler_pre_processor_reset (int module_idP,
-					   int UE_id,
-					   uint8_t  CC_id,
-					   int frameP,
-					   int subframeP,					  
-					   int N_RBG,
-					   uint16_t nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-					   uint16_t nb_rbs_required_remaining[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-					   uint16_t nb_rbs_allowed_slice[MAX_NUM_CCs][MAX_NUM_SLICES],
-					   unsigned char rballoc_sub[MAX_NUM_CCs][N_RBG_MAX],
-					   unsigned char MIMO_mode_indicator[MAX_NUM_CCs][N_RBG_MAX]);
-
-void _dlsch_scheduler_pre_processor_allocate (module_id_t   Mod_id,
-					      int           UE_id,
-					      uint8_t       CC_id,
-					      int           N_RBG,
-					      int           transmission_mode,
-					      int           min_rb_unit,
-					      uint8_t       N_RB_DL,
-					      uint16_t      nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-					      uint16_t      nb_rbs_required_remaining[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
-					      unsigned char rballoc_sub[MAX_NUM_CCs][N_RBG_MAX],
-					      unsigned char MIMO_mode_indicator[MAX_NUM_CCs][N_RBG_MAX]);
+flexran_schedule_ue_spec_common(mid_t mod_id,
+				int slice_id,
+				uint32_t frame,
+				uint32_t subframe,
+				int *mbsfn_flag,
+				Protocol__FlexranMessage ** dl_info);
+
+uint16_t flexran_nb_rbs_allowed_slice(float rb_percentage, int total_rbs);
+
+int flexran_slice_member(int UE_id, int slice_id);
+
+int flexran_slice_maxmcs(int slice_id);
+
+void _store_dlsch_buffer(module_id_t Mod_id,
+			 int slice_id,
+			 frame_t frameP, sub_frame_t subframeP);
+
+
+void _assign_rbs_required(module_id_t Mod_id,
+			  int slice_id,
+			  frame_t frameP,
+			  sub_frame_t subframe,
+			  uint16_t
+			  nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX],
+			  uint16_t
+			  nb_rbs_allowed_slice[MAX_NUM_CCs]
+			  [MAX_NUM_SLICES], int min_rb_unit[MAX_NUM_CCs]);
+
+void _dlsch_scheduler_pre_processor(module_id_t Mod_id,
+				    int slice_id,
+				    frame_t frameP,
+				    sub_frame_t subframeP,
+				    int N_RBG[MAX_NUM_CCs],
+				    int *mbsfn_flag);
+
+void _dlsch_scheduler_pre_processor_reset(int module_idP,
+					  int UE_id,
+					  uint8_t CC_id,
+					  int frameP,
+					  int subframeP,
+					  int N_RBG,
+					  uint16_t
+					  nb_rbs_required[MAX_NUM_CCs]
+					  [NUMBER_OF_UE_MAX],
+					  uint16_t
+					  nb_rbs_required_remaining
+					  [MAX_NUM_CCs][NUMBER_OF_UE_MAX],
+					  uint16_t
+					  nb_rbs_allowed_slice[MAX_NUM_CCs]
+					  [MAX_NUM_SLICES],
+					  unsigned char
+					  rballoc_sub[MAX_NUM_CCs]
+					  [N_RBG_MAX],
+					  unsigned char
+					  MIMO_mode_indicator[MAX_NUM_CCs]
+					  [N_RBG_MAX]);
+
+void _dlsch_scheduler_pre_processor_allocate(module_id_t Mod_id,
+					     int UE_id,
+					     uint8_t CC_id,
+					     int N_RBG,
+					     int transmission_mode,
+					     int min_rb_unit,
+					     uint8_t N_RB_DL,
+					     uint16_t
+					     nb_rbs_required[MAX_NUM_CCs]
+					     [NUMBER_OF_UE_MAX],
+					     uint16_t
+					     nb_rbs_required_remaining
+					     [MAX_NUM_CCs]
+					     [NUMBER_OF_UE_MAX],
+					     unsigned char
+					     rballoc_sub[MAX_NUM_CCs]
+					     [N_RBG_MAX],
+					     unsigned char
+					     MIMO_mode_indicator
+					     [MAX_NUM_CCs][N_RBG_MAX]);
 
 /*
  * Default scheduler used by the eNB agent
  */
-void flexran_schedule_ue_spec_default(mid_t mod_id, uint32_t frame, uint32_t subframe,
-				      int *mbsfn_flag, Protocol__FlexranMessage **dl_info);
+void flexran_schedule_ue_spec_default(mid_t mod_id, uint32_t frame,
+				      uint32_t subframe, int *mbsfn_flag,
+				      Protocol__FlexranMessage ** dl_info);
 
 /*
  * Data plane function for applying the DL decisions of the scheduler
  */
-void flexran_apply_dl_scheduling_decisions(mid_t mod_id, uint32_t frame, uint32_t subframe, int *mbsfn_flag,
-					   Protocol__FlexranMessage *dl_scheduling_info);
+void flexran_apply_dl_scheduling_decisions(mid_t mod_id, uint32_t frame,
+					   uint32_t subframe,
+					   int *mbsfn_flag,
+					   Protocol__FlexranMessage *
+					   dl_scheduling_info);
 
 /*
  * Data plane function for applying the UE specific DL decisions of the scheduler
  */
-void flexran_apply_ue_spec_scheduling_decisions(mid_t mod_id, uint32_t frame, uint32_t subframe, int *mbsfn_flag,
-						uint32_t n_dl_ue_data, Protocol__FlexDlData **dl_ue_data);
+void flexran_apply_ue_spec_scheduling_decisions(mid_t mod_id,
+						uint32_t frame,
+						uint32_t subframe,
+						int *mbsfn_flag,
+						uint32_t n_dl_ue_data,
+						Protocol__FlexDlData **
+						dl_ue_data);
 
 /*
  * Data plane function for filling the DCI structure
  */
-void flexran_fill_oai_dci(mid_t mod_id, uint32_t CC_id, uint32_t rnti, Protocol__FlexDlDci *dl_dci);
+void flexran_fill_oai_dci(mid_t mod_id, uint32_t CC_id, uint32_t rnti,
+			  Protocol__FlexDlDci * dl_dci);
 
 #endif

openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.h

@@ -17,7 +17,7 @@
  *-------------------------------------------------------------------------------
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
- */ 
+ */
 
 /*! \file flexran_agent_scheduler_dlsch_ue_remote.h
  * \brief Local stub for remote scheduler used by the controller
@@ -46,8 +46,8 @@
 #define SCHED_AHEAD_SUBFRAMES 20
 
 typedef struct dl_mac_config_element_s {
-  Protocol__FlexranMessage *dl_info;
-  TAILQ_ENTRY(dl_mac_config_element_s) configs;
+    Protocol__FlexranMessage *dl_info;
+     TAILQ_ENTRY(dl_mac_config_element_s) configs;
 } dl_mac_config_element_t;
 
 TAILQ_HEAD(DlMacConfigHead, dl_mac_config_element_s);
@@ -55,8 +55,9 @@ TAILQ_HEAD(DlMacConfigHead, dl_mac_config_element_s);
 /*
  * Default scheduler used by the eNB agent
  */
-void flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subframe,
-			     int *mbsfn_flag, Protocol__FlexranMessage **dl_info);
+void flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame,
+				     uint32_t subframe, int *mbsfn_flag,
+				     Protocol__FlexranMessage ** dl_info);
 
 
 // Find the difference in subframes from the given subframe

openair2/LAYER2/MAC/flexran_dci_conversions.h

@@ -17,7 +17,7 @@
  *-------------------------------------------------------------------------------
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
- */ 
+ */
 
 /*! \file flexran_dci_conversions.h
  * \brief Conversion helpers from flexran messages to OAI formats DCI  
@@ -47,5 +47,5 @@
   ((TYPE*)DCI)->mcs = FLEXRAN_DCI->mcs[0]; \
   ((TYPE*)DCI)->TPC = FLEXRAN_DCI->tpc; \
   ((TYPE*)DCI)->ndi = FLEXRAN_DCI->ndi[0];
-  
+
 #endif

openair2/LAYER2/MAC/l1_helpers.c

@@ -34,28 +34,36 @@
 #include "UTIL/LOG/log.h"
 #include "proto.h"
 
-int8_t get_Po_NOMINAL_PUSCH(module_id_t module_idP,uint8_t CC_id)
+int8_t get_Po_NOMINAL_PUSCH(module_id_t module_idP, uint8_t CC_id)
 {
-  RACH_ConfigCommon_t *rach_ConfigCommon = NULL;
+    RACH_ConfigCommon_t *rach_ConfigCommon = NULL;
 
-  AssertFatal(CC_id==0,
-	      "Transmission on secondary CCs is not supported yet\n");
-  AssertFatal(UE_mac_inst[module_idP].radioResourceConfigCommon!=NULL,
-	      "[UE %d] CCid %d FATAL radioResourceConfigCommon is NULL !!!\n",module_idP,CC_id);	      
+    AssertFatal(CC_id == 0,
+		"Transmission on secondary CCs is not supported yet\n");
+    AssertFatal(UE_mac_inst[module_idP].radioResourceConfigCommon != NULL,
+		"[UE %d] CCid %d FATAL radioResourceConfigCommon is NULL !!!\n",
+		module_idP, CC_id);
 
-  rach_ConfigCommon = &UE_mac_inst[module_idP].radioResourceConfigCommon->rach_ConfigCommon;
+    rach_ConfigCommon =
+	&UE_mac_inst[module_idP].radioResourceConfigCommon->
+	rach_ConfigCommon;
 
-  return(-120 + (rach_ConfigCommon->powerRampingParameters.preambleInitialReceivedTargetPower<<1) +
-         get_DELTA_PREAMBLE(module_idP,CC_id));
+    return (-120 +
+	    (rach_ConfigCommon->
+	     powerRampingParameters.preambleInitialReceivedTargetPower <<
+	     1) + get_DELTA_PREAMBLE(module_idP, CC_id));
 }
 
-int8_t get_deltaP_rampup(module_id_t module_idP,uint8_t CC_id)
+int8_t get_deltaP_rampup(module_id_t module_idP, uint8_t CC_id)
 {
 
-  AssertFatal(CC_id==0,
-	      "Transmission on secondary CCs is not supported yet\n");
+    AssertFatal(CC_id == 0,
+		"Transmission on secondary CCs is not supported yet\n");
 
-  LOG_D(MAC,"[PUSCH]%d dB\n",UE_mac_inst[module_idP].RA_PREAMBLE_TRANSMISSION_COUNTER<<1);
-  return((int8_t)(UE_mac_inst[module_idP].RA_PREAMBLE_TRANSMISSION_COUNTER<<1));
+    LOG_D(MAC, "[PUSCH]%d dB\n",
+	  UE_mac_inst[module_idP].RA_PREAMBLE_TRANSMISSION_COUNTER << 1);
+    return ((int8_t)
+	    (UE_mac_inst[module_idP].
+	     RA_PREAMBLE_TRANSMISSION_COUNTER << 1));
 
 }