fixed compilatiaon issues after merge with develop and enhancement-rfsim....

fixed compilatiaon issues after merge with develop and enhancement-rfsim. Intitial testing with emulator.

cmake_targets/CMakeLists.txt

@@ -1145,7 +1145,7 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/uci_tools.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c
-  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+#  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
   ${OPENAIR1_DIR}/PHY/INIT/lte_init.c
   )
@@ -1154,6 +1154,8 @@ set(PHY_SRC_RU
   # actual source
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if4_tools.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/if5_tools.c
+  ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/drs_modulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
   ${OPENAIR1_DIR}/PHY/MODULATION/ul_7_5_kHz.c
   ${OPENAIR1_DIR}/PHY/MODULATION/beamforming.c

openair1/PHY/LTE_TRANSPORT/phich.c

@@ -720,7 +720,6 @@ void generate_phich_top(PHY_VARS_eNB *eNB,
   uint32_t pusch_frame;
   int subframe = proc->subframe_tx;
   phich_config_t *phich;
-  int absSF = subframe+(proc->frame_tx*10);
 
   // compute Ngroup_PHICH (see formula at beginning of Section 6.9 in 36-211
 
@@ -732,19 +731,15 @@ void generate_phich_top(PHY_VARS_eNB *eNB,
   if (frame_parms->Ncp == 1)
     NSF_PHICH = 2;
 
-
- 
-
-  for (i=0; i<MAX_NUM_PHICH; i++) {
-
-    phich = &eNB->phich_vars.config[i];
-    if (phich->active == 0 || phich->absSF != absSF)  continue;
-
+  if (eNB->phich_vars[subframe&1].num_hi > 0) {
     pusch_frame = phich_frame2_pusch_frame(frame_parms,proc->frame_tx,subframe);
     pusch_subframe = phich_subframe2_pusch_subframe(frame_parms,subframe);
     harq_pid = subframe2harq_pid(frame_parms,pusch_frame,pusch_subframe);
+  }
 
-    phich->active = 0;
+  for (i=0; i<eNB->phich_vars[subframe&1].num_hi; i++) {
+
+    phich = &eNB->phich_vars[subframe&1].config[i];
     
     ngroup_PHICH = (phich->first_rb +
 		    phich->n_DMRS)%Ngroup_PHICH;
@@ -778,6 +773,8 @@ void generate_phich_top(PHY_VARS_eNB *eNB,
 		   phich->hi,
 		   subframe,
 		   txdataF);
-  }
-
+  }//  for (i=0; i<eNB->phich_vars[subframe&1].num_hi; i++) { 
+  eNB->phich_vars[subframe&1].num_hi=0;
 }
+
+

openair1/SCHED/fapi_l1.c

@@ -96,8 +96,7 @@ void handle_nfapi_hi_dci0_dci_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_r
 void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,
                                  nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu)
 {
-  LTE_eNB_PHICH *phich = &eNB->phich_vars;
-  int i;
+  LTE_eNB_PHICH *phich = &eNB->phich_vars[subframe&1];
 
   // copy dci configuration in to eNB structure
   LOG_D(PHY,"Received HI PDU with value %d (rbstart %d,cshift %d)\n",
@@ -105,15 +104,9 @@ void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rx
         hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.resource_block_start,
         hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.cyclic_shift_2_for_drms);
 
-  // DJP - TODO FIXME - transmission power ignored
-  for (i=0;i<32;i++) if (phich->config[i].active==0) break;
-  AssertFatal(i<32,"no free PHICH allocation\n");
-
-  phich->config[i].active   = 0;
-  phich->config[i].absSF    = (frame*10)+subframe;
-  phich->config[i].hi       = hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.hi_value;
-  phich->config[i].first_rb = hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.resource_block_start;
-  phich->config[i].n_DMRS   = hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.cyclic_shift_2_for_drms;
+  phich->config[phich->num_hi].hi       = hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.hi_value;
+  phich->config[phich->num_hi].first_rb = hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.resource_block_start;
+  phich->config[phich->num_hi].n_DMRS   = hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.cyclic_shift_2_for_drms;
 }
 
 void handle_nfapi_bch_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,

targets/RT/USER/rfsim.c

@@ -62,7 +62,7 @@ sim_t sim;
 
 
 void init_ru_devices(void);
-void init_RU(const char*);
+void init_RU(const char*,clock_source_t clock_source,clock_source_t time_source,int send_dmrssync);
 void *rfsim_top(void *n_frames);
 
 void wait_RUs(void)
@@ -107,7 +107,7 @@ void RCConfig_sim(void) {
   
   printf("returned with %d rus\n",RC.nb_RU);
   
-  init_RU(NULL);
+  init_RU(NULL,internal,internal,0);
 
   printf("Waiting for RUs to get set up\n"); 
   wait_RUs();