Merge branch 'nr-dual-connectivity' of...

Merge branch 'nr-dual-connectivity' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-dual-connectivity

openair2/COMMON/platform_constants.h

@@ -84,7 +84,7 @@
     #else
       #define MAX_MOBILES_PER_ENB         4
       #define MAX_MOBILES_PER_ENB_NB_IoT  4
-      #define MAX_MOBILES_PER_GNB         4
+      #define MAX_MOBILES_PER_GNB         2//16
       #define MAX_eNB                      2
       #define MAX_gNB                      2
     #endif

targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.slave.conf

@@ -22,6 +22,7 @@ gNBs =
     ////////// Physical parameters:
 
     ssb_SubcarrierOffset                                      = 0;
+    pdsch_AntennaPorts                                        = 1;
 	
     servingCellConfigCommon = (
     {
@@ -147,12 +148,12 @@ gNBs =
 # ssb_PositionsInBurs_BitmapPR
 # 1=short, 2=medium, 3=long
       ssb_PositionsInBurst_PR                                       = 2;
-      ssb_PositionsInBurst_Bitmap                                   = 255;
+      ssb_PositionsInBurst_Bitmap                                   = 15;
 
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1 
-      ssb_periodicityServingCell                                    = 2
-;
+      ssb_periodicityServingCell                                    = 2;
+
 # dmrs_TypeA_position
 # 0 = pos2, 1 = pos3
       dmrs_TypeA_Position                                           = 0;
@@ -165,15 +166,15 @@ gNBs =
   #tdd-UL-DL-ConfigurationCommon
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
-      referenceSubcarrierSpacing                                    = 2;
+      referenceSubcarrierSpacing                                    = 1;
       # pattern1 
       # dl_UL_TransmissionPeriodicity
       # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 0;
-      nrofDownlinkSlots                                             = 7;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 2;
-      nrofUplinkSymbols                                             = 4;
+      dl_UL_TransmissionPeriodicity                                 = 6;
+      nrofDownlinkSlots                                             = 2;
+      nrofDownlinkSymbols                                           = 1;
+      nrofUplinkSlots                                               = 7;
+      nrofUplinkSymbols                                             = 7;
 
   ssPBCH_BlockPower                                             = 10;
   }
@@ -212,13 +213,13 @@ gNBs =
     NETWORK_INTERFACES :
     {
 
-        GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.107/24";
+        GNB_INTERFACE_NAME_FOR_S1_MME            = "enp0s31f6";
+        GNB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.75/24";
         GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.107/24";
+        GNB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.75/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         
-        GNB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.107/23";
+        GNB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.75/23";
         GNB_PORT_FOR_X2C                         = 36422; # Spec 36422
     };
   }
@@ -281,4 +282,3 @@ THREAD_STRUCT = (
        rrc_log_level                         ="info";
        rrc_log_verbosity                     ="medium";
     };
-