Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs

# Conflicts: # openair2/GNB_APP/gnb_config.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c # openair2/RRC/NR/L2_nr_interface.c # openair2/RRC/NR/MESSAGES/asn1_msg.c # openair2/RRC/NR/MESSAGES/asn1_msg.h # openair2/RRC/NR/nr_rrc_defs.h # openair2/RRC/NR/nr_rrc_proto.h # openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-06 11:29:55 +01:00
parent d059c71754 d11350c08a
commit a8e6bf9bd5
80 changed files with 1815 additions and 575 deletions
@@ -45,8 +45,6 @@ gNBs =
    remote_s_portc  = 500;
    remote_s_portd  = 2152;
    ssb_SubcarrierOffset                                      = 0;
-    pdsch_AntennaPorts                                        = 1;
-    pusch_AntennaPorts                                        = 1;
    min_rxtxtime                                              = 6;

     pdcch_ConfigSIB1 = (
@@ -37,6 +37,7 @@ gNBs =
    ////////// Physical parameters:

    ssb_SubcarrierOffset                                      = 0;
+
    servingCellConfigCommon = (
    {
 #spCellConfigCommon