fix part of warnings, some unused warnings wait for assign value in future

openair1/PHY/NBIoT_TRANSPORT/dci_NB_IoT.c

@@ -384,7 +384,7 @@ uint8_t generate_dci_top_NB_IoT(NB_IoT_eNB_NPDCCH_t		*npdcch,
 {
 
 
-  int      i=2, G=0;
+  int      i, G;
   //temporary variable
   uint16_t rnti[i];
   uint8_t  L = 0;

openair1/PHY/NBIoT_TRANSPORT/dci_tools_NB_IoT.c

@@ -480,7 +480,7 @@ uint8_t subframe2harq_pid_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,uint32_t fra
 
   uint8_t ret = 255;
 
-  if (frame_parms->frame_type == FDD) {
+  if (frame_parms->frame_type == FDD_NB_IoT) {
     ret = (((frame<<1)+subframe)&7);
   } else {
 

openair1/PHY/NBIoT_TRANSPORT/ulsch_decoding_NB_IoT.c

@@ -936,10 +936,10 @@ int ulsch_decoding_data_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,int UE_id,int harq_pid,i
   int G = ulsch_harq->G;
   unsigned int E;
 
-  uint8_t (*tc)(int16_t *y,
+  uint8_t (*tc)(int16_t *,
+                int16_t *,
+                uint8_t *,
                 uint8_t *,
-                uint16_t,
-                uint16_t,
                 uint16_t,
                 uint8_t,
                 uint8_t,
@@ -1038,9 +1038,9 @@ int ulsch_decoding_data_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,int UE_id,int harq_pid,i
    // start_meas(&eNB->ulsch_turbo_decoding_stats);
     
     ret = tc(&ulsch_harq->d[r][96],
-	     ulsch_harq->c[r],
-	     Kr,
-	     f1f2mat_old[iind*2],
+	     &ulsch_harq->c[r],
+	     &Kr,
+	     &f1f2mat_old[iind*2],
 	     f1f2mat_old[(iind*2)+1],
 	     ulsch->max_turbo_iterations,//MAX_TURBO_ITERATIONS,
 	     crc_type,

openair1/PHY/NBIoT_TRANSPORT/ulsch_demodulation_NB_IoT.c

@@ -1526,10 +1526,10 @@ uint32_t  turbo_decoding_NB_IoT(PHY_VARS_eNB_NB_IoT           *eNB,
           int            ret = 1;
           unsigned int   E; 
 
-          uint8_t (*tc)(int16_t *y,
+          uint8_t (*tc)(int16_t *,
+                        int16_t *,
+                        uint8_t *,
                         uint8_t *,
-                        uint16_t,
-                        uint16_t,
                         uint16_t,
                         uint8_t,
                         uint8_t,
@@ -1614,9 +1614,9 @@ uint32_t  turbo_decoding_NB_IoT(PHY_VARS_eNB_NB_IoT           *eNB,
               }
               // turbo decoding and CRC 
               ret = tc(&ulsch_harq->d[r][96],
-                       ulsch_harq->c[r],
-                       Kr,
-                       f1f2mat_old[iind*2],
+                       &ulsch_harq->c[r],
+                       &Kr,
+                       &f1f2mat_old[iind*2],
                        f1f2mat_old[(iind*2)+1],
                        ulsch_NB_IoT->max_turbo_iterations, // MAX_TURBO_ITERATIONS,
                        crc_type,

openair1/SCHED_NBIOT/IF_Module_L1_primitives_NB_IoT.c

@@ -62,14 +62,14 @@ void handle_nfapi_dlsch_pdu_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
 	NB_IoT_DL_eNB_HARQ_t *ndlsch_harq23;
 	nfapi_dl_config_ndlsch_pdu_rel13_t *rel13 = &dl_config_pdu->ndlsch_pdu.ndlsch_pdu_rel13;
 	int UE_id= -1;
-	int flag_malloc;
+	// int flag_malloc;
 	ndlsch= eNB->ndlsch_SIB1;
 	ndlsch23= eNB->ndlsch_SIB23;
 	
 //	if(flag_malloc) free (ndlsch->harq_process);
 
 //	ndlsch->harq_process = (NB_IoT_DL_eNB_HARQ_t*) malloc (sizeof(NB_IoT_DL_eNB_HARQ_t));
-	flag_malloc = 1 ;
+	// flag_malloc = 1 ;
   //Check for SI PDU since in NB-IoT there is no DCI for that
   //SIB1 (type 0), other DLSCH data (type 1) (include the SI messages) based on our ASSUMPTIONs
 

openair1/SCHED_NBIOT/phy_procedures_lte_eNb_NB_IoT.c

@@ -405,8 +405,8 @@ void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_
   //RX processing for ue-specific resources (i
   //NB_IoT_DL_FRAME_PARMS     *fp=&eNB->frame_parms_NB_IoT;
 
-  const int subframe    =   proc->subframe_rx;
-  const int frame       =   proc->frame_rx;
+  // const int subframe    =   proc->subframe_rx;
+  // const int frame       =   proc->frame_rx;
 
 
   npusch_procedures(eNB,proc);

targets/RT/USER/lte-enb.c

@@ -1166,7 +1166,7 @@ void init_eNB_proc(int inst) {
     }
 
     LOG_I(PHY,"eNBs.eNB->single_thread_flag:%d\n", eNBs.eNB->single_thread_flag);
-    
+
     if ((get_thread_parallel_conf() == PARALLEL_RU_L1_SPLIT) && NFAPI_MODE!=NFAPI_MODE_VNF) {
       pthread_create( &L1_proc->pthread, attr0, L1_thread, proc );
     } else if ((get_thread_parallel_conf() == PARALLEL_RU_L1_TRX_SPLIT) && NFAPI_MODE!=NFAPI_MODE_VNF) {
@@ -1216,14 +1216,11 @@ void init_eNB_proc(int inst) {
 void init_eNB_proc_NB_IoT(int inst) { //Ann create
   
   int i=0;
-  int CC_id;
   eNB_proc_NB_IoT_t *proc;
   eNB_rxtx_proc_NB_IoT_t *proc_rxtx;
-  pthread_attr_t *attr0=NULL,*attr1=NULL,*attr_FH=NULL,*attr_prach=NULL,*attr_asynch=NULL,*attr_single=NULL,*attr_fep=NULL,*attr_td=NULL,*attr_te=NULL,*attr_synch=NULL;
-
   eNBs.eNB_NB_IoT = RC.L1_NB_IoT[inst];//Ann
 #ifndef OCP_FRAMEWORK
-    LOG_I(PHY,"Initializing eNB_NB_IoT %d CC_id %d (%s,%s),\n",inst,CC_id,eNB_functions[eNBs.eNB_NB_IoT->node_function],eNB_timing[eNBs.eNB_NB_IoT->node_timing]);
+    LOG_I(PHY,"Initializing eNB_NB_IoT %d CC_id %d (%s,%s),\n",inst,0,eNB_functions[eNBs.eNB_NB_IoT->node_function],eNB_timing[eNBs.eNB_NB_IoT->node_timing]);
 #endif
     proc = &eNBs.eNB_NB_IoT->proc;//Ann
 
@@ -1233,7 +1230,7 @@ void init_eNB_proc_NB_IoT(int inst) { //Ann create
     proc->instance_cnt_prach       = -1;
     proc->instance_cnt_FH          = -1;
     proc->instance_cnt_asynch_rxtx = -1;
-    proc->CC_id = CC_id;    
+    proc->CC_id = 0;    
     proc->instance_cnt_synch        =  -1;
 
     proc->first_rx=1;
@@ -1241,43 +1238,6 @@ void init_eNB_proc_NB_IoT(int inst) { //Ann create
     proc->frame_offset = 0;
 
     for (i=0;i<10;i++) proc->symbol_mask[i]=0;
-
-    pthread_mutex_init( &proc_rxtx[0].mutex_rxtx, NULL);
-    pthread_mutex_init( &proc_rxtx[1].mutex_rxtx, NULL);
-    pthread_cond_init( &proc_rxtx[0].cond_rxtx, NULL);
-    pthread_cond_init( &proc_rxtx[1].cond_rxtx, NULL);
-
-    pthread_mutex_init( &proc->mutex_prach, NULL);
-    pthread_mutex_init( &proc->mutex_asynch_rxtx, NULL);
-    pthread_mutex_init( &proc->mutex_synch,NULL);
-
-    pthread_cond_init( &proc->cond_prach, NULL);
-    pthread_cond_init( &proc->cond_FH, NULL);
-    pthread_cond_init( &proc->cond_asynch_rxtx, NULL);
-    pthread_cond_init( &proc->cond_synch,NULL);
-
-    pthread_attr_init( &proc->attr_FH);
-    pthread_attr_init( &proc->attr_prach);
-    pthread_attr_init( &proc->attr_synch);
-    pthread_attr_init( &proc->attr_asynch_rxtx);
-    pthread_attr_init( &proc->attr_single);
-    pthread_attr_init( &proc->attr_fep);
-    pthread_attr_init( &proc->attr_td);
-    pthread_attr_init( &proc->attr_te);
-    pthread_attr_init( &proc_rxtx[0].attr_rxtx);
-    pthread_attr_init( &proc_rxtx[1].attr_rxtx);
-#ifndef DEADLINE_SCHEDULER
-    attr0       = &proc_rxtx[0].attr_rxtx;
-    attr1       = &proc_rxtx[1].attr_rxtx;
-    attr_FH     = &proc->attr_FH;
-    attr_prach  = &proc->attr_prach;
-    attr_synch  = &proc->attr_synch;
-    attr_asynch = &proc->attr_asynch_rxtx;
-    attr_single = &proc->attr_single;
-    attr_fep    = &proc->attr_fep;
-    attr_td     = &proc->attr_td;
-    attr_te     = &proc->attr_te; 
-#endif
 }
 
 /*!

targets/RT/USER/lte-softmodem.c

@@ -154,12 +154,10 @@ char channels[128] = "0";
 int                      rx_input_level_dBm;
 
 int                             otg_enabled;
-static int                      tx_max_power[MAX_NUM_CCs]; /* =  {0,0}*/;
 
 uint8_t exit_missed_slots=1;
 uint64_t num_missed_slots=0; // counter for the number of missed slots
 
-static LTE_DL_FRAME_PARMS      *frame_parms[MAX_NUM_CCs];
 
 node_function_t node_function[MAX_NUM_CCs];
 node_timing_t node_timing[MAX_NUM_CCs];
@@ -543,12 +541,11 @@ static  void wait_nfapi_init(char *thread_name) {
 }
 
 int main( int argc, char **argv ) {
-  int i,j,k,re;
+  int i;
   int CC_id;
   int ru_id;
   int node_type = ngran_eNB;
   uint8_t beta_ACK=0,beta_RI=0,beta_CQI=2;
-  PHY_VARS_UE *UE[MAX_NUM_CCs];
 
   if ( load_configmodule(argc,argv,0) == NULL) {
     exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
@@ -693,7 +690,7 @@ int main( int argc, char **argv ) {
 
             PHY_vars_eNB_NB_IoT_g[0][0]->rx_total_gain_dB = (int)rx_gain[0][0];
 
-            if (frame_parms_NB_IoT[0]->frame_type==FDD) {
+            if (frame_parms_NB_IoT[0]->frame_type==FDD_NB_IoT) {
                 PHY_vars_eNB_NB_IoT_g[0][0]->N_TA_offset = 0;
             } else {
                 if (frame_parms_NB_IoT[0]->N_RB_DL == 100)