error fixed, code compiles, not yet ready for testing (56 warnings)

openair1/PHY/LTE_TRANSPORT/dlsch_demodulation_NB_IoT.c

@@ -4067,7 +4067,7 @@ unsigned short dlsch_extract_rbs_single_NB_IoT(int **rxdataF,
 
   unsigned short  rb,nb_rb=0;
   unsigned char   rb_alloc_ind;
-  unsigned char   i,aarx=0/*,l,nsymb /*,skip_half=0,sss_symb,pss_symb=0*/;
+  unsigned char   i,aarx=0;/*,l,nsymb /*,skip_half=0,sss_symb,pss_symb=0*/
   int             *dl_ch0,*dl_ch0_ext,*rxF,*rxF_ext;
   unsigned short  UL_RB_ID_NB_IoT; // index of the NB-IoT RB
   uint8_t         id_offset; // offset of pilot position in symbols: 0,1,2 

openair1/PHY/LTE_TRANSPORT/ulsch_decoding_NB_IoT.c

@@ -824,7 +824,7 @@ int ulsch_decoding_data_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,int UE_id,int harq_pid,i
         ulsch_harq->Nl);
 #endif
 
-    start_meas(&eNB->ulsch_rate_unmatching_stats);
+    //start_meas(&eNB->ulsch_rate_unmatching_stats);
 
     if (lte_rate_matching_turbo_rx(ulsch_harq->RTC[r],
                                    G,
@@ -845,21 +845,21 @@ int ulsch_decoding_data_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,int UE_id,int harq_pid,i
       return(-1);
     }
 
-    stop_meas(&eNB->ulsch_rate_unmatching_stats);
+   // stop_meas(&eNB->ulsch_rate_unmatching_stats);
     r_offset += E;
 
-    start_meas(&eNB->ulsch_deinterleaving_stats);
+   // start_meas(&eNB->ulsch_deinterleaving_stats);
     sub_block_deinterleaving_turbo(4+Kr,
                                    &ulsch_harq->d[r][96],
                                    ulsch_harq->w[r]);
-    stop_meas(&eNB->ulsch_deinterleaving_stats);
+   // stop_meas(&eNB->ulsch_deinterleaving_stats);
 
     if (ulsch_harq->C == 1)
       crc_type = CRC24_A;
     else
       crc_type = CRC24_B;
    
-    start_meas(&eNB->ulsch_turbo_decoding_stats);
+   // start_meas(&eNB->ulsch_turbo_decoding_stats);
     
     ret = tc(&ulsch_harq->d[r][96],
 	     ulsch_harq->c[r],
@@ -877,7 +877,7 @@ int ulsch_decoding_data_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,int UE_id,int harq_pid,i
 	     &eNB->ulsch_tc_intl1_stats,
 	     &eNB->ulsch_tc_intl2_stats);
     
-    stop_meas(&eNB->ulsch_turbo_decoding_stats);
+   // stop_meas(&eNB->ulsch_turbo_decoding_stats);
     
   // Reassembly of Transport block here
 

openair1/PHY/extern_NB_IoT.h

@@ -50,8 +50,8 @@ extern NB_IoT_DL_FRAME_PARMS *nb_iot_frame_parms_g;
 #else
 #define MAX_UE 10
 #define MAX_eNB_NB_IoT 20
-extern PHY_VARS_UE_NB_IoT * PHY_vars_UE_NB_IoT_g[MAX_UE][MAX_NUM_CCs];
-extern PHY_VARS_eNB_NB_IoT * PHY_vars_eNB_NB_IoT_g[MAX_eNB_NB_IoT][MAX_NUM_CCs];
+extern PHY_VARS_UE_NB_IoT *PHY_vars_UE_NB_IoT_g[MAX_UE][MAX_NUM_CCs];
+extern PHY_VARS_eNB_NB_IoT *PHY_vars_eNB_NB_IoT_g[MAX_eNB_NB_IoT][MAX_NUM_CCs];
 #endif
 
 

openair1/SCHED/phy_procedures_lte_common_NB_IoT.c

@@ -12,6 +12,7 @@
 */
 #include "PHY/defs_NB_IoT.h"
 #include "PHY/extern_NB_IoT.h"
+#include "PHY/vars_NB_IoT.h"
 //#include "SCHED/defs_nb_iot.h"
 //#include "SCHED/extern.h"
 
@@ -1108,10 +1109,10 @@ int8_t find_ue_NB_IoT(uint16_t rnti, PHY_VARS_eNB_NB_IoT *eNB)
   return(-1);
 }
 
-NB_IoT_DL_FRAME_PARMS* get_NB_IoT_frame_parms(module_id_t Mod_id, uint8_t  CC_id)
+NB_IoT_DL_FRAME_PARMS *get_NB_IoT_frame_parms(module_id_t Mod_id, uint8_t  CC_id)
 {
 
-  return(&PHY_vars_eNB_NB_IoT_g[Mod_id][CC_id]->frame_parms);
+  return(&PHY_vars_eNB_NB_IoT_g[Mod_id][CC_id]->frame_parms_NB_IoT);
 
 }