Merge remote-tracking branch 'origin/develop_integration_2018_w06' into develop

Summary of changes:
- fix MAC indentation
- bug fixes:
  - fix uplink over-scheduling
  - fix CQI updating (it was done even when it shouldn't)
  - fix rrc rel10 compilation
  - some minor bug fixes related to ASN.1

cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

openair1/PHY/LTE_TRANSPORT/prach.c

@@ -1089,6 +1089,10 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
 }
 //__m128i mmtmpX0,mmtmpX1,mmtmpX2,mmtmpX3;
 
+#ifndef Rel14
+#define rx_prach0 rx_prach
+#endif
+
 void rx_prach0(PHY_VARS_eNB *eNB,
 	       RU_t *ru,
 	       uint16_t *max_preamble,
@@ -1764,9 +1768,8 @@ void rx_prach0(PHY_VARS_eNB *eNB,
 
 
 
-#ifndef Rel14
-#define rx_prach rx_prach0
-#else
+#ifdef Rel14
+
 void rx_prach(PHY_VARS_eNB *eNB,
 	      RU_t *ru,
 	      uint16_t *max_preamble,
@@ -1806,7 +1809,8 @@ void rx_prach(PHY_VARS_eNB *eNB,
     }
   }
 }
-#endif
+
+#endif /* Rel14 */
 
 void init_prach_tables(int N_ZC)
 {

openair1/PHY/LTE_TRANSPORT/proto.h

@@ -2151,11 +2151,10 @@ void rx_prach(PHY_VARS_eNB *phy_vars_eNB,RU_t *ru,
 	      uint16_t *max_preamble, 
 	      uint16_t *max_preamble_energy, 
 	      uint16_t *max_preamble_delay, 
+	      uint16_t Nf, uint8_t tdd_mapindex
 #ifdef Rel14
-	      uint16_t Nf, uint8_t tdd_mapindex,
+	      ,
               uint8_t br_flag
-#else
-	      uint16_t Nf, uint8_t tdd_mapindex
 #endif
 	      );
 /*!

openair1/PHY/defs.h

@@ -744,8 +744,10 @@ typedef struct RU_t_s{
   int (*wakeup_rxtx)(struct PHY_VARS_eNB_s *eNB, struct RU_t_s *ru);
   /// function pointer to wakeup routine in lte-enb.
   void (*wakeup_prach_eNB)(struct PHY_VARS_eNB_s *eNB,struct RU_t_s *ru,int frame,int subframe);
+#ifdef Rel14
   /// function pointer to wakeup routine in lte-enb.
   void (*wakeup_prach_eNB_br)(struct PHY_VARS_eNB_s *eNB,struct RU_t_s *ru,int frame,int subframe);
+#endif
   /// function pointer to eNB entry routine
   void (*eNB_top)(struct PHY_VARS_eNB_s *eNB, int frame_rx, int subframe_rx, char *string);
   /// Timing statistics

openair1/PHY/impl_defs_lte.h

@@ -144,8 +144,6 @@ typedef struct {
   uint8_t prach_hopping_offset[4];
 } PRACH_eMTC_CONFIG_INFO;
 
-#endif
-
 /// PRACH-ConfigSIB or PRACH-Config from 36.331 RRC spec
 typedef struct {
   /// Parameter: RACH_ROOT_SEQUENCE, see TS 36.211 (5.7.1). \vr{[0..837]}
@@ -158,6 +156,8 @@ typedef struct {
 #endif  
 } PRACH_eMTC_CONFIG_COMMON;
 
+#endif
+
 /// Enumeration for parameter \f$N_\text{ANRep}\f$ \ref PUCCH_CONFIG_DEDICATED::repetitionFactor.
 typedef enum {
   n2=0,

openair1/SCHED/fapi_l1.c

@@ -63,6 +63,7 @@ void handle_nfapi_dci_dl_pdu(PHY_VARS_eNB *eNB,
 }
 
 #ifdef Rel14
+
 void handle_nfapi_mpdcch_pdu(PHY_VARS_eNB *eNB,
                              eNB_rxtx_proc_t *proc,
                              nfapi_dl_config_request_pdu_t *dl_config_pdu)
@@ -76,6 +77,7 @@ void handle_nfapi_mpdcch_pdu(PHY_VARS_eNB *eNB,
   // copy dci configuration into eNB structure
   fill_mdci_and_dlsch(eNB,proc,&mpdcch_vars->mdci_alloc[mpdcch_vars->num_dci],pdu);
 }
+
 #endif
 
 void handle_nfapi_hi_dci0_dci_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,
@@ -265,14 +267,21 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_pr
     dlsch0_harq->codeword           = 0;
     dlsch0_harq->pdsch_start        = rel10->pdsch_start;
   }
-#endif
   dlsch0->i0               = rel13->initial_transmission_sf_io;
+#endif
 
+#ifdef Rel14
   LOG_D(PHY,"dlsch->i0:%04x dlsch0_harq[pdsch_start:%d nb_rb:%d vrb_type:%d rvidx:%d Nl:%d mimo_mode:%d dl_power_off:%d round:%d status:%d TBS:%d Qm:%d codeword:%d rb_alloc:%d] rel8[length:%d]\n", 
       dlsch0->i0, 
       dlsch0_harq->pdsch_start, dlsch0_harq->nb_rb, dlsch0_harq->vrb_type, dlsch0_harq->rvidx, dlsch0_harq->Nl, dlsch0_harq->mimo_mode, dlsch0_harq->dl_power_off, dlsch0_harq->round, dlsch0_harq->status, dlsch0_harq->TBS, dlsch0_harq->Qm, dlsch0_harq->codeword, dlsch0_harq->rb_alloc[0],
       rel8->length
       );
+#else
+  LOG_D(PHY,"dlsch0_harq[pdsch_start:%d nb_rb:%d vrb_type:%d rvidx:%d Nl:%d mimo_mode:%d dl_power_off:%d round:%d status:%d TBS:%d Qm:%d codeword:%d rb_alloc:%d] rel8[length:%d]\n", 
+      dlsch0_harq->pdsch_start, dlsch0_harq->nb_rb, dlsch0_harq->vrb_type, dlsch0_harq->rvidx, dlsch0_harq->Nl, dlsch0_harq->mimo_mode, dlsch0_harq->dl_power_off, dlsch0_harq->round, dlsch0_harq->status, dlsch0_harq->TBS, dlsch0_harq->Qm, dlsch0_harq->codeword, dlsch0_harq->rb_alloc[0],
+      rel8->length
+      );
+#endif
 }
 
 uint16_t to_beta_offset_harqack[16]={16,20,25,32,40,50,64,80,101,127,160,248,400,640,1008,8};
@@ -764,8 +773,10 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
       break;
 #ifdef Rel14
     case NFAPI_DL_CONFIG_MPDCCH_PDU_TYPE:
+#ifdef Rel14
       handle_nfapi_mpdcch_pdu(eNB,proc,dl_config_pdu);
       eNB->mpdcch_vars[subframe&1].num_dci++;
+#endif
       break;
 #endif    
     }

openair1/SCHED/prach_procedures.c

@@ -52,8 +52,9 @@
 
 extern uint32_t nfapi_mode;
 
-void prach_procedures(PHY_VARS_eNB *eNB,
+void prach_procedures(PHY_VARS_eNB *eNB
 #ifdef Rel14
+                      ,
 		      int br_flag
 #endif
 		      ) {

openair2/LAYER2/MAC/config.c

@@ -193,8 +193,12 @@ void config_mib(int                 Mod_idP,
 		int                 NcpP,
 		int                 p_eNBP,
 		uint32_t            dl_CarrierFreqP,
-		uint32_t            ul_CarrierFreqP,
-		uint32_t            pbch_repetitionP) {
+		uint32_t            ul_CarrierFreqP
+#ifdef Rel14
+                ,
+		uint32_t            pbch_repetitionP
+#endif
+                ) {
 
   nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
 
@@ -215,7 +219,7 @@ void config_mib(int                 Mod_idP,
   cfg->rf_config.dl_channel_bandwidth.value        = to_prb(dl_BandwidthP);
   cfg->rf_config.dl_channel_bandwidth.tl.tag = NFAPI_RF_CONFIG_DL_CHANNEL_BANDWIDTH_TAG;
   cfg->num_tlv++;
-LOG_E(PHY,"%s() dl_BandwidthP:%d\n", __FUNCTION__, dl_BandwidthP);
+  LOG_E(PHY,"%s() dl_BandwidthP:%d\n", __FUNCTION__, dl_BandwidthP);
 
   cfg->rf_config.ul_channel_bandwidth.value        = to_prb(dl_BandwidthP);
   cfg->rf_config.ul_channel_bandwidth.tl.tag = NFAPI_RF_CONFIG_UL_CHANNEL_BANDWIDTH_TAG;
@@ -267,10 +271,10 @@ LOG_E(PHY,"%s() dl_BandwidthP:%d\n", __FUNCTION__, dl_BandwidthP);
   cfg->emtc_config.pbch_repetitions_enable_r13.tl.tag = NFAPI_EMTC_CONFIG_PBCH_REPETITIONS_ENABLE_R13_TAG;
   cfg->num_tlv++;
 #endif  
-
   LOG_I(MAC,
 	"%s() NFAPI_CONFIG_REQUEST(num_tlv:%u) DL_BW:%u UL_BW:%u Ncp %d,p_eNB %d,earfcn %d,band %d,phich_resource %u phich_duration %u phich_power_offset %u PSS %d SSS %d PCI %d"
 #ifdef Rel14
+	
 	" PBCH repetition %d"
 #endif  
 	"\n"
@@ -296,6 +300,7 @@ LOG_E(PHY,"%s() dl_BandwidthP:%d\n", __FUNCTION__, dl_BandwidthP);
 void config_sib1(int Mod_idP, int CC_idP, TDD_Config_t * tdd_ConfigP)
 {
 
+
   nfapi_config_request_t *cfg = &RC.mac[Mod_idP]->config[CC_idP];
 
   if (tdd_ConfigP)   { //TDD
@@ -396,16 +401,13 @@ config_sib2(int Mod_idP,
   cfg->pucch_config.n1_pucch_an.tl.tag = NFAPI_PUCCH_CONFIG_N1_PUCCH_AN_TAG;
   cfg->num_tlv++;
 
-  if (radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupHoppingEnabled == true)
-  {
+  if (radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.groupHoppingEnabled == true) {
     cfg->uplink_reference_signal_config.uplink_rs_hopping.value     = 1;
   }
-  else if (radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled == true)
-  {
+  else if (radioResourceConfigCommonP->pusch_ConfigCommon.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled == true) {
     cfg->uplink_reference_signal_config.uplink_rs_hopping.value     = 2;
   }
-  else // No hopping
-  {
+  else {
     cfg->uplink_reference_signal_config.uplink_rs_hopping.value     = 0;
   }
   cfg->uplink_reference_signal_config.uplink_rs_hopping.tl.tag = NFAPI_UPLINK_REFERENCE_SIGNAL_CONFIG_UPLINK_RS_HOPPING_TAG;
@@ -704,7 +706,6 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
 #endif
 	       );
 
-
     mac_init_cell_params(Mod_idP,CC_idP);
 
     if (schedulingInfoList!=NULL)  {
@@ -777,6 +778,7 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
 		  NULL, ul_Bandwidth, additionalSpectrumEmission,
 		  mbsfn_SubframeConfigList);
 
+
     }
   } // mib != NULL
 
@@ -926,3 +928,5 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
     
     return(0);			   
 }
+
+

openair2/LAYER2/MAC/defs.h

@@ -665,7 +665,7 @@ typedef struct {
     /// mcs from last UL scheduling
     uint8_t mcs_UL[8];
     /// TBS from last UL scheduling
-    uint8_t TBS_UL[8];
+    int TBS_UL[8];
     /// Flag to indicate UL has been scheduled at least once
     boolean_t ul_active;
     /// Flag to indicate UE has been configured (ACK from RRCConnectionSetup received)
@@ -720,9 +720,6 @@ typedef struct {
 
     // Logical channel info for link with RLC
 
-    /// Last received UE BSR info for each logical channel group id
-    uint8_t bsr_info[MAX_NUM_LCGID];
-
     /// LCGID mapping
     long lcgidmap[11];
 
@@ -749,8 +746,6 @@ typedef struct {
     /// size of remaining size to send for the downlink head SDU
     uint32_t dl_buffer_head_sdu_remaining_size_to_send[MAX_NUM_LCID];
 
-    /// total uplink buffer size 
-    uint32_t ul_total_buffer;
     /// uplink buffer creation time for each LCID
     uint32_t ul_buffer_creation_time[MAX_NUM_LCGID];
     /// maximum uplink buffer creation time across all the LCIDs
@@ -758,6 +753,11 @@ typedef struct {
     /// uplink buffer size per LCID
     uint32_t ul_buffer_info[MAX_NUM_LCGID];
 
+    /// uplink bytes that are currently scheduled
+    int scheduled_ul_bytes;
+    /// estimation of the UL buffer size
+    int estimated_ul_buffer;
+
     /// UE tx power
     int32_t ue_tx_power;
 

openair2/LAYER2/MAC/pre_processor.c

@@ -1590,9 +1590,11 @@ assign_max_mcs_min_rb(module_id_t module_idP, int frameP,
 		to_prb(RC.mac[module_idP]->common_channels[CC_id].
 		       ul_Bandwidth);
 	    // if this UE has UL traffic
-	    if (UE_template->ul_total_buffer > 0) {
-
+            int bytes_to_schedule = UE_template->estimated_ul_buffer - UE_template->scheduled_ul_bytes;
+            if (bytes_to_schedule < 0) bytes_to_schedule = 0;
+            int bits_to_schedule = bytes_to_schedule * 8;
 
+	    if (bits_to_schedule > 0) {
 		tbs = get_TBS_UL(mcs, 3) << 3;	// 1 or 2 PRB with cqi enabled does not work well!
 		rb_table_index = 2;
 
@@ -1602,7 +1604,7 @@ assign_max_mcs_min_rb(module_id_t module_idP, int frameP,
 					 Ncp, 0);
 
 		while ((((UE_template->phr_info - tx_power) < 0)
-			|| (tbs > UE_template->ul_total_buffer))
+			|| (tbs > bits_to_schedule))
 		       && (mcs > 3)) {
 		    // LOG_I(MAC,"UE_template->phr_info %d tx_power %d mcs %d\n", UE_template->phr_info,tx_power, mcs);
 		    mcs--;
@@ -1610,7 +1612,7 @@ assign_max_mcs_min_rb(module_id_t module_idP, int frameP,
 		    tx_power = estimate_ue_tx_power(tbs, rb_table[rb_table_index], 0, Ncp, 0);	// fixme: set use_srs
 		}
 
-		while ((tbs < UE_template->ul_total_buffer) &&
+		while ((tbs < bits_to_schedule) &&
 		       (rb_table[rb_table_index] <
 			(N_RB_UL - first_rb[CC_id]))
 		       && ((UE_template->phr_info - tx_power) > 0)
@@ -1700,11 +1702,14 @@ static int ue_ul_compare(const void *_a, const void *_b, void *_params)
 	UE_list->UE_template[pCCid2][UE_id2].ul_buffer_info[LCGID0])
 	return 1;
 
-    if (UE_list->UE_template[pCCid1][UE_id1].ul_total_buffer >
-	UE_list->UE_template[pCCid2][UE_id2].ul_total_buffer)
+    int bytes_to_schedule1 = UE_list->UE_template[pCCid1][UE_id1].estimated_ul_buffer - UE_list->UE_template[pCCid1][UE_id1].scheduled_ul_bytes;
+    if (bytes_to_schedule1 < 0) bytes_to_schedule1 = 0;
+    int bytes_to_schedule2 = UE_list->UE_template[pCCid2][UE_id2].estimated_ul_buffer - UE_list->UE_template[pCCid2][UE_id2].scheduled_ul_bytes;
+    if (bytes_to_schedule2 < 0) bytes_to_schedule2 = 0;
+
+    if (bytes_to_schedule1 > bytes_to_schedule2)
 	return -1;
-    if (UE_list->UE_template[pCCid1][UE_id1].ul_total_buffer <
-	UE_list->UE_template[pCCid2][UE_id2].ul_total_buffer)
+    if (bytes_to_schedule1 < bytes_to_schedule2)
 	return 1;
 
     if (UE_list->UE_template[pCCid1][UE_id1].pre_assigned_mcs_ul >

openair2/LAYER2/openair2_proc.c

@@ -217,11 +217,11 @@ int dump_eNB_l2_stats(char *buffer, int length)
                        UE_list->eNB_UE_stats[CC_id][UE_id].num_errors_rx);
 
         len+= sprintf(&buffer[len],"[MAC] Received PHR PH = %d (db)\n", UE_list->UE_template[CC_id][UE_id].phr_info);
-        len+= sprintf(&buffer[len],"[MAC] Received BSR LCGID[0][1][2][3] = %u %u %u %u\n",
-                      UE_list->UE_template[CC_id][UE_id].bsr_info[LCGID0],
-                      UE_list->UE_template[CC_id][UE_id].bsr_info[LCGID1],
-                      UE_list->UE_template[CC_id][UE_id].bsr_info[LCGID2],
-                      UE_list->UE_template[CC_id][UE_id].bsr_info[LCGID3]
+        len+= sprintf(&buffer[len],"[MAC] Estimated size LCGID[0][1][2][3] = %u %u %u %u\n",
+                      UE_list->UE_template[CC_id][UE_id].ul_buffer_info[LCGID0],
+                      UE_list->UE_template[CC_id][UE_id].ul_buffer_info[LCGID1],
+                      UE_list->UE_template[CC_id][UE_id].ul_buffer_info[LCGID2],
+                      UE_list->UE_template[CC_id][UE_id].ul_buffer_info[LCGID3]
                      );
       }
       

openair2/RRC/LITE/MESSAGES/asn1_msg.c

@@ -876,7 +876,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
   (*sib3)->intraFreqCellReselectionInfo.presenceAntennaPort1 = 0;
   (*sib3)->intraFreqCellReselectionInfo.neighCellConfig.buf = CALLOC(8,1);
   (*sib3)->intraFreqCellReselectionInfo.neighCellConfig.size = 1;
-  (*sib3)->intraFreqCellReselectionInfo.neighCellConfig.buf[0] = 1;
+  (*sib3)->intraFreqCellReselectionInfo.neighCellConfig.buf[0] = 1 << 6;
   (*sib3)->intraFreqCellReselectionInfo.neighCellConfig.bits_unused = 6;
   (*sib3)->intraFreqCellReselectionInfo.t_ReselectionEUTRA = 1;
   (*sib3)->intraFreqCellReselectionInfo.t_ReselectionEUTRA_SF = (struct SpeedStateScaleFactors *)NULL;

openair3/S1AP/s1ap_eNB_encoder.c

@@ -470,7 +470,7 @@ int s1ap_eNB_encode_initial_ue_message(
   return s1ap_generate_initiating_message(buffer,
                                           length,
                                           S1ap_ProcedureCode_id_initialUEMessage,
-                                          S1ap_Criticality_reject,
+                                          S1ap_Criticality_ignore,
                                           &asn_DEF_S1ap_InitialUEMessage,
                                           initialUEMessage_p);
 }

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf

-Active_eNBs = ( "eNB_Eurecom_LTEBox");
+Active_eNBs = ( "eNB-Eurecom-LTEBox");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
@@ -10,7 +10,7 @@ eNBs =
 
     cell_type =  "CELL_MACRO_ENB";
 
-    eNB_name  =  "eNB_Eurecom_LTEBox";
+    eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";

targets/RT/USER/lte-enb.c

@@ -1050,7 +1050,9 @@ void init_eNB_afterRU(void) {
     
     RC.ru[ru_id]->wakeup_rxtx         = wakeup_rxtx;
     RC.ru[ru_id]->wakeup_prach_eNB    = wakeup_prach_eNB;
+#ifdef Rel14
     RC.ru[ru_id]->wakeup_prach_eNB_br = wakeup_prach_eNB_br;
+#endif
     RC.ru[ru_id]->eNB_top             = eNB_top;
   }
 }