Merge branch 'develop-nr' into ru-parallel-beamforming-merge

Conflicts: openair1/PHY/MODULATION/nr_modulation.h openair1/PHY/NR_TRANSPORT/nr_dlsch.c openair1/SCHED_NR/phy_procedures_nr_gNB.c
2019-11-22 17:00:53 +01:00
parent e0c80a83b8 90445b0003
commit 56ecc5cfb2
98 changed files with 3858 additions and 1797 deletions
@@ -37,7 +37,7 @@
 */

 void nr_modulation(uint32_t *in,
-                   uint16_t length,
+                   uint32_t length,
                   uint16_t mod_order,
                   int16_t *out);

@@ -93,7 +93,6 @@ int nr_slot_fep_ul(NR_DL_FRAME_PARMS *frame_parms,
 */
 void nr_dft(int32_t *z,int32_t *d, uint32_t Msc_PUSCH);

-
 int nr_beam_precoding(int32_t **txdataF,
 	              int32_t **txdataF_BF,
                      NR_DL_FRAME_PARMS *frame_parms,