Merge branch 'feature-247-tm89' into feature-230-tm3_scheduler

Conflicts:
	openair1/SIMULATION/LTE_PHY/dlsim.c

openair1/PHY/INIT/lte_init.c

@@ -692,6 +692,11 @@ void phy_config_dedicated_eNB(uint8_t Mod_id,
         eNB->do_precoding = 1;
         eNB->transmission_mode[UE_id] = 7;
         break;
+      case AntennaInfoDedicated__transmissionMode_tm8_v920:
+        lte_gold_ue_spec(eNB->lte_gold_uespec_table,eNB->frame_parms.Nid_cell,NULL);
+        eNB->do_precoding = 1;
+        eNB->transmission_mode[UE_id] = 8;
+        break;
       default:
         LOG_E(PHY,"Unknown transmission mode!\n");
         break;
@@ -1411,7 +1416,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
 
       if (eNB->node_function != NGFI_RRU_IF5) {
         for (i=0; i<NB_ANTENNA_PORTS_ENB; i++) {
-          if (i<fp->nb_antenna_ports_eNB || i==5) {
+          if (i<fp->nb_antenna_ports_eNB || i==5 || i==7 || i==8) {
             common_vars->txdataF[eNB_id][i] = (int32_t*)malloc16_clear(fp->ofdm_symbol_size*fp->symbols_per_tti*10*sizeof(int32_t) );
 #ifdef DEBUG_PHY
             printf("[openair][LTE_PHY][INIT] common_vars->txdataF[%d][%d] = %p (%lu bytes)\n",
@@ -1436,7 +1441,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
       }
 
       for (i=0; i<NB_ANTENNA_PORTS_ENB; i++) {
-        if (i<fp->nb_antenna_ports_eNB || i==5) {
+        if (i<fp->nb_antenna_ports_eNB || i==5 || i==7 || i==8) {
           common_vars->beam_weights[eNB_id][i] = (int32_t **)malloc16_clear(fp->nb_antennas_tx*sizeof(int32_t*));
           for (j=0; j<fp->nb_antennas_tx; j++) {
             common_vars->beam_weights[eNB_id][i][j] = (int32_t *)malloc16_clear(fp->ofdm_symbol_size*sizeof(int32_t));
@@ -1638,6 +1643,9 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
     init_prach_tables(839);
   } // node_function != NGFI_RRU_IF4p5
 
+  /*init the ue spec reference sequence for TM8/9*/
+  lte_gold_ue_spec(eNB->lte_gold_uespec_table,eNB->frame_parms.Nid_cell, NULL);
+
   return (0);
 
 }

openair1/PHY/LTE_REFSIG/defs.h

@@ -42,11 +42,12 @@ unsigned int lte_gold_generic(unsigned int *x1, unsigned int *x2, unsigned char
 @param frame_parms LTE DL Frame parameters
 @param lte_gold_table pointer to table where sequences are stored
 @param Nid_cell Cell Id (to compute sequences for local and adjacent cells) */
-
 void lte_gold(LTE_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_table[20][2][14],uint16_t Nid_cell);
 
-void lte_gold_ue_spec(LTE_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_uespec_table[2][20][2][21],uint16_t Nid_cell, uint16_t *n_idDMRS);
+/*! \brief This function generates the LTE Gold sequence for DL UE-specific pilots for antenna ports 7,...,14 (transmission modes 8/9) */
+void lte_gold_ue_spec(uint32_t lte_gold_uespec_table[2][20][2][21],uint16_t Nid_cell, uint16_t *n_idDMRS);
 
+/*! \brief This function generates the LTE Gold sequence for DL UE-specific pilots for antenna port 5 (transmission mode 7) */
 void lte_gold_ue_spec_port5(uint32_t lte_gold_uespec_port5_table[20][38],uint16_t Nid_cell, uint16_t n_rnti);
 
 /*!\brief This function generates the LTE Gold sequence (36-211, Sec 7.2), specifically for DL UE-specific reference signals for antenna ports 7..14.
@@ -54,7 +55,6 @@ void lte_gold_ue_spec_port5(uint32_t lte_gold_uespec_port5_table[20][38],uint16_
 @param lte_gold_uespec_table pointer to table where sequences are stored
 @param Nid_cell Cell Id (to compute sequences for local and adjacent cells)
 @param n_idDMRS Scrambling identity for TM10*/
-
 void lte_gold_mbsfn(LTE_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_mbsfn_table[10][3][42],uint16_t Nid_MBSFN);
 
 

openair1/PHY/LTE_REFSIG/lte_gold.c

@@ -81,7 +81,7 @@ void lte_gold(LTE_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_table[20][2][14]
   }
 }
 
-void lte_gold_ue_spec(LTE_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_uespec_table[2][20][2][21],uint16_t Nid_cell, uint16_t *n_idDMRS)
+void lte_gold_ue_spec(uint32_t lte_gold_uespec_table[2][20][2][21],uint16_t Nid_cell, uint16_t *n_idDMRS)
 {
 
   unsigned char ns,l;

openair1/PHY/LTE_TRANSPORT/defs.h

@@ -162,7 +162,7 @@ typedef struct {
   uint8_t Nl;
   /// Number of layers for this PDSCH transmission (TM8-10)
   uint8_t Nlayers;
-  /// First layer for this PSCH transmission
+  /// First layer for this PDSCH transmission
   uint8_t first_layer;
    /// codeword this transport block is mapped to
   uint8_t codeword;

openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c

@@ -29,7 +29,7 @@
  * \note
  * \warning
  */
-//#include "PHY/defs.h"
+#include "PHY/defs.h"
 #include "PHY/extern.h"
 #include "SCHED/defs.h"
 #include "defs.h"

openair1/PHY/LTE_TRANSPORT/proto.h

@@ -2169,7 +2169,7 @@ int is_pmch_subframe(frame_t frame, int subframe, LTE_DL_FRAME_PARMS *frame_parm
 
 uint8_t is_not_pilot(uint8_t pilots, uint8_t re, uint8_t nushift, uint8_t use2ndpilots);
 
-uint8_t is_not_UEspecRS(int8_t lprime, uint8_t re, uint8_t nushift, uint8_t Ncp, uint8_t beamforming_mode);
+uint8_t is_not_UEspecRS(int8_t lprime, uint8_t re, uint8_t nushift, uint8_t Ncp, uint8_t beamforming_mode, uint8_t Ns);
 
 uint32_t dlsch_decoding_abstraction(double *dlsch_MIPB,
                                     LTE_DL_FRAME_PARMS *lte_frame_parms,

openair1/PHY/MODULATION/beamforming.c

@@ -56,7 +56,7 @@ int beam_precoding(int32_t **txdataF,
   memset(txdataF_BF[aa],0,sizeof(int32_t)*(frame_parms->ofdm_symbol_size));
 
   for (p=0; p<NB_ANTENNA_PORTS_ENB; p++) {
-    if (p<frame_parms->nb_antenna_ports_eNB || p==5) {
+    if (p<frame_parms->nb_antenna_ports_eNB || p==5 || p==7 || p==8) {
       multadd_cpx_vector((int16_t*)&txdataF[p][slot_offset_F+symbol*frame_parms->ofdm_symbol_size],(int16_t*)beam_weights[p][aa], (int16_t*)txdataF_BF[aa], 0, frame_parms->ofdm_symbol_size, 15);
       //mult_cpx_conj_vector((int16_t*)beam_weights[p][aa], (int16_t*)&txdataF[p][slot_offset_F+symbol*frame_parms->ofdm_symbol_size], (int16_t*)txdataF_BF[aa], frame_parms->ofdm_symbol_size, 15, 1);
 

openair1/PHY/impl_defs_top.h

@@ -177,7 +177,7 @@
 #define DMA_BLKS_PER_SLOT    (SLOT_LENGTH_BYTES/2048)                    // Number of DMA blocks per slot
 #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_ANTENNA_PORTS_ENB  9                                         // total number of eNB antenna ports
 
 #ifdef EXMIMO
 #define TARGET_RX_POWER 55    // Target digital power for the AGC