Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

Conflicts: targets/RT/USER/lte-enb.c
2016-10-27 09:58:56 +02:00
parent 5e1d462aa9 727cdb4a87
commit 11db1d89bb
9 changed files with 428 additions and 70 deletions
@@ -36,6 +36,7 @@ eNBs =
      Nid_cell					      = 0;
      N_RB_DL                 			      = 50;
      Nid_cell_mbsfn          			      = 0;
+      nb_antenna_ports				      = 1;	
      nb_antennas_tx          			      = 1;
      nb_antennas_rx          			      = 1;
      tx_gain                                            = 90;
@@ -67,7 +68,7 @@ eNBs =
      srs_ackNackST                                      =;
      srs_MaxUpPts                                       =;*/

-      pusch_p0_Nominal                                   = -102;
+      pusch_p0_Nominal                                   = -96;
      pusch_alpha                                        = "AL1";
      pucch_p0_Nominal                                   = -104;
      msg3_delta_Preamble                                = 6;
@@ -100,6 +101,7 @@ eNBs =
      ue_TimersAndConstants_t311			      = 10000;
      ue_TimersAndConstants_n310			      = 20;
      ue_TimersAndConstants_n311			      = 1;
+      ue_TransmissionMode	   			      = 1;

      }
    );