Merge branch 'ru_parallel' into ru-parallel-beamforming

Conflicts: executables/nr-ru.c nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h openair1/SCHED_NR/nr_ru_procedures.c
2019-08-14 16:51:59 +02:00
parent 09d3c72144 054156c16c
commit 21fa809ce0
12 changed files with 153 additions and 83 deletions
@@ -582,7 +582,7 @@ typedef struct {
    uint8_t time_allocation_type;
 	uint8_t freq_allocation_type;
    uint8_t start_prb;
-    uint8_t n_prb;
+    uint16_t n_prb;
    uint8_t start_symbol;
    uint8_t nb_symbols;
    uint8_t mcs_idx;