delete some warning

openair1/SCHED_NR_UE/pucch_uci_ue_nr.c

@@ -447,7 +447,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
     return (FALSE);
   }
 
-  int max_code_rate = 0;
+  int max_code_rate = 0; 
   //int Q_m = BITS_PER_SYMBOL_QPSK; /* default pucch modulation type is QPSK with 2 bits per symbol */
   int N_sc_ctrl_RB = 0;
   int O_CRC = 0;

openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c

@@ -150,7 +150,7 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t
     rel15->BWPStart = NRRIV2PRBOFFSET(bwp_Common->genericParameters.locationAndBandwidth, 275); //NRRIV2PRBOFFSET(initialDownlinkBWP->genericParameters.locationAndBandwidth, 275);
     rel15->SubcarrierSpacing = initialDownlinkBWP->genericParameters.subcarrierSpacing;
     rel15->dci_length_options[0] = nr_dci_size(scc, mac->scg, def_dci_pdu_rel15, rel15->dci_format_options[0], NR_RNTI_TC, rel15->BWPSize, bwp_id);
-    LOG_D(PHY, "pdcch params: rnti %d, bwp %d %d (%d), len %d\n",rel15->rnti, rel15->BWPSize, rel15->BWPStart,initialDownlinkBWP->genericParameters.locationAndBandwidth,  rel15->dci_length_options[0]);
+    LOG_D(PHY, "pdcch params: rnti %d, bwp %d %d (%ld), len %d\n",rel15->rnti, rel15->BWPSize, rel15->BWPStart,initialDownlinkBWP->genericParameters.locationAndBandwidth,  rel15->dci_length_options[0]);
     break;
     case NR_RNTI_SP_CSI:
     break;

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -1672,7 +1672,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
         uint16_t TBS_bytes = ul_config_list->pusch_config_pdu.pusch_data.tb_size;
 
         uint16_t size_sdu = 0;
-        int CC_id;
+        // int CC_id; //Not used for the time being, comment temporarily
         uint8_t mac_sdus[MAX_NR_ULSCH_PAYLOAD_BYTES];
         uint8_t sdu_lcids[NB_RB_MAX] = {0};
         uint16_t sdu_lengths[NB_RB_MAX] = {0};
@@ -4740,7 +4740,7 @@ int nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
         pos+=1;
         dci_pdu_rel15->dmrs_sequence_initialization.val = (*dci_pdu>>(dci_size-pos))&0x1;
 #ifdef DEBUG_EXTRACT_DCI
-	      LOG_D(MAC,"dmrs_sequence_initialization %d (%d bits)=> %d (0x%lx)\n",dci_pdu_rel15->dmrs_sequence_initialization,3,dci_size-pos,*dci_pdu);
+	      LOG_D(MAC,"dmrs_sequence_initialization %u (%d bits)=> %d (0x%lx)\n",dci_pdu_rel15->dmrs_sequence_initialization,3,dci_size-pos,*dci_pdu);
 #endif 
         break;
       }

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -1007,10 +1007,10 @@ nr_generate_Msg4(module_id_t module_id,
   /* PREPROCESSOR */
    NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
   //NR_ServingCellConfigCommon_t *scc = cc->ServingCellConfigCommon;
-  int16_t rrc_sdu_length = 0;
-  uint16_t msg4_padding = 0;
-  uint16_t msg4_post_padding = 0;
-  uint16_t msg4_header = 0;
+  // int16_t rrc_sdu_length = 0;  //Not used for the time being, comment temporarily
+  // uint16_t msg4_padding = 0;   //Not used for the time being, comment temporarily
+  // uint16_t msg4_post_padding = 0;  //Not used for the time being, comment temporarily
+  // uint16_t msg4_header = 0;    //Not used for the time being, comment temporarily
   
   int UE_id = find_nr_UE_id_msg4(module_id, ra->rnti);
 

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -821,7 +821,7 @@ void nr_configure_pdcch(gNB_MAC_INST *nr_mac,
     pdcch_pdu->BWPStart = NRRIV2PRBOFFSET(scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth,275);
     pdcch_pdu->SubcarrierSpacing = scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.subcarrierSpacing;
     pdcch_pdu->CyclicPrefix = (scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.cyclicPrefix==NULL) ? 0 : scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.cyclicPrefix;
-    LOG_I(PHY, "initial dl bwp %d %d (%d)\n", pdcch_pdu->BWPSize, pdcch_pdu->BWPStart, scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth);
+    LOG_I(PHY, "initial dl bwp %d %d (%ld)\n", pdcch_pdu->BWPSize, pdcch_pdu->BWPStart, scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth);
     // first symbol
     //AssertFatal(pdcch_scs==kHz15, "PDCCH SCS above 15kHz not allowed if a symbol above 2 is monitored");
     sps = scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.cyclicPrefix == NULL ? 14 : 12;

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -436,4 +436,24 @@ int16_t ssb_index_from_prach(module_id_t module_idP,
 
 void find_SSB_and_RO_available(module_id_t module_idP);
 
+void nr_generate_Msg4(module_id_t module_id,
+                 int CC_id,
+                 frame_t frame,
+                 sub_frame_t slot,
+                 int num_slots_per_tdd,
+                 NR_RA_t *ra);
+
+void nr_check_Msg4_Ack(module_id_t module_id,
+                  int CC_id,
+                 frame_t frame,
+                 sub_frame_t slot,
+                 NR_RA_t *ra,
+                 int num_slots_per_tdd);
+
+int find_nr_UE_id_msg4(module_id_t mod_idP, rnti_t rntiP);
+
+uint8_t getN_PRB_DMRS(NR_BWP_Downlink_t *bwp, int numDmrsCdmGrpsNoData);
+
+nfapi_nr_dmrs_type_e getDmrsConfigType(NR_BWP_Downlink_t *bwp);
+
 #endif /*__LAYER2_NR_MAC_PROTO_H__*/

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -137,7 +137,7 @@ nr_rrc_data_ind_ccch(
 //------------------------------------------------------------------------------
 {
   rb_id_t    DCCH_index = Srb_id;
-  LOG_I(RRC, "[UE %x] Frame %d: received a CCCH %ld message on SRB %d with Size %d from gNB %d\n",
+  LOG_I(RRC, "[UE %x] Frame %d: received a CCCH %ld message on SRB %ld with Size %d from gNB %d\n",
         ctxt_pP->module_id, ctxt_pP->frame, DCCH_index,Srb_id,sdu_sizeP,  ctxt_pP->eNB_index);
   {
     MessageDef *message_p;
@@ -456,7 +456,7 @@ uint64_t pdcp_module_init(uint64_t _pdcp_optmask)
   }
   return pdcp_optmask ;
 }
-static int liuyu=0;
+// static int liuyu=0;  //Not used for the time being, comment temporarily
 static void deliver_sdu_drb(protocol_ctxt_t *ctxt_pP,void *_ue, nr_pdcp_entity_t *entity,
                             char *buf, int size)
 {
@@ -605,8 +605,8 @@ static void deliver_sdu_srb(protocol_ctxt_t *ctxt_pP, void *_ue, nr_pdcp_entity_
   /* Implementation to be added */
   
   nr_pdcp_ue_t *ue = _ue;
-  MessageDef  *message_p;
-  uint8_t     *gtpu_buffer_p;
+  // MessageDef  *message_p;  //Not used for the time being, comment temporarily
+  // uint8_t     *gtpu_buffer_p;  //Not used for the time being, comment temporarily
   int srb_id;
   int i;
 
@@ -622,7 +622,7 @@ static void deliver_sdu_srb(protocol_ctxt_t *ctxt_pP, void *_ue, nr_pdcp_entity_
   exit(1);
 
 rb_found:
-  nr_rrc_data_ind( ctxt_pP, srb_id, size, buf);
+  nr_rrc_data_ind( ctxt_pP, srb_id, size, (const uint8_t *const )buf);
  
   return;
 }

openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c

@@ -583,6 +583,7 @@ rb_found:
 #endif
 }
 
+#if 0   //Not used for the time being, comment temporarily
 static void add_srb(int rnti, struct LTE_SRB_ToAddMod *s)
 {
   nr_rlc_entity_t            *nr_rlc_am;
@@ -684,6 +685,7 @@ static void add_srb(int rnti, struct LTE_SRB_ToAddMod *s)
   }
   nr_rlc_manager_unlock(nr_rlc_ue_manager);
 }
+#endif
 
 static void add_drb_am(int rnti, struct NR_DRB_ToAddMod *s, NR_RLC_BearerConfig_t *rlc_BearerConfig)
 {
@@ -774,7 +776,7 @@ static void srb_add_drb_am(int rnti, struct NR_DRB_ToAddMod *s, NR_RLC_BearerCon
   struct NR_RLC_Config *r = rlc_BearerConfig->rlc_Config;
   struct NR_LogicalChannelConfig *l = rlc_BearerConfig->mac_LogicalChannelConfig;
   int srb_id = 1;
-  int channel_id = 1;//rlc_BearerConfig->logicalChannelIdentity;
+  // int channel_id = 1;//rlc_BearerConfig->logicalChannelIdentity; //Not used for the time being, comment temporarily
   int logical_channel_group;
 
   int t_status_prohibit;
@@ -906,6 +908,7 @@ static void add_drb_um(int rnti, struct NR_DRB_ToAddMod *s, NR_RLC_BearerConfig_
   }
   nr_rlc_manager_unlock(nr_rlc_ue_manager);
 }
+#if 0 //Not used for the time being, comment temporarily
 static void srb_add_drb_um(int rnti, struct NR_DRB_ToAddMod *s, NR_RLC_BearerConfig_t *rlc_BearerConfig)
 {
   nr_rlc_entity_t            *nr_rlc_um;
@@ -914,7 +917,7 @@ static void srb_add_drb_um(int rnti, struct NR_DRB_ToAddMod *s, NR_RLC_BearerCon
   struct NR_RLC_Config *r = rlc_BearerConfig->rlc_Config;
   struct NR_LogicalChannelConfig *l = rlc_BearerConfig->mac_LogicalChannelConfig;
   int srb_id = 1;
-  int channel_id = rlc_BearerConfig->logicalChannelIdentity;
+  // int channel_id = rlc_BearerConfig->logicalChannelIdentity; //Not used for the time being, comment temporarily
   int logical_channel_group;
 
   int sn_field_length;
@@ -975,6 +978,7 @@ static void srb_add_drb_um(int rnti, struct NR_DRB_ToAddMod *s, NR_RLC_BearerCon
   }
   nr_rlc_manager_unlock(nr_rlc_ue_manager);
 }
+#endif
 
 static void add_drb(int rnti, struct NR_DRB_ToAddMod *s, struct NR_RLC_BearerConfig *rlc_BearerConfig)
 {

openair2/RRC/NR_UE/L2_interface_ue.c

@@ -49,7 +49,7 @@ nr_mac_rrc_data_ind_ue(
     const uint8_t*        pduP,
     const sdu_size_t      pdu_len){
     sdu_size_t      sdu_size = 0;
-    protocol_ctxt_t ctxt;
+    // protocol_ctxt_t ctxt;  //Not used for the time being, comment temporarily
 
     switch(channel){
         case NR_BCCH_BCH:
@@ -57,7 +57,7 @@ nr_mac_rrc_data_ind_ue(
             break;
         case CCCH:
              if (pdu_len>0) {
-                LOG_T(RRC,"[UE %d] Received SDU for CCCH on SRB %ld from gNB %d\n",module_id,channel & RAB_OFFSET,gNB_index);
+                LOG_T(RRC,"[UE %d] Received SDU for CCCH on SRB %u from gNB %d\n",module_id,channel & RAB_OFFSET,gNB_index);
                 {
                   MessageDef *message_p;
                   int msg_sdu_size = CCCH_SDU_SIZE;