remove num_pdcch_symb from paramters of dp_OFDM_mod_l

openair1/PHY/MODULATION/defs.h

@@ -89,7 +89,7 @@ void normal_prefix_mod(int32_t *txdataF,int32_t *txdata,uint8_t nsymb,LTE_DL_FRA
 
 void do_OFDM_mod(int32_t **txdataF, int32_t **txdata, uint32_t frame,uint16_t next_slot, LTE_DL_FRAME_PARMS *frame_parms);
 
-void do_OFDM_mod_l(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t next_slot, LTE_DL_FRAME_PARMS *frame_parms, uint8_t num_pdcch_symbols);
+void do_OFDM_mod_l(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t next_slot, LTE_DL_FRAME_PARMS *frame_parms);
 
 void remove_7_5_kHz(PHY_VARS_eNB *phy_vars_eNB,uint8_t subframe);
 

openair1/PHY/MODULATION/ofdm_mod.c

@@ -291,19 +291,17 @@ void do_OFDM_mod(int32_t **txdataF, int32_t **txdata, uint32_t frame,uint16_t ne
 }
 
 // OFDM modulation for each symbol
-void do_OFDM_mod_l(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t next_slot, LTE_DL_FRAME_PARMS *frame_parms, uint8_t num_pdcch_symbols)
+void do_OFDM_mod_l(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t next_slot, LTE_DL_FRAME_PARMS *frame_parms)
 {
 
-  int aa, l, slot_offset, slot_offset_F;
-  int8_t UE_id=0;
+  int aa, l, slot_offset;
   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);
   slot_offset = (next_slot)*(frame_parms->samples_per_tti>>1);
 
-  //    printf("Thread %d starting ... aa %d (%llu)\n",omp_get_thread_num(),aa,rdtsc());
+  //printf("Thread %d starting ... aa %d (%llu)\n",omp_get_thread_num(),aa,rdtsc());
   for (l=0; l<frame_parms->symbols_per_tti>>1; l++) {
   
     //printf("do_OFDM_mod_l, slot=%d, l=%d, NUMBER_OF_OFDM_CARRIERS=%d,OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES=%d\n",next_slot, l,NUMBER_OF_OFDM_CARRIERS,OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
@@ -312,6 +310,8 @@ void do_OFDM_mod_l(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t next_sl
 
     for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
 
+      //PMCH case not implemented... 
+
       if (frame_parms->Ncp == 1)
         PHY_ofdm_mod(txdataF_BF[aa],         // input
                      &txdata[aa][slot_offset+l*OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES],            // output
@@ -335,6 +335,10 @@ void do_OFDM_mod_l(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t next_sl
                        1,                                  // number of symbols
                        frame_parms->nb_prefix_samples,     // number of prefix samples
                        CYCLIC_PREFIX);
+
+          /* printf("txdata[%d][%d]=%d\n",aa, 
+                 slot_offset+OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES0+(l-1)*OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES,
+                 &txdata[aa][slot_offset+OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES0+(l-1)*OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES]);*/
         }
       }
     }

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -1649,27 +1649,21 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
   phy_procedures_emos_eNB_TX(subframe, phy_vars_eNB);
 #endif
 
-  //cell-specific beamforming
-
 #if !(defined(EXMIMO) || defined(OAI_USRP) || defined (CPRIGW))
 
   if (abstraction_flag==0)
   {
     start_meas(&phy_vars_eNB->ofdm_mod_stats);
     
-    //do_OFDM_mod (without l) ?
-
     do_OFDM_mod_l(&phy_vars_eNB->lte_eNB_common_vars,
                   0,
                   subframe<<1,
-                  &phy_vars_eNB->lte_frame_parms,
-                  num_pdcch_symbols);
+                  &phy_vars_eNB->lte_frame_parms);
                   
     do_OFDM_mod_l(&phy_vars_eNB->lte_eNB_common_vars,
                   0,
                   1+(subframe<<1),
-                  &phy_vars_eNB->lte_frame_parms,
-                  num_pdcch_symbols);
+                  &phy_vars_eNB->lte_frame_parms);
 
     stop_meas(&phy_vars_eNB->ofdm_mod_stats);
   }

openair1/SIMULATION/LTE_PHY/dlsim.c

@@ -2835,14 +2835,12 @@ PMI_FEEDBACK:
             do_OFDM_mod_l(&PHY_vars_eNB->lte_eNB_common_vars,
                           eNB_id,
                           (subframe*2),
-                          &PHY_vars_eNB->lte_frame_parms,
-                          num_pdcch_symbols);
+                          &PHY_vars_eNB->lte_frame_parms);
 
             do_OFDM_mod_l(&PHY_vars_eNB->lte_eNB_common_vars,
                           eNB_id,
                           (subframe*2)+1,
-                          &PHY_vars_eNB->lte_frame_parms,
-                          num_pdcch_symbols);
+                          &PHY_vars_eNB->lte_frame_parms);
 
             stop_meas(&PHY_vars_eNB->ofdm_mod_stats);
             stop_meas(&PHY_vars_eNB->phy_proc_tx);