Merge branch 'inter-RRU' of https://gitlab.eurecom.fr/oai/openairinterface5g into inter-RRU

openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c

@@ -731,8 +731,8 @@ void ulsch_extract_rbs_single(int32_t **rxdataF,
   //uint8_t symbol = l+Ns*frame_parms->symbols_per_tti/2;
   uint8_t symbol = l+((7-frame_parms->Ncp)*(Ns&1)); ///symbol within sub-frame
 
-  AssertFatal((frame_parms->nb_antennas_rx>0) && (frame_parms->nb_antennas_rx<5),
-	      "nb_antennas_rx not in (1-4)\n");
+  AssertFatal((frame_parms->nb_antennas_rx>0) && (frame_parms->nb_antennas_rx<7),
+	      "nb_antennas_rx not in (1-6)\n");
 
   for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {
 

openair1/PHY/defs_eNB.h

@@ -689,7 +689,7 @@ typedef struct {
   /// - second index: ? [0..12*N_RB_UL*frame_parms->symbols_per_tti[
   int32_t **ul_ch_magb;
   /// measured RX power based on DRS
-  int ulsch_power[4];
+  int ulsch_power[6];
   /// \brief llr values.
   /// - first index: ? [0..1179743] (hard coded)
   int16_t *llr;

openair1/PHY/impl_defs_top.h

@@ -175,7 +175,7 @@
 #define SLOT_TIME_NS         (SLOT_LENGTH_SAMPLES*(1e3)/7.68)            // slot time in ns
 
 #define NB_ANTENNA_PORTS_ENB  6                                         // total number of eNB antenna ports
-#define NB_PUSCH_ANT_PORTS  4                                         // total number of eNB pusch antenna ports
+#define NB_PUSCH_ANT_PORTS  6                                         // total number of eNB pusch antenna ports
 
 #ifdef EXMIMO
 #define TARGET_RX_POWER 55    // Target digital power for the AGC