fixing some warnings

executables/nr-softmodem.c

@@ -679,7 +679,7 @@ void wait_RUs(void) {
 }
 
 void wait_gNBs(void) {
-  int i,j;
+  int i;
   int waiting=1;
 
   while (waiting==1) {
@@ -854,7 +854,7 @@ void init_pdcp(void) {
 
 int main( int argc, char **argv )
 {
-  int i, ru_id, CC_id = 0;
+  int ru_id, CC_id = 0;
   start_background_system();
 
   ///static configuration for NR at the moment

openair1/PHY/NR_UE_TRANSPORT/dci_nr.c

@@ -39,6 +39,7 @@
 #include "PHY/phy_extern_nr_ue.h"
 #include "PHY/CODING/coding_extern.h"
 #include "PHY/sse_intrin.h"
+#include "PHY/NR_TRANSPORT/nr_dci.h"
 
 #include "assertions.h"
 #include "T.h"
@@ -725,52 +726,52 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
 				    s,
 				    log2_maxh,
 				    n_rb); // log2_maxh+I0_shift
-    if (frame_parms->nb_antennas_rx > 1) {
-      LOG_DD("we enter pdcch_detection_mrc(frame_parms->nb_antennas_rx=%d)\n",
-             frame_parms->nb_antennas_rx);
-      pdcch_detection_mrc(frame_parms, pdcch_vars->rxdataF_comp,s);
-    }
+      if (frame_parms->nb_antennas_rx > 1) {
+        LOG_DD("we enter pdcch_detection_mrc(frame_parms->nb_antennas_rx=%d)\n",
+               frame_parms->nb_antennas_rx);
+        pdcch_detection_mrc(frame_parms, pdcch_vars->rxdataF_comp,s);
+      }
 
-    LOG_DD("we enter nr_pdcch_llr(for symbol %d), pdcch_vars[eNB_id]->rxdataF_comp ---> pdcch_vars[eNB_id]->llr \n",s);
-    LOG_DD("in nr_pdcch_llr(rxdataF_comp -> llr)\n");
-    nr_pdcch_llr(frame_parms,
-                 pdcch_vars->rxdataF_comp,
-                 pdcch_vars->llr,
-                 s,
-                 n_rb);
+      LOG_DD("we enter nr_pdcch_llr(for symbol %d), pdcch_vars[eNB_id]->rxdataF_comp ---> pdcch_vars[eNB_id]->llr \n",s);
+      LOG_DD("in nr_pdcch_llr(rxdataF_comp -> llr)\n");
+      nr_pdcch_llr(frame_parms,
+                   pdcch_vars->rxdataF_comp,
+                   pdcch_vars->llr,
+                   s,
+                   n_rb);
 #if T_TRACER
     
-    //  T(T_UE_PHY_PDCCH_IQ, T_INT(frame_parms->N_RB_DL), T_INT(frame_parms->N_RB_DL),
-    //  T_INT(n_pdcch_symbols),
-    //  T_BUFFER(pdcch_vars[eNB_id]->rxdataF_comp, frame_parms->N_RB_DL*12*n_pdcch_symbols* 4));
+      //  T(T_UE_PHY_PDCCH_IQ, T_INT(frame_parms->N_RB_DL), T_INT(frame_parms->N_RB_DL),
+      //  T_INT(n_pdcch_symbols),
+      //  T_BUFFER(pdcch_vars[eNB_id]->rxdataF_comp, frame_parms->N_RB_DL*12*n_pdcch_symbols* 4));
     
 #endif
 #ifdef DEBUG_DCI_DECODING
-    printf("demapping: slot %d, mi %d\n",slot,get_mi(frame_parms,slot));
+      printf("demapping: slot %d, mi %d\n",slot,get_mi(frame_parms,slot));
 #endif
-  }
-
-  LOG_DD("we enter nr_pdcch_demapping_deinterleaving()\n");
-  nr_pdcch_demapping_deinterleaving((uint32_t *) pdcch_vars->llr,
-                                    (uint32_t *) pdcch_vars->e_rx,
-                                    frame_parms,
-                                    rel15->coreset.duration,
-                                    n_rb,
-                                    rel15->coreset.RegBundleSize,
-                                    rel15->coreset.InterleaverSize,
-                                    rel15->coreset.ShiftIndex);
-  nr_pdcch_unscrambling(rel15->rnti,
-                        frame_parms,
-                        slot,
-                        pdcch_vars->e_rx,
-                        rel15->coreset.duration*n_rb*9*2,
-                        // get_nCCE(n_pdcch_symbols, frame_parms, mi) * 72,
-                        rel15->coreset.pdcch_dmrs_scrambling_id);
-  LOG_DD("we end nr_pdcch_unscrambling()\n");
-  LOG_DD("Ending nr_rx_pdcch() function\n");
-  return (0);
     }
 
+    LOG_DD("we enter nr_pdcch_demapping_deinterleaving()\n");
+    nr_pdcch_demapping_deinterleaving((uint32_t *) pdcch_vars->llr,
+                                      (uint32_t *) pdcch_vars->e_rx,
+                                      frame_parms,
+                                      rel15->coreset.duration,
+                                      n_rb,
+                                      rel15->coreset.RegBundleSize,
+                                      rel15->coreset.InterleaverSize,
+                                      rel15->coreset.ShiftIndex);
+    nr_pdcch_unscrambling(rel15->rnti,
+                          frame_parms,
+                          slot,
+                          pdcch_vars->e_rx,
+                          rel15->coreset.duration*n_rb*9*2,
+                          // get_nCCE(n_pdcch_symbols, frame_parms, mi) * 72,
+                          rel15->coreset.pdcch_dmrs_scrambling_id);
+    LOG_DD("we end nr_pdcch_unscrambling()\n");
+    LOG_DD("Ending nr_rx_pdcch() function\n");
+
+  }
+  return (0);
 }
   /*
 int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -138,12 +138,12 @@ void nr_ue_send_sdu(module_id_t module_idP, uint8_t CC_id, frame_t frameP, sub_f
 
 void ue_dci_configuration(NR_UE_MAC_INST_t *mac,fapi_nr_dl_config_request_t *dl_config,int frame,int slot);
 
-int nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
-			int dci_format,
-			uint8_t dci_length,
-			uint16_t rnti,
-			uint64_t *dci_pdu,
-			nr_dci_pdu_rel15_t *nr_pdci_info_extracted);
+void nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
+	 		 int dci_format,
+		 	 uint8_t dci_length,
+			 uint16_t rnti,
+			 uint64_t *dci_pdu,
+			 nr_dci_pdu_rel15_t *nr_pdci_info_extracted);
 
 
 int set_tdd_config_nr_ue(fapi_nr_config_request_t *cfg, int mu,

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -1651,16 +1651,12 @@ uint8_t table_7_3_2_3_3_4_twoCodeword[6][10] = {
   {2,0,1,2,3,6,7,8,0,2},
   {2,0,1,2,3,6,7,8,9,2}
 };
-int8_t nr_ue_process_dci_freq_dom_resource_assignment(
-						      fapi_nr_ul_config_pusch_pdu_rel15_t *ulsch_config_pdu,
+int8_t nr_ue_process_dci_freq_dom_resource_assignment(fapi_nr_ul_config_pusch_pdu_rel15_t *ulsch_config_pdu,
 						      fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu,
 						      uint16_t n_RB_ULBWP,
 						      uint16_t n_RB_DLBWP,
 						      uint16_t riv
 						      ){
-  uint16_t l_RB;
-  uint16_t start_RB;
-  uint16_t tmp_RIV;
 
   /*
    * TS 38.214 subclause 5.1.2.2 Resource allocation in frequency domain (downlink)
@@ -3039,12 +3035,12 @@ nr_ue_send_sdu(module_id_t module_idP,
 }
 
 
-int nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
-			int dci_format,
-			uint8_t dci_size,
-			uint16_t rnti,
-			uint64_t *dci_pdu,
-			nr_dci_pdu_rel15_t *dci_pdu_rel15) {
+void nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
+			 int dci_format,
+			 uint8_t dci_size,
+			 uint16_t rnti,
+			 uint64_t *dci_pdu,
+			 nr_dci_pdu_rel15_t *dci_pdu_rel15) {
   int rnti_type=-1;
 
   if       (rnti == mac->ra_rnti) rnti_type = NR_RNTI_RA;

openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c

@@ -732,9 +732,9 @@ int16_t fill_dmrs_mask(NR_PDSCH_Config_t *pdsch_Config,int dmrs_TypeA_Position,i
 	AssertFatal(NrOfSymbols>3,"Illegal NrOfSymbols %d for len2 DMRS\n",NrOfSymbols);
 	if (NrOfSymbols < 10) return(1<<l0);
 	if (NrOfSymbols < 13 && *dmrs_config->dmrs_AdditionalPosition==NR_DMRS_DownlinkConfig__dmrs_AdditionalPosition_pos0) return(1<<l0);
-	if (NrOfSymbols < 13 && *dmrs_config->dmrs_AdditionalPosition!=NR_DMRS_DownlinkConfig__dmrs_AdditionalPosition_pos0) return(1<<l0 || 1<<8);
+	if (NrOfSymbols < 13 && *dmrs_config->dmrs_AdditionalPosition!=NR_DMRS_DownlinkConfig__dmrs_AdditionalPosition_pos0) return(1<<l0 | 1<<8);
 	if (*dmrs_config->dmrs_AdditionalPosition!=NR_DMRS_DownlinkConfig__dmrs_AdditionalPosition_pos0) return(1<<l0);
-	if (*dmrs_config->dmrs_AdditionalPosition!=NR_DMRS_DownlinkConfig__dmrs_AdditionalPosition_pos1) return(1<<l0 || 1<<10);
+	if (*dmrs_config->dmrs_AdditionalPosition!=NR_DMRS_DownlinkConfig__dmrs_AdditionalPosition_pos1) return(1<<l0 | 1<<10);
       }
     }
     else if (pdsch_Config->dmrs_DownlinkForPDSCH_MappingTypeB &&

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -155,8 +155,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
       LOG_D(MAC,">>>NR_IF_Module i=%d, dl_info->dci_ind->number_of_dcis=%d\n",i,dl_info->dci_ind->number_of_dcis);
       //      fapi_nr_dci_pdu_rel15_t *dci = &dl_info->dci_ind->dci_list[i].dci;
 
-      ret_mask |= (handle_dci(
-			      dl_info->module_id,
+      ret_mask |= (handle_dci(dl_info->module_id,
 			      dl_info->cc_id,
 			      dl_info->gNB_index,
 			      dl_info->dci_ind->dci_list+i)<< FAPI_NR_DCI_IND);

openair2/RRC/NR/rrc_gNB.c

@@ -259,7 +259,6 @@ static void init_NR_SI(gNB_RRC_INST *rrc) {
 
 char openair_rrc_gNB_configuration(const module_id_t gnb_mod_idP, gNB_RrcConfigurationReq *configuration) {
   protocol_ctxt_t      ctxt;
-  int                  CC_id;
 
   gNB_RRC_INST         *rrc=RC.nrrrc[gnb_mod_idP];
 
@@ -284,7 +283,7 @@ char openair_rrc_gNB_configuration(const module_id_t gnb_mod_idP, gNB_RrcConfigu
   
   rrc->carrier.Srb0.Active = 0;
 
-  uid_linear_allocator_init(&rrc->uid_allocator);
+  nr_uid_linear_allocator_init(&rrc->uid_allocator);
   RB_INIT(&rrc->rrc_ue_head);
   rrc->initial_id2_s1ap_ids = hashtable_create (NUMBER_OF_UE_MAX * 2, NULL, NULL);
   rrc->s1ap_id2_s1ap_ids    = hashtable_create (NUMBER_OF_UE_MAX * 2, NULL, NULL);

openair2/RRC/NR/rrc_gNB_UE_context.c

@@ -169,13 +169,13 @@ rrc_gNB_get_ue_context(
   }
 }
 
-rrc_gNB_free_mem_UE_context(
+void rrc_gNB_free_mem_UE_context(
   const protocol_ctxt_t               *const ctxt_pP,
   struct rrc_gNB_ue_context_s         *const ue_context_pP
 )
 //-----------------------------------------------------------------------------
 {
-  int i;
+
   LOG_T(RRC,
         PROTOCOL_RRC_CTXT_UE_FMT" Clearing UE context 0x%p (free internal structs)\n",
         PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),

openair2/RRC/NR/rrc_gNB_internode.c

@@ -53,7 +53,7 @@ int parse_CG_ConfigInfo(gNB_RRC_INST *rrc, NR_CG_ConfigInfo_t *CG_ConfigInfo) {
 						cg_ConfigInfo->ue_CapabilityInfo->buf,
 						cg_ConfigInfo->ue_CapabilityInfo->size, 0, 0);
           if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
-	    AssertFatal(1==0,"[InterNode] Failed to decode NR_UE_CapabilityRAT_ContainerList (%zu bits), size of OCTET_STRING %d\n",
+	    AssertFatal(1==0,"[InterNode] Failed to decode NR_UE_CapabilityRAT_ContainerList (%zu bits), size of OCTET_STRING %lu\n",
 			dec_rval.consumed, cg_ConfigInfo->ue_CapabilityInfo->size);
 	  }
 	  rrc_parse_ue_capabilities(rrc,UE_CapabilityRAT_ContainerList);