debug openair1 error

openair1/PHY/INIT/lte_init.c

@@ -34,6 +34,8 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "assertions.h"
 #include <math.h>
+//NB-IoT
+#include "openair2/ENB_APP/NB_IoT_config.c"
 
 extern uint32_t from_earfcn(int eutra_bandP,uint32_t dl_earfcn);
 extern int32_t get_uldl_offset(int eutra_bandP);
@@ -84,7 +86,7 @@ l1_north_init_eNB ()
   return(0);
 }
 
-//Check with Raymond. (The question is that where to initialize RC.eNB (RC.eNB_NB_IoT) ulsim.c & dlsim.c?)
+//for NB-IoT layer1 to get informstion from layer2
 int
 l1_north_init_NB_IoT()
 {
@@ -96,7 +98,7 @@ l1_north_init_NB_IoT()
     LOG_I(PHY,"RC.L1_NB_IoT = %p\n",RC.L1_NB_IoT);
 
     for (j=0; j<NbIoT_L1_ParamList.numelt; j++) {
-      AssertFatal(RC.L1_NB_IoT[j]!=NULL,"RC.eNB_NB_IoT[%d] is null\n",i);
+      AssertFatal(RC.L1_NB_IoT[j]!=NULL,"RC.eNB_NB_IoT[%d] is null\n",j);
       LOG_I(PHY,"RC.L1_NB_IoT = %p\n",RC.L1_NB_IoT);
 
 

openair1/PHY/INIT/lte_init_NB_IoT.c

@@ -428,41 +428,41 @@ void phy_config_dedicated_eNB_NB_IoT(uint8_t 			Mod_id,
 	
 }
 
-// void phy_init_lte_top_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms)
-// {
-
-// //   crcTableInit();
-
-// //   ccodedot11_init();
-// //   ccodedot11_init_inv();
+void phy_init_lte_top_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms)
+{
 
-// //   ccodelte_init();
-// //   ccodelte_init_inv();
+  crcTableInit_NB_IoT();
 
-// //   treillis_table_init();
+  //ccodedot11_init();
+  //ccodedot11_init_inv();
+  ccodelte_init_NB_IoT();
+  ccodelte_init2_NB_IoT();
+  //ccodelte_init_inv();
 
-// //   phy_generate_viterbi_tables();
-// //   phy_generate_viterbi_tables_lte();
+  //treillis_table_init();
 
-// //   init_td8();
-// //   init_td16();
-// // #ifdef __AVX2__
-// //   init_td16avx2();
-// // #endif
+  //phy_generate_viterbi_tables();
+  //phy_generate_viterbi_tables_lte();
 
-// //   lte_sync_time_init(frame_parms);
+  //init_td8();
+ // init_td16();
+#ifdef __AVX2__
+ // init_td16avx2();
+#endif
 
-// //   generate_ul_ref_sigs();
-//   generate_ul_ref_sigs_rx_NB_IoT();
+  //lte_sync_time_init_NB_IoT(frame_parms);
 
-//   // generate_64qam_table();
-//   // generate_16qam_table();
-//   // generate_RIV_tables();
+  //generate_ul_ref_sigs();
+  //generate_ul_ref_sigs_rx();
+  generate_ul_ref_sigs_rx_NB_IoT();
 
-//   // init_unscrambling_lut();
-//   // init_scrambling_lut();
-//   // //set_taus_seed(1328);
+ // generate_64qam_table();
+  //generate_16qam_table();
+ // generate_RIV_tables();
 
-// }
+ init_unscrambling_lut_NB_IoT();
+ // init_scrambling_lut();
 
+  //set_taus_seed(1328);
 
+}

openair1/PHY/INIT/phy_init.h

@@ -24,6 +24,8 @@
 
 #include "PHY/defs_eNB.h"
 #include "PHY/defs_UE.h"
+#include "PHY/impl_defs_lte_NB_IoT.h"
+#include "PHY/defs_NB_IoT.h"
 
 
 #include "LTE_SystemInformationBlockType2.h"

openair1/PHY/LTE_TRANSPORT/dlsch_coding.c

@@ -487,12 +487,12 @@ void *te_thread(void *param) {
     /*if(opp_enabled == 1 && te_wakeup_stats0->p_time>50*3000){
       print_meas_now(te_wakeup_stats0,"coding_wakeup",stderr);
       printf("te_thread0 delay for waking up in frame_rx: %d  subframe_rx: %d \n",proc->frame_rx,proc->subframe_rx);
-    }*/
+    }
   }
 
   return(NULL);
 }
-
+*/
 
 
 int dlsch_encoding_2threads(PHY_VARS_eNB *eNB,

openair1/PHY/LTE_TRANSPORT/pbch.c

@@ -48,8 +48,6 @@
 //#define INTERFERENCE_MITIGATION 1
 
 
-#include "PHY/LTE_REFSIG/defs.h"
-
 #define PBCH_A 24
 
 int allocate_pbch_REs_in_RB(LTE_DL_FRAME_PARMS *frame_parms,

openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h

@@ -161,15 +161,6 @@ int32_t dlsch_encoding_SIC(PHY_VARS_UE *ue,
     @param i_stats Time statistics for interleaving
     @returns status
 */
-int32_t dlsch_encoding_2threads(PHY_VARS_eNB *eNB,
-                                uint8_t *a,
-                                uint8_t num_pdcch_symbols,
-                                LTE_eNB_DLSCH_t *dlsch,
-                                int frame,
-                                uint8_t subframe,
-                                time_stats_t *rm_stats,
-                                time_stats_t *te_stats,
-                                time_stats_t *i_stats);
 
 void dlsch_encoding_emul(PHY_VARS_eNB *phy_vars_eNB,
                          uint8_t *DLSCH_pdu,
@@ -290,13 +281,6 @@ int32_t allocate_REs_in_RB(PHY_VARS_eNB* phy_vars_eNB,
     @param dlsch0 Pointer to Transport Block 0 DLSCH descriptor for this allocation
     @param dlsch1 Pointer to Transport Block 0 DLSCH descriptor for this allocation
 */
-int32_t dlsch_modulation(PHY_VARS_eNB* phy_vars_eNB,
-                         int32_t **txdataF,
-                         int16_t amp,
-                         uint32_t sub_frame_offset,
-                         uint8_t num_pdcch_symbols,
-                         LTE_eNB_DLSCH_t *dlsch0,
-                         LTE_eNB_DLSCH_t *dlsch1);
 
 int32_t dlsch_modulation_SIC(int32_t **sic_buffer,
                              uint32_t sub_frame_offset,
@@ -324,7 +308,7 @@ int mch_modulation(int32_t **txdataF,
     @param abstraction_flag
 
 */
-void generate_mch(PHY_VARS_eNB *phy_vars_eNB,eNB_rxtx_proc_NB_IoT_t *proc,uint8_t *a);
+//void generate_mch(PHY_VARS_eNB *phy_vars_eNB,eNB_rxtx_proc_NB_IoT_t *proc,uint8_t *a);
 
 /** \brief This function generates the frequency-domain pilots (cell-specific downlink reference signals)
     @param phy_vars_eNB Pointer to eNB variables
@@ -400,10 +384,12 @@ int32_t generate_pilots_slot(PHY_VARS_eNB *phy_vars_eNB,
                              uint16_t slot,
                              int first_pilot_only);
 
+/*
 int32_t generate_mbsfn_pilot(PHY_VARS_eNB *phy_vars_eNB,
                              eNB_rxtx_proc_NB_IoT_t *proc,
                              int32_t **txdataF,
                              int16_t amp);
+*/
 
 void generate_ue_spec_pilots(PHY_VARS_eNB *phy_vars_eNB,
                              uint8_t UE_id,