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

# Conflicts: # common/utils/nr/nr_common.h # openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c # openair1/SCHED_NR_UE/phy_procedures_nr_ue.c # openair2/GNB_APP/gnb_paramdef.h # openair2/RRC/NR/rrc_gNB.c # openair2/RRC/NR/rrc_gNB_nsa.c
2021-12-24 11:53:25 +00:00
parent 65ebd0a8a7 264e829922
commit 97962f4635
119 changed files with 2782 additions and 2757 deletions
@@ -412,7 +412,7 @@ typedef struct NRRrcConfigurationReq_s {
  int                     sib1_tda;
  int                     pdsch_AntennaPorts;
  int                     pusch_AntennaPorts;
-  int                     minRXTXTIMEpdsch;
+  int                     minRXTXTIME;
  int                     do_CSIRS;
  int                     do_SRS;
  int                     pusch_TargetSNRx10;