fix warnings and rebase problems

openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c

@@ -311,7 +311,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
 
   int16_t  z [68*384];
   int8_t   l [68*384];
-  uint8_t  kc;
+  uint8_t  kc=0;
   uint8_t  Ilbrm        = 0;
   uint32_t Tbslbrm     = 950984;
   double   Coderate    = 0.0;
@@ -397,7 +397,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
       kc = 27;
     }
   }
-
+  AssertFatal(kc>0,"kc=%i has not been set to a consistent value",kc);
     // [hna] Perform nr_segmenation with input and output set to NULL to calculate only (B, C, K, Z, F)
     nr_segmentation(NULL,
                     NULL,

openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c

@@ -205,10 +205,10 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
   unsigned int pilot_cnt;
   int16_t ch[2],*pil,*rxF,*dl_ch,*fl,*fm,*fr;
   int ch_offset,symbol_offset;
-  int slot_pbch;
-  fapi_nr_pbch_config_t *pbch_config = &ue->nrUE_config.pbch_config;
+  //int slot_pbch;
+  //fapi_nr_pbch_config_t *pbch_config = &ue->nrUE_config.pbch_config;
   // initialized to 5ms in nr_init_ue for scenarios where UE is not configured (otherwise acquired by cell configuration from gNB or LTE)
-  uint8_t ssb_periodicity = 10;// ue->ssb_periodicity;
+  //uint8_t ssb_periodicity = 10;// ue->ssb_periodicity;
 
   //uint16_t Nid_cell = (eNB_offset == 0) ? ue->frame_parms.Nid_cell : ue->measurements.adj_cell_id[eNB_offset-1];
 
@@ -445,7 +445,7 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
 
     default:
       printf("unsupported ofdm symbol size \n");
-      assert(0);
+      abort();
     }
 
     if( symbol == 3)

openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c

@@ -124,7 +124,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
     ulsch_ue->length_dmrs = length_dmrs;
     ulsch_ue->rnti        = n_rnti;
     ulsch_ue->Nid_cell    = Nid_cell;
-    ulsch_ue->nb_re_dmrs  = UE->dmrs_UplinkConfig.pusch_maxLength*(UE->dmrs_UplinkConfig.pusch_dmrs_type == pusch_dmrs_type1)?6:4;
+    ulsch_ue->nb_re_dmrs  = UE->dmrs_UplinkConfig.pusch_maxLength*((UE->dmrs_UplinkConfig.pusch_dmrs_type == pusch_dmrs_type1)?6:4);
 
     N_RE_prime = NR_NB_SC_PER_RB*harq_process_ul_ue->number_of_symbols - ulsch_ue->nb_re_dmrs - N_PRB_oh;
 

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -441,10 +441,10 @@ int8_t nr_ue_decode_mib(
         float big_o;
         float big_m;
         uint32_t temp;
-        SFN_C_TYPE sfn_c;   //  only valid for mux=1
-        uint32_t n_c;
-        uint32_t number_of_search_space_per_slot;
-        uint32_t first_symbol_index;
+        SFN_C_TYPE sfn_c=0;   //  only valid for mux=1
+        uint32_t n_c=0;
+        uint32_t number_of_search_space_per_slot=0;
+        uint32_t first_symbol_index=0;
         uint32_t search_space_duration;  //  element of search space
         uint32_t coreset_duration;  //  element of coreset