fixing a few bugs after merge

openair1/PHY/INIT/lte_init.c

@@ -1334,7 +1334,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
       eNB_common_vars->txdataF_BF[eNB_id] = (int32_t **)malloc16(frame_parms->nb_antennas_tx*sizeof(int32_t*));
 
       for (i=0; i<14; i++) {
-        eNB_common_vars->txdataF[eNB_id][i] = (mod_sym_t*)malloc16_clear( FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX*sizeof(mod_sym_t) );
+        eNB_common_vars->txdataF[eNB_id][i] = (int32_t*)malloc16_clear( FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX*sizeof(int32_t) );
 #ifdef DEBUG_PHY
         msg("[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdataF[%d][%d] = %p (%d bytes)\n",
             eNB_id,i,eNB_common_vars->txdataF[eNB_id][i],
@@ -1343,7 +1343,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
       }
 
       for (i=0; i<frame_parms->nb_antennas_tx; i++) {
-        eNB_common_vars->txdataF_BF[eNB_id][i] = (mod_sym_t*)malloc16_clear( OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(mod_sym_t) );
+        eNB_common_vars->txdataF_BF[eNB_id][i] = (int32_t*)malloc16_clear( OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(int32_t) );
 #ifdef USER_MODE
         eNB_common_vars->txdata[eNB_id][i]  = (int32_t*)malloc16_clear( FRAME_LENGTH_COMPLEX_SAMPLES*sizeof(int32_t) );
 #else  // USER_MODE
@@ -1352,7 +1352,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
 #ifdef DEBUG_PHY
         msg("[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdataF_BF[%d][%d][%d] = %p (%d bytes)\n",
             eNB_id,i,j,eNB_common_vars->txdataF_BF[eNB_id][i][j],
-            OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(mod_sym_t));
+            OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(int32_t));
         msg("[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdata[%d][%d] = %p\n",eNB_id,i,eNB_common_vars->txdata[eNB_id][i]);
 #endif
       }

openair1/PHY/LTE_REFSIG/defs.h

@@ -139,7 +139,7 @@ int lte_dl_cell_spec_rx(PHY_VARS_UE *phy_vars_ue,
 @param nRB_PDSCH number of allocated PDSCH RBs
 */
 int lte_dl_ue_spec_rx(PHY_VARS_UE *phy_vars_ue,
-                      mod_sym_t *output,
+                      int32_t *output,
                       unsigned char Ns,
                       unsigned char p,
                       int lprime,

openair1/PHY/LTE_REFSIG/lte_dl_uespec.c

@@ -133,14 +133,14 @@ int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
 
 
 int lte_dl_ue_spec_rx(PHY_VARS_UE *phy_vars_ue,
-                      mod_sym_t *output,
+                      int32_t *output,
                       unsigned char Ns,
                       unsigned char p, 
                       int lprime,
                       int SS_flag,
                       uint16_t nRB_PDSCH)
 {
-  mod_sym_t qpsk[4],nqpsk[4],*qpsk_p,*output_p;
+  int32_t qpsk[4],nqpsk[4],*qpsk_p,*output_p;
   int w,mprime,ind,l,ind_dword,ind_qpsk_symb,nPRB;
   short pamp;
 

openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c

@@ -232,7 +232,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB,
   int s=1;
         
   int mprime2 = mprime,ind,ind_dword,ind_qpsk_symb;
-  mod_sym_t qpsk[4];
+  int32_t qpsk[4];
 
   gain_lin_QPSK = (int16_t)((amp*ONE_OVER_SQRT2_Q15)>>15);
   //  if (mimo_mode == LARGE_CDD) gain_lin_QPSK>>=1;

openair1/PHY/LTE_TRANSPORT/proto.h

@@ -306,10 +306,9 @@ int32_t generate_mbsfn_pilot(PHY_VARS_eNB *phy_vars_eNB,
                              int16_t amp,
                              uint16_t subframe);
 
-<<<<<<< HEAD
 void generate_ue_spec_pilots(PHY_VARS_eNB *phy_vars_eNB,
                              uint8_t UE_id,
-                             mod_sym_t **txdataF,
+                             int32_t **txdataF,
                              int16_t amp,
                              uint16_t Ntti,
 		             uint8_t beamforming_mode);

openair1/PHY/MODULATION/ofdm_mod.c

@@ -296,8 +296,8 @@ void do_OFDM_mod_l(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t next_sl
 
   int aa, l, slot_offset, slot_offset_F;
   int8_t UE_id=0;
-  mod_sym_t **txdataF = eNB_common_vars->txdataF[eNB_id];
-  mod_sym_t **txdataF_BF = eNB_common_vars->txdataF_BF[eNB_id];
+  int32_t **txdataF = eNB_common_vars->txdataF[eNB_id];
+  int32_t **txdataF_BF = eNB_common_vars->txdataF_BF[eNB_id];
   int32_t **txdata = eNB_common_vars->txdata[eNB_id];
 
   //slot_offset_F = (next_slot)*(frame_parms->ofdm_symbol_size)*((frame_parms->Ncp==1) ? 6 : 7);

targets/RT/USER/lte-softmodem.c

@@ -3069,7 +3069,7 @@ int main( int argc, char **argv )
 
     for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
 
-      PHY_vars_UE_g[0][CC_id] = init_lte_UE(frame_parms[CC_id], 0,abstraction_flag,transmission_mode);
+      PHY_vars_UE_g[0][CC_id] = init_lte_UE(frame_parms[CC_id], 0,abstraction_flag);
       UE[CC_id] = PHY_vars_UE_g[0][CC_id];
       printf("PHY_vars_UE_g[0][%d] = %p\n",CC_id,UE[CC_id]);
 
@@ -3169,7 +3169,7 @@ int main( int argc, char **argv )
     PHY_vars_eNB_g[0] = malloc(sizeof(PHY_VARS_eNB*));
 
     for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-      PHY_vars_eNB_g[0][CC_id] = init_lte_eNB(frame_parms[CC_id],0,frame_parms[CC_id]->Nid_cell,cooperation_flag,transmission_mode,abstraction_flag);
+      PHY_vars_eNB_g[0][CC_id] = init_lte_eNB(frame_parms[CC_id],0,frame_parms[CC_id]->Nid_cell,cooperation_flag,abstraction_flag);
       PHY_vars_eNB_g[0][CC_id]->CC_id = CC_id;
 
       if (phy_test==1)