From 04eed3bd6e6a80fcd37d21f5172700a179633186 Mon Sep 17 00:00:00 2001 From: Cedric Roux <cedric.roux@eurecom.fr> Date: Fri, 25 Mar 2016 23:58:58 +0100 Subject: [PATCH] remove "unused variable" and "set but not used" warnings --- cmake_targets/tools/fix_asn1 | 4 ++-- common/utils/collection/hashtable/hashtable.c | 1 - openair1/PHY/INIT/lte_init.c | 8 ++++---- openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c | 4 ++-- openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c | 2 +- openair1/SCHED/phy_mac_stub.c | 6 +++--- openair1/SCHED/phy_procedures_lte_eNb.c | 3 +++ openair1/SCHED/pucch_pc.c | 10 +++++----- openair2/ENB_APP/enb_config.c | 4 ++-- openair2/LAYER2/MAC/eNB_scheduler_dlsch.c | 10 +++++----- openair2/LAYER2/MAC/eNB_scheduler_primitives.c | 2 +- openair2/LAYER2/MAC/pre_processor.c | 6 +++--- openair2/LAYER2/PDCP_v10.1.0/pdcp.c | 2 ++ openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c | 3 +++ openair2/LAYER2/RLC/rlc_rrc.c | 2 +- openair2/LAYER2/openair2_proc.c | 2 +- openair2/RRC/LITE/rrc_UE.c | 2 ++ openair2/RRC/LITE/rrc_common.c | 5 ++++- openair2/RRC/LITE/rrc_eNB.c | 14 +++++++------- openair2/RRC/LITE/rrc_eNB_GTPV1U.c | 1 + openair2/RRC/LITE/rrc_eNB_S1AP.c | 6 +++--- openair2/UTIL/OMG/common.c | 9 ++------- openair2/UTIL/OMG/omg.c | 2 +- openair2/UTIL/OMG/steadystaterwp.c | 6 +++--- openair2/UTIL/OMG/trace.c | 4 ++-- openair2/UTIL/OMG/trace_hashtable.c | 2 -- openair2/UTIL/OSA/osa_stream_eea.c | 2 -- openair3/GTPV1-U/gtpv1u_eNB.c | 7 ++++--- openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.c | 4 ++-- openair3/NAS/UE/EMM/EmmStatusHdl.c | 2 +- openair3/NAS/UE/EMM/LowerLayer.c | 2 +- openair3/NAS/UE/EMM/SAP/emm_fsm.c | 2 +- openair3/NAS/UE/ESM/esm_ebr_context.c | 12 +++++++----- openair3/S1AP/MESSAGES/ASN1/asn1cpatch_3.p0 | 6 ++---- openair3/S1AP/s1ap_eNB_handlers.c | 1 + openair3/SECU/nas_stream_eea1.c | 4 ++-- openair3/SECU/nas_stream_eia2.c | 1 + openair3/UDP/udp_eNB_task.c | 8 ++++---- targets/RT/USER/lte-softmodem.c | 11 ++++++----- targets/RT/USER/lte-ue.c | 2 +- 40 files changed, 96 insertions(+), 88 deletions(-) diff --git a/cmake_targets/tools/fix_asn1 b/cmake_targets/tools/fix_asn1 index dcc00d5e37..5f182c8f7e 100755 --- a/cmake_targets/tools/fix_asn1 +++ b/cmake_targets/tools/fix_asn1 @@ -10,12 +10,12 @@ RRC_Rel10=( X2AP_Rel11_2=( "X2ap-CriticalityDiagnostics-IE-List.h" ae96308b37fcbcbf39da5012e42968135fc5f27b "fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff" "NativeInteger.c" 9f173e87daa1e7378618dbb060a10aae752d74be "fix_asn1.data/X2AP.rel11.2/NativeInteger.c.diff" - "constr_SET_OF.c" 5c8765a1e0fc44a48e406d0aa7628004bf3aac2a "fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c.diff" + "constr_SET_OF.c" 5352abd70c1784a0a2ef3c2e287b30ea3cdcf760 "fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c.diff" ) S1AP_Rel10_5=( "NativeInteger.c" 9f173e87daa1e7378618dbb060a10aae752d74be "fix_asn1.data/S1AP.rel10.5/NativeInteger.c.diff" - "constr_SET_OF.c" 5c8765a1e0fc44a48e406d0aa7628004bf3aac2a "fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c.diff" + "constr_SET_OF.c" 5352abd70c1784a0a2ef3c2e287b30ea3cdcf760 "fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c.diff" ) red_color="$(tput setaf 1)" diff --git a/common/utils/collection/hashtable/hashtable.c b/common/utils/collection/hashtable/hashtable.c index d424e2a0ad..4ce0ee7a7e 100755 --- a/common/utils/collection/hashtable/hashtable.c +++ b/common/utils/collection/hashtable/hashtable.c @@ -177,7 +177,6 @@ hashtable_rc_t hashtable_dump_content (const hash_table_t * const hashtblP, char { hash_node_t *node = NULL; unsigned int i = 0; - unsigned int num_elements = 0; if (hashtblP == NULL) { *remaining_bytes_in_buffer_pP = snprintf( buffer_pP, diff --git a/openair1/PHY/INIT/lte_init.c b/openair1/PHY/INIT/lte_init.c index c819704bd2..8fcc33a6d2 100644 --- a/openair1/PHY/INIT/lte_init.c +++ b/openair1/PHY/INIT/lte_init.c @@ -128,8 +128,8 @@ void phy_config_sib2_eNB(uint8_t Mod_id, { LTE_DL_FRAME_PARMS *lte_frame_parms = &PHY_vars_eNB_g[Mod_id][CC_id]->lte_frame_parms; - LTE_eNB_UE_stats *eNB_UE_stats = PHY_vars_eNB_g[Mod_id][CC_id]->eNB_UE_stats; - int32_t rx_total_gain_eNB_dB = PHY_vars_eNB_g[Mod_id][CC_id]->rx_total_gain_eNB_dB; + //LTE_eNB_UE_stats *eNB_UE_stats = PHY_vars_eNB_g[Mod_id][CC_id]->eNB_UE_stats; + //int32_t rx_total_gain_eNB_dB = PHY_vars_eNB_g[Mod_id][CC_id]->rx_total_gain_eNB_dB; int i; LOG_D(PHY,"[eNB%d] CCid %d Frame %d: Applying radioResourceConfigCommon\n",Mod_id,CC_id,PHY_vars_eNB_g[Mod_id][CC_id]->proc[8].frame_tx); @@ -683,11 +683,11 @@ void phy_config_dedicated_scell_eNB(uint8_t Mod_id, int CC_id) { - PHY_VARS_eNB *phy_vars_eNB = PHY_vars_eNB_g[Mod_id][CC_id]; + //PHY_VARS_eNB *phy_vars_eNB = PHY_vars_eNB_g[Mod_id][CC_id]; uint8_t UE_id = find_ue(rnti,PHY_vars_eNB_g[Mod_id][0]); struct PhysicalConfigDedicatedSCell_r10 *physicalConfigDedicatedSCell_r10 = sCellToAddMod_r10->radioResourceConfigDedicatedSCell_r10->physicalConfigDedicatedSCell_r10; //struct RadioResourceConfigCommonSCell_r10 *physicalConfigCommonSCell_r10 = sCellToAddMod_r10->radioResourceConfigCommonSCell_r10; - PhysCellId_t physCellId_r10 = sCellToAddMod_r10->cellIdentification_r10->physCellId_r10; + //PhysCellId_t physCellId_r10 = sCellToAddMod_r10->cellIdentification_r10->physCellId_r10; ARFCN_ValueEUTRA_t dl_CarrierFreq_r10 = sCellToAddMod_r10->cellIdentification_r10->dl_CarrierFreq_r10; uint32_t carrier_freq_local; diff --git a/openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c b/openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c index 14e1c18571..378832ccf7 100644 --- a/openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c +++ b/openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c @@ -50,13 +50,13 @@ void lte_eNB_I0_measurements(PHY_VARS_eNB *phy_vars_eNB, PHY_MEASUREMENTS_eNB *phy_measurements = &phy_vars_eNB->PHY_measurements_eNB[eNB_id]; int32_t *rb_mask = phy_vars_eNB->rb_mask_ul; - uint32_t aarx,rx_power_correction; + uint32_t aarx /* ,rx_power_correction */; uint32_t rb; int32_t *ul_ch; int32_t n0_power_tot; int len; int offset; - int Nsymb = (frame_parms->Ncp==NORMAL)?14:12; + //int Nsymb = (frame_parms->Ncp==NORMAL)?14:12; // noise measurements // for the moment we measure the noise on the 7th OFDM symbol (in S subframe) diff --git a/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c b/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c index 65c4214427..3bc26ad7e8 100644 --- a/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c +++ b/openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c @@ -572,7 +572,7 @@ void lte_ue_measurements(PHY_VARS_UE *phy_vars_ue, // skip the first 4 RE due to interpolation filter length of 5 (not possible to skip 5 due to 128i alignment, must be multiple of 128bit) #if defined(__x86_64__) || defined(__i386__) - __m128i pmi128_re,pmi128_im,mmtmpPMI0,mmtmpPMI1,mmtmpPMI2,mmtmpPMI3; + __m128i pmi128_re,pmi128_im,mmtmpPMI0,mmtmpPMI1 /* ,mmtmpPMI2,mmtmpPMI3 */ ; dl_ch0_128 = (__m128i *)&phy_vars_ue->lte_ue_common_vars.dl_ch_estimates[eNB_id][aarx][4]; dl_ch1_128 = (__m128i *)&phy_vars_ue->lte_ue_common_vars.dl_ch_estimates[eNB_id][2+aarx][4]; diff --git a/openair1/SCHED/phy_mac_stub.c b/openair1/SCHED/phy_mac_stub.c index 9bcba1072c..6e90960bfc 100644 --- a/openair1/SCHED/phy_mac_stub.c +++ b/openair1/SCHED/phy_mac_stub.c @@ -54,11 +54,11 @@ void fill_dci(DCI_PDU *DCI_pdu, uint8_t sched_subframe, PHY_VARS_eNB *phy_vars_e { int i; - uint8_t cooperation_flag = phy_vars_eNB->cooperation_flag; + //uint8_t cooperation_flag = phy_vars_eNB->cooperation_flag; uint8_t transmission_mode = phy_vars_eNB->transmission_mode[0]; uint32_t rballoc = 0x7FFF; - uint32_t rballoc2 = 0x000F; + //uint32_t rballoc2 = 0x000F; int subframe = phy_vars_eNB->proc[sched_subframe].subframe_tx; LTE_eNB_DLSCH_t *DLSCH_ptr = phy_vars_eNB->dlsch_eNB[0][0]; @@ -585,7 +585,7 @@ void fill_dci_emos(DCI_PDU *DCI_pdu, uint8_t subframe, PHY_VARS_eNB *phy_vars_eN { int i; - uint8_t cooperation_flag = phy_vars_eNB->cooperation_flag; + //uint8_t cooperation_flag = phy_vars_eNB->cooperation_flag; uint8_t transmission_mode = phy_vars_eNB->transmission_mode[0]; //uint32_t rballoc = 0x00F0; diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c index 375c0dcd1f..4042cb511c 100755 --- a/openair1/SCHED/phy_procedures_lte_eNb.c +++ b/openair1/SCHED/phy_procedures_lte_eNb.c @@ -1822,6 +1822,7 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e stop_meas(&phy_vars_eNB->phy_proc_tx); + (void)re_allocated; /* remove gcc warning "set but not used" */ } void process_Msg3(PHY_VARS_eNB *phy_vars_eNB,uint8_t sched_subframe,uint8_t UE_id, uint8_t harq_pid) @@ -2493,6 +2494,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_ } sect_id = 0; + (void)sect_id; /* remove gcc warning "set but not used" */ /* for (UE_id=0;UE_id<NUMBER_OF_UE_MAX;UE_id++) { @@ -3604,6 +3606,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_ } // loop i=0 ... NUMBER_OF_UE_MAX-1 + (void)pusch_active; /* remove gcc warning "set but not used" */ // if (pusch_active == 0) { if (abstraction_flag == 0) { // LOG_D(PHY,"[eNB] Frame %d, subframe %d Doing I0_measurements\n", diff --git a/openair1/SCHED/pucch_pc.c b/openair1/SCHED/pucch_pc.c index feeff71598..afcf4bd5b3 100644 --- a/openair1/SCHED/pucch_pc.c +++ b/openair1/SCHED/pucch_pc.c @@ -46,16 +46,16 @@ int8_t pucch_power_cntl(PHY_VARS_UE *phy_vars_ue,uint8_t subframe,uint8_t eNB_id { int8_t Po_PUCCH; - uint8_t harq_pid; + //uint8_t harq_pid; // P_pucch = P_opucch+ PL + h(nCQI,nHARQ) + delta_pucchF(pucch_fmt) + g(i)) // - if ((pucch_fmt == pucch_format1a) || - (pucch_fmt == pucch_format1b)) { // Update g_pucch based on TPC/delta_PUCCH received in PDCCH for this process - harq_pid = phy_vars_ue->dlsch_ue[eNB_id][0]->harq_ack[subframe].harq_id; + //if ((pucch_fmt == pucch_format1a) || + // (pucch_fmt == pucch_format1b)) { // Update g_pucch based on TPC/delta_PUCCH received in PDCCH for this process + //harq_pid = phy_vars_ue->dlsch_ue[eNB_id][0]->harq_ack[subframe].harq_id; //this is now done in dci_tools //phy_vars_ue->g_pucch[eNB_id] += phy_vars_ue->dlsch_ue[eNB_id][0]->harq_processes[harq_pid]->delta_PUCCH; - } + //} Po_PUCCH = get_PL(phy_vars_ue->Mod_id,phy_vars_ue->CC_id,eNB_id)+ phy_vars_ue->lte_frame_parms.ul_power_control_config_common.p0_NominalPUCCH+ diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c index cc63eb8671..e96ef91326 100755 --- a/openair2/ENB_APP/enb_config.c +++ b/openair2/ENB_APP/enb_config.c @@ -562,9 +562,9 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP) const char* pusch_alpha = NULL; libconfig_int pucch_p0_Nominal = 0; libconfig_int msg3_delta_Preamble = 0; - libconfig_int ul_CyclicPrefixLength = 0; + //libconfig_int ul_CyclicPrefixLength = 0; const char* pucch_deltaF_Format1 = NULL; - const char* pucch_deltaF_Format1a = NULL; + //const char* pucch_deltaF_Format1a = NULL; const char* pucch_deltaF_Format1b = NULL; const char* pucch_deltaF_Format2 = NULL; const char* pucch_deltaF_Format2a = NULL; diff --git a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c index 2a52d8779a..f7d109aa31 100644 --- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c +++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c @@ -1488,23 +1488,23 @@ fill_DLSCH_dci( // loop over all allocated UEs and compute frequency allocations for PDSCH int UE_id = -1; - uint8_t first_rb,nb_rb=3; + uint8_t /* first_rb, */ nb_rb=3; rnti_t rnti; - unsigned char *vrb_map; + //unsigned char *vrb_map; uint8_t rballoc_sub[25]; //uint8_t number_of_subbands=13; - unsigned char round; + //unsigned char round; unsigned char harq_pid; void *DLSCH_dci=NULL; DCI_PDU *DCI_pdu; int i; - void *BCCH_alloc_pdu; + //void *BCCH_alloc_pdu; int size_bits,size_bytes; int CC_id; eNB_MAC_INST *eNB =&eNB_mac_inst[module_idP]; UE_list_t *UE_list = &eNB->UE_list; - RA_TEMPLATE *RA_template; + //RA_TEMPLATE *RA_template; start_meas(&eNB->fill_DLSCH_dci); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_FILL_DLSCH_DCI,VCD_FUNCTION_IN); diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c index 9cabd6b622..79529c3284 100644 --- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c +++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c @@ -1082,7 +1082,7 @@ boolean_t CCE_allocation_infeasible(int module_idP, DCI_PDU *DCI_pdu = &eNB_mac_inst[module_idP].common_channels[CC_idP].DCI_pdu; - DCI_ALLOC_t *dci_alloc; + //DCI_ALLOC_t *dci_alloc; int ret; boolean_t res=FALSE; diff --git a/openair2/LAYER2/MAC/pre_processor.c b/openair2/LAYER2/MAC/pre_processor.c index 410d454419..39c4aedb4d 100644 --- a/openair2/LAYER2/MAC/pre_processor.c +++ b/openair2/LAYER2/MAC/pre_processor.c @@ -751,7 +751,7 @@ void dlsch_scheduler_pre_processor_reset (int module_idP, uint8_t *vrb_map = &eNB_mac_inst[module_idP].common_channels[CC_id].vrb_map; int RBGsize = PHY_vars_eNB_g[module_idP][CC_id]->lte_frame_parms.N_RB_DL/N_RBG; #ifdef SF05_LIMIT - int subframe05_limit=0; + //int subframe05_limit=0; int sf05_upper=-1,sf05_lower=-1; #endif LTE_eNB_UE_stats *eNB_UE_stats = mac_xface->get_eNB_UE_stats(module_idP,CC_id,rnti); @@ -1085,7 +1085,7 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP, void store_ulsch_buffer(module_id_t module_idP, int frameP, sub_frame_t subframeP) { - int UE_id,pCC_id,lcgid; + int UE_id, /* pCC_id, */ lcgid; UE_list_t *UE_list = &eNB_mac_inst[module_idP].UE_list; UE_TEMPLATE *UE_template; @@ -1231,7 +1231,7 @@ void sort_ue_ul (module_id_t module_idP,int frameP, sub_frame_t subframeP) int UE_id1,UE_id2; int pCCid1,pCCid2; int round1,round2; - int i=0,ii=0,j=0; + int i=0,ii=0; rnti_t rnti1,rnti2; UE_list_t *UE_list = &eNB_mac_inst[module_idP].UE_list; diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c index f25e921570..a2dbf9d9b8 100755 --- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c +++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c @@ -1032,6 +1032,8 @@ pdcp_remove_UE( } + (void)h_rc; /* remove gcc warning "set but not used" */ + return 1; } diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c index ec303172b0..b92340348a 100755 --- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c +++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c @@ -599,6 +599,7 @@ rlc_am_mac_status_indication ( rlc_sn_t sn_end = (rlc->vt_a - 1) & RLC_AM_SN_MASK; int found_pdu = 0; rlc_sn_t found_pdu_sn = 0; // avoid warning + (void)found_pdu_sn; /* avoid gcc warning "set but not used" */ while (sn != sn_end) { @@ -917,6 +918,8 @@ rlc_am_mac_data_indication ( int octet_index, index; #endif + (void)l_rlc_p; /* avoid gcc warning "unused variable" */ + #if TRACE_RLC_AM_PDU || MESSAGE_CHART_GENERATOR if (data_indP.data.nb_elements > 0) { diff --git a/openair2/LAYER2/RLC/rlc_rrc.c b/openair2/LAYER2/RLC/rlc_rrc.c index 05ad79d7d4..50f4e4b9bd 100644 --- a/openair2/LAYER2/RLC/rlc_rrc.c +++ b/openair2/LAYER2/RLC/rlc_rrc.c @@ -634,7 +634,7 @@ rlc_op_status_t rrc_rlc_config_req ( const rlc_info_t rlc_infoP) { //----------------------------------------------------------------------------- - rlc_op_status_t status; + //rlc_op_status_t status; LOG_D(RLC, PROTOCOL_CTXT_FMT" CONFIG_REQ for RAB %u\n", PROTOCOL_CTXT_ARGS(ctxt_pP), diff --git a/openair2/LAYER2/openair2_proc.c b/openair2/LAYER2/openair2_proc.c index 35684d239a..284f91a7f8 100644 --- a/openair2/LAYER2/openair2_proc.c +++ b/openair2/LAYER2/openair2_proc.c @@ -74,7 +74,7 @@ int dump_eNB_l2_stats(char *buffer, int length) int eNB_id,UE_id,number_of_cards; int len= length; int CC_id=0; - int i,j; + int i; protocol_ctxt_t ctxt; rlc_op_status_t rlc_status; unsigned int stat_rlc_mode; diff --git a/openair2/RRC/LITE/rrc_UE.c b/openair2/RRC/LITE/rrc_UE.c index a919a055f2..ee35f317cd 100644 --- a/openair2/RRC/LITE/rrc_UE.c +++ b/openair2/RRC/LITE/rrc_UE.c @@ -261,6 +261,7 @@ static void init_SI_UE( const protocol_ctxt_t* const ctxt_pP, const uint8_t eNB_ #ifdef Rel10 //----------------------------------------------------------------------------- +#if 0 static void init_MCCH_UE(module_id_t ue_mod_idP, uint8_t eNB_index) { int i; @@ -274,6 +275,7 @@ static void init_MCCH_UE(module_id_t ue_mod_idP, uint8_t eNB_index) } } #endif +#endif //----------------------------------------------------------------------------- static void openair_rrc_lite_ue_init_security( const protocol_ctxt_t* const ctxt_pP ) diff --git a/openair2/RRC/LITE/rrc_common.c b/openair2/RRC/LITE/rrc_common.c index e2d8a6c69b..2a37ccde00 100644 --- a/openair2/RRC/LITE/rrc_common.c +++ b/openair2/RRC/LITE/rrc_common.c @@ -411,7 +411,7 @@ rrc_rx_tx( ) //----------------------------------------------------------------------------- { - uint8_t UE_id; + //uint8_t UE_id; int32_t current_timestamp_ms, ref_timestamp_ms; struct timeval ts; #ifdef LOCALIZATION @@ -547,6 +547,9 @@ rrc_rx_tx( } #endif + (void)ts; /* remove gcc warning "unused variable" */ + (void)ref_timestamp_ms; /* remove gcc warning "unused variable" */ + (void)current_timestamp_ms; /* remove gcc warning "unused variable" */ } VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT); diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c index 1d0b5f2902..deab2d04a3 100644 --- a/openair2/RRC/LITE/rrc_eNB.c +++ b/openair2/RRC/LITE/rrc_eNB.c @@ -1131,8 +1131,8 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration( int i; // configure SRB1/SRB2, PhysicalConfigDedicated, MAC_MainConfig for UE - eNB_RRC_INST* rrc_inst = &eNB_rrc_inst[ctxt_pP->module_id]; - struct PhysicalConfigDedicated** physicalConfigDedicated = &ue_context_pP->ue_context.physicalConfigDedicated; + //eNB_RRC_INST* rrc_inst = &eNB_rrc_inst[ctxt_pP->module_id]; + //struct PhysicalConfigDedicated** physicalConfigDedicated = &ue_context_pP->ue_context.physicalConfigDedicated; struct SRB_ToAddMod *SRB2_config = NULL; struct SRB_ToAddMod__rlc_Config *SRB2_rlc_config = NULL; @@ -1145,7 +1145,7 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration( struct DRB_ToAddMod *DRB_config = NULL; struct RLC_Config *DRB_rlc_config = NULL; struct PDCP_Config *DRB_pdcp_config = NULL; - struct PDCP_Config__rlc_AM *PDCP_rlc_AM = NULL; + //struct PDCP_Config__rlc_AM *PDCP_rlc_AM = NULL; struct PDCP_Config__rlc_UM *PDCP_rlc_UM = NULL; struct LogicalChannelConfig *DRB_lchan_config = NULL; struct LogicalChannelConfig__ul_SpecificParameters @@ -1163,7 +1163,7 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration( #if Rel10 long *sr_ProhibitTimer_r9 = NULL; // uint8_t sCellIndexToAdd = rrc_find_free_SCell_index(enb_mod_idP, ue_mod_idP, 1); - uint8_t sCellIndexToAdd = 0; + //uint8_t sCellIndexToAdd = 0; #endif long *logicalchannelgroup, *logicalchannelgroup_drb; @@ -2097,8 +2097,8 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover( QuantityConfig_t *quantityConfig; MobilityControlInfo_t *mobilityInfo; // HandoverCommand_t handoverCommand; - uint8_t sourceModId = - get_adjacent_cell_mod_id(ue_context_pP->ue_context.handover_info->as_context.reestablishmentInfo->sourcePhysCellId); + //uint8_t sourceModId = + // get_adjacent_cell_mod_id(ue_context_pP->ue_context.handover_info->as_context.reestablishmentInfo->sourcePhysCellId); #if Rel10 long *sr_ProhibitTimer_r9; #endif @@ -3010,7 +3010,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete( uint8_t *kUPenc = NULL; DRB_ToAddModList_t* DRB_configList = ue_context_pP->ue_context.DRB_configList; - SRB_ToAddModList_t* SRB_configList = ue_context_pP->ue_context.SRB_configList; + //SRB_ToAddModList_t* SRB_configList = ue_context_pP->ue_context.SRB_configList; #if defined(ENABLE_SECURITY) diff --git a/openair2/RRC/LITE/rrc_eNB_GTPV1U.c b/openair2/RRC/LITE/rrc_eNB_GTPV1U.c index b85933ad47..29ff0d9dc2 100755 --- a/openair2/RRC/LITE/rrc_eNB_GTPV1U.c +++ b/openair2/RRC/LITE/rrc_eNB_GTPV1U.c @@ -86,6 +86,7 @@ rrc_eNB_process_GTPV1U_CREATE_TUNNEL_RESP( create_tunnel_resp_pP->num_tunnels, ue_context_p->ue_context.enb_gtp_ebi[0], ue_context_p->ue_context.enb_gtp_teid[0]); + (void)rnti; /* avoid gcc warning "set but not used" */ return 0; } else { return -1; diff --git a/openair2/RRC/LITE/rrc_eNB_S1AP.c b/openair2/RRC/LITE/rrc_eNB_S1AP.c index 375fc3e0cf..b8b5aba4ae 100644 --- a/openair2/RRC/LITE/rrc_eNB_S1AP.c +++ b/openair2/RRC/LITE/rrc_eNB_S1AP.c @@ -672,7 +672,7 @@ rrc_eNB_send_S1AP_NAS_FIRST_REQ( if (rrcConnectionSetupComplete->registeredMME != NULL) { /* Fill GUMMEI */ struct RegisteredMME *r_mme = rrcConnectionSetupComplete->registeredMME; - int selected_plmn_identity = rrcConnectionSetupComplete->selectedPLMN_Identity; + //int selected_plmn_identity = rrcConnectionSetupComplete->selectedPLMN_Identity; S1AP_NAS_FIRST_REQ (message_p).ue_identity.presenceMask |= UE_IDENTITIES_gummei; @@ -859,7 +859,7 @@ int rrc_eNB_process_S1AP_INITIAL_CONTEXT_SETUP_REQ(MessageDef *msg_p, const char { uint16_t ue_initial_id; uint32_t eNB_ue_s1ap_id; - MessageDef *message_gtpv1u_p = NULL; + //MessageDef *message_gtpv1u_p = NULL; gtpv1u_enb_create_tunnel_req_t create_tunnel_req; gtpv1u_enb_create_tunnel_resp_t create_tunnel_resp; @@ -1170,7 +1170,7 @@ int rrc_eNB_process_S1AP_UE_CONTEXT_RELEASE_COMMAND (MessageDef *msg_p, const ch */ { int e_rab; - int mod_id = 0; + //int mod_id = 0; MessageDef *msg_delete_tunnels_p = NULL; MSC_LOG_TX_MESSAGE( diff --git a/openair2/UTIL/OMG/common.c b/openair2/UTIL/OMG/common.c index dd12cb302a..d02ccf63ce 100644 --- a/openair2/UTIL/OMG/common.c +++ b/openair2/UTIL/OMG/common.c @@ -158,6 +158,7 @@ remove_node_entry (node_struct * node, node_list * node_vector) if (list->next->node->id == node->id) { toremove = tmp; // TODO delete the entry + (void)toremove; /* avoid gcc warning "set but not used" */ tmp = list->next->next; if (tmp != NULL) { @@ -259,13 +260,11 @@ node_list * remove_node (node_list * list, int nid, int node_type) { - int found; node_list *current = NULL, *previous = NULL; //int cond=0; //int i=0; if (list == NULL) { - found = 1; //false return NULL; } else { //start search @@ -280,12 +279,10 @@ remove_node (node_list * list, int nid, int node_type) //holds: current = NULL or type != node_type or.., but not both if (current == NULL) { - found = 1; LOG_E (OMG, " Element to remove is not found\n "); return NULL; } //value not found else { - found = 0; // true value found if (current == list) { list = current->next; @@ -322,7 +319,6 @@ node_struct * find_node (node_list * list, int nid, int node_type) { - int found; node_list *current; if (list == NULL) { @@ -340,7 +336,6 @@ find_node (node_list * list, int nid, int node_type) //holds: current = NULL or type != node_type or.., but not both if (current == NULL) { - found = 1; LOG_D (OMG, " Element to find in Node_Vector with ID: %d could not be found\n ", nid); @@ -380,7 +375,7 @@ node_list * reset_node_list (node_list * list) { node_list *tmp; - node_list *last = list; + //node_list *last = list; if (list == NULL) { //printf("Node_list is NULL\n"); diff --git a/openair2/UTIL/OMG/omg.c b/openair2/UTIL/OMG/omg.c index 11bdc62071..12b9395f75 100644 --- a/openair2/UTIL/OMG/omg.c +++ b/openair2/UTIL/OMG/omg.c @@ -301,7 +301,7 @@ set_new_mob_type (int id, int node_t, int mob_t, double cur_time) int prev_mob; node_list *tmp; - job_list *tmp2, *prev_job; + //job_list *tmp2, *prev_job; pair_struct *pair; double pause_p; diff --git a/openair2/UTIL/OMG/steadystaterwp.c b/openair2/UTIL/OMG/steadystaterwp.c index c466f3cd23..ba2e0d88f7 100644 --- a/openair2/UTIL/OMG/steadystaterwp.c +++ b/openair2/UTIL/OMG/steadystaterwp.c @@ -173,7 +173,7 @@ place_steadystaterwp_node (node_struct * node) void sleep_steadystaterwp_node (pair_struct * pair, double cur_time) { - static int initial = 1; + //static int initial = 1; node_struct *node; node = pair->b; node->mobile = 0; @@ -209,10 +209,10 @@ sleep_steadystaterwp_node (pair_struct * pair, double cur_time) void move_steadystaterwp_node (pair_struct * pair, double cur_time) { - static int initial = 1; + //static int initial = 1; double distance, journeytime_next, max_distance; double temp_x, temp_y, u1, u2; - int loc_num; + //int loc_num; double pr, block_xmin, block_ymin; //LOG_D (OMG, "[STEADY_RWP] move node: %d\n", node->ID); diff --git a/openair2/UTIL/OMG/trace.c b/openair2/UTIL/OMG/trace.c index 89a9377f93..144b9ae597 100644 --- a/openair2/UTIL/OMG/trace.c +++ b/openair2/UTIL/OMG/trace.c @@ -55,7 +55,7 @@ int start_trace_generator (omg_global_param omg_param_list) { double cur_time = 0.0; - int immobile = 0; + //int immobile = 0; int node_number; node_struct *node = NULL; mobility_struct *mobility = NULL; @@ -235,7 +235,7 @@ schedule_trace_node (pair_struct * pair, node_data * n_data, double cur_time) void sleep_trace_node (pair_struct * pair, node_data * n_data, double cur_time) { - double journeytime, distance; + //double journeytime, distance; node_struct *node = pair->b; node->mobile = 0; node->mob->speed = 0.0; diff --git a/openair2/UTIL/OMG/trace_hashtable.c b/openair2/UTIL/OMG/trace_hashtable.c index 2ecb392219..51f745de89 100644 --- a/openair2/UTIL/OMG/trace_hashtable.c +++ b/openair2/UTIL/OMG/trace_hashtable.c @@ -58,8 +58,6 @@ hash_table_t **table; void create_new_table (int node_type) { - int i; - if(table==NULL) table = (hash_table_t **) calloc (MAX_NUM_NODE_TYPES, sizeof (hash_table_t*)); diff --git a/openair2/UTIL/OSA/osa_stream_eea.c b/openair2/UTIL/OSA/osa_stream_eea.c index 0a044e2e01..8e346631ec 100644 --- a/openair2/UTIL/OSA/osa_stream_eea.c +++ b/openair2/UTIL/OSA/osa_stream_eea.c @@ -78,7 +78,6 @@ int stream_encrypt_eea1(stream_cipher_t *stream_cipher, uint8_t **out) int n ; int i = 0; uint32_t zero_bit = 0; - uint32_t byte_length; uint32_t *KS; uint32_t K[4],IV[4]; @@ -89,7 +88,6 @@ int stream_encrypt_eea1(stream_cipher_t *stream_cipher, uint8_t **out) n = ( stream_cipher->blength + 31 ) / 32; zero_bit = stream_cipher->blength & 0x7; - byte_length = stream_cipher->blength >> 3; memset(&snow_3g_context, 0, sizeof(snow_3g_context)); /*Initialisation*/ diff --git a/openair3/GTPV1-U/gtpv1u_eNB.c b/openair3/GTPV1-U/gtpv1u_eNB.c index ca492469b1..ff049ba1b4 100644 --- a/openair3/GTPV1-U/gtpv1u_eNB.c +++ b/openair3/GTPV1-U/gtpv1u_eNB.c @@ -673,7 +673,7 @@ gtpv1u_create_s1u_tunnel( teid_t s1u_teid = 0; gtpv1u_teid_data_t *gtpv1u_teid_data_p = NULL; gtpv1u_ue_data_t *gtpv1u_ue_data_p = NULL; - MessageDef *message_p = NULL; + //MessageDef *message_p = NULL; hashtable_rc_t hash_rc = HASH_TABLE_KEY_NOT_EXISTS; int i; ebi_t eps_bearer_id = 0; @@ -996,7 +996,7 @@ void *gtpv1u_eNB_task(void *args) { int rc = 0; instance_t instance; - const char *msg_name_p; + //const char *msg_name_p; rc = gtpv1u_eNB_init(); AssertFatal(rc == 0, "gtpv1u_eNB_init Failed"); @@ -1014,7 +1014,7 @@ void *gtpv1u_eNB_task(void *args) DevAssert(received_message_p != NULL); instance = ITTI_MSG_INSTANCE(received_message_p); - msg_name_p = ITTI_MSG_NAME(received_message_p); + //msg_name_p = ITTI_MSG_NAME(received_message_p); switch (ITTI_MSG_ID(received_message_p)) { @@ -1081,6 +1081,7 @@ void *gtpv1u_eNB_task(void *args) LOG_E(GTPU, "nwGtpv1uGpduMsgNew failed: 0x%x\n", rc); MSC_LOG_EVENT(MSC_GTPU_ENB,"0 Failed send G-PDU ltid %u rtid %u size %u", enb_s1u_teid,sgw_s1u_teid,data_req_p->length); + (void)enb_s1u_teid; /* avoid gcc warning "set but not used" */ } else { rc = nwGtpv1uProcessUlpReq(gtpv1u_data_g.gtpv1u_stack, &stack_req); diff --git a/openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.c b/openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.c index d8efa5312b..08fee949a0 100644 --- a/openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.c +++ b/openair3/NAS/COMMON/IES/MsNetworkFeatureSupport.c @@ -54,9 +54,9 @@ int decode_ms_network_feature_support(MsNetworkFeatureSupport *msnetworkfeatures } int encode_ms_network_feature_support(MsNetworkFeatureSupport *msnetworkfeaturesupport, uint8_t iei, uint8_t *buffer, uint32_t len) { - uint8_t *lenPtr; + //uint8_t *lenPtr; uint32_t encoded = 0; - int encode_result; + //int encode_result; /* Checking IEI and pointer */ CHECK_PDU_POINTER_AND_LENGTH_ENCODER(buffer, MS_NETWORK_FEATURE_SUPPORT_MINIMUM_LENGTH, len); #if defined (NAS_DEBUG) diff --git a/openair3/NAS/UE/EMM/EmmStatusHdl.c b/openair3/NAS/UE/EMM/EmmStatusHdl.c index 85d423fd23..126b2a94f6 100755 --- a/openair3/NAS/UE/EMM/EmmStatusHdl.c +++ b/openair3/NAS/UE/EMM/EmmStatusHdl.c @@ -130,7 +130,7 @@ int emm_proc_status(unsigned int ueid, int emm_cause) emm_sap_t emm_sap; emm_security_context_t *sctx = NULL; - struct emm_data_context_s *ctx = NULL; + //struct emm_data_context_s *ctx = NULL; LOG_TRACE(INFO,"EMM-PROC - EMM status procedure requested"); diff --git a/openair3/NAS/UE/EMM/LowerLayer.c b/openair3/NAS/UE/EMM/LowerLayer.c index 130fe1bb5d..6e264d2a54 100755 --- a/openair3/NAS/UE/EMM/LowerLayer.c +++ b/openair3/NAS/UE/EMM/LowerLayer.c @@ -261,7 +261,7 @@ int lowerlayer_data_req(unsigned int ueid, const OctetString *data) int rc; emm_sap_t emm_sap; emm_security_context_t *sctx = NULL; - struct emm_data_context_s *ctx = NULL; + //struct emm_data_context_s *ctx = NULL; emm_sap.primitive = EMMAS_DATA_REQ; emm_sap.u.emm_as.u.data.guti = _emm_data.guti; diff --git a/openair3/NAS/UE/EMM/SAP/emm_fsm.c b/openair3/NAS/UE/EMM/SAP/emm_fsm.c index 83c5e5f1db..dc0e1efa28 100755 --- a/openair3/NAS/UE/EMM/SAP/emm_fsm.c +++ b/openair3/NAS/UE/EMM/SAP/emm_fsm.c @@ -215,7 +215,7 @@ emm_fsm_state_t _emm_fsm_status[EMM_FSM_NB_UE_MAX]; ***************************************************************************/ void emm_fsm_initialize(void) { - int ueid; + //int ueid; LOG_FUNC_IN; _emm_fsm_status[0] = EMM_NULL; diff --git a/openair3/NAS/UE/ESM/esm_ebr_context.c b/openair3/NAS/UE/ESM/esm_ebr_context.c index fcf278a2e4..f56a19b876 100755 --- a/openair3/NAS/UE/ESM/esm_ebr_context.c +++ b/openair3/NAS/UE/ESM/esm_ebr_context.c @@ -114,7 +114,7 @@ int esm_ebr_context_create( int bid = 0; esm_data_context_t *esm_ctx = NULL; esm_pdn_t *pdn = NULL; - unsigned int ueid = 0; + //unsigned int ueid = 0; LOG_FUNC_IN; @@ -212,7 +212,7 @@ int esm_ebr_context_create( { char *tmp = NULL; char ipv4_addr[INET_ADDRSTRLEN]; - char ipv6_addr[INET6_ADDRSTRLEN]; + //char ipv6_addr[INET6_ADDRSTRLEN]; char *netmask = NULL; char broadcast[INET_ADDRSTRLEN]; struct in_addr in_addr; @@ -221,7 +221,8 @@ int esm_ebr_context_create( switch (pdn->type) { case NET_PDN_TYPE_IPV4V6: - ipv6_addr[0] = pdn->ip_addr[4]; + //ipv6_addr[0] = pdn->ip_addr[4]; + /* TODO? */ // etc case NET_PDN_TYPE_IPV4: @@ -283,11 +284,12 @@ int esm_ebr_context_create( res = sprintf(command_line, "ifconfig oip1 %s netmask %s broadcast %s up", ipv4_addr, netmask, broadcast); + (void)res; /* avoid gcc warning "set but not used" */ // AssertFatal((res > 0) && (res < 128), // "error in system command line"); LOG_TRACE(INFO, "ESM-PROC - executing %s ", command_line); - system(command_line); + if (system(command_line)) ; /* TODO: what to do? */ break; case NET_PDN_TYPE_IPV6: @@ -341,7 +343,7 @@ int esm_ebr_context_release( esm_pdn_t *pdn = NULL; esm_data_context_t *esm_ctx; - unsigned int ueid = 0; + //unsigned int ueid = 0; LOG_FUNC_IN; diff --git a/openair3/S1AP/MESSAGES/ASN1/asn1cpatch_3.p0 b/openair3/S1AP/MESSAGES/ASN1/asn1cpatch_3.p0 index 3986a6a83b..b3517fd2d4 100644 --- a/openair3/S1AP/MESSAGES/ASN1/asn1cpatch_3.p0 +++ b/openair3/S1AP/MESSAGES/ASN1/asn1cpatch_3.p0 @@ -392,14 +392,13 @@ } --- skeletons/constr_SEQUENCE.c 2015-12-08 14:39:33.346543533 +0100 +++ skeletons/constr_SEQUENCE.c 2015-12-08 10:39:52.442558000 +0100 -@@ -1761,3 +1761,66 @@ +@@ -1761,3 +1761,65 @@ _ASN_ENCODED_OK(er); } + +asn_comp_rval_t * SEQUENCE_compare(asn_TYPE_descriptor_t *td1, void *sptr1, asn_TYPE_descriptor_t *td2, void *sptr2) { + int edx; -+ int ret; + asn_comp_rval_t *res = NULL; + asn_comp_rval_t *res2 = NULL; + @@ -563,7 +562,7 @@ * Some handy helpers. * --- skeletons/constr_SET_OF.c 2015-12-08 14:39:33.338543533 +0100 +++ skeletons/constr_SET_OF.c 2015-12-08 10:45:54.466557000 +0100 -@@ -1039,3 +1039,55 @@ +@@ -1039,3 +1039,54 @@ rv.consumed = 0; return rv; } @@ -575,7 +574,6 @@ + asn_TYPE_member_t *elm2 = td2->elements; + const asn_anonymous_set_ *list1 = _A_CSET_FROM_VOID(sptr1); + const asn_anonymous_set_ *list2 = _A_CSET_FROM_VOID(sptr2); -+ int ret; + int i; + asn_comp_rval_t *res = NULL; + asn_comp_rval_t *res2 = NULL; diff --git a/openair3/S1AP/s1ap_eNB_handlers.c b/openair3/S1AP/s1ap_eNB_handlers.c index 6f0d4128c7..3e6b2ebe7c 100644 --- a/openair3/S1AP/s1ap_eNB_handlers.c +++ b/openair3/S1AP/s1ap_eNB_handlers.c @@ -864,6 +864,7 @@ int s1ap_eNB_handle_ue_context_release_command(uint32_t assoc_id, case S1ap_UE_S1AP_IDs_PR_mME_UE_S1AP_ID: mme_ue_s1ap_id = ueContextReleaseCommand_p->uE_S1AP_IDs.choice.mME_UE_S1AP_ID; S1AP_ERROR("TO DO mapping mme_ue_s1ap_id enb_ue_s1ap_id"); + (void)mme_ue_s1ap_id; /* TODO: remove - it's to remove gcc warning about unused var */ case S1ap_UE_S1AP_IDs_PR_NOTHING: default: diff --git a/openair3/SECU/nas_stream_eea1.c b/openair3/SECU/nas_stream_eea1.c index 4b69ae8231..142df9e0dc 100755 --- a/openair3/SECU/nas_stream_eea1.c +++ b/openair3/SECU/nas_stream_eea1.c @@ -49,7 +49,7 @@ int nas_stream_encrypt_eea1(nas_stream_cipher_t *stream_cipher, uint8_t *out) int n ; int i = 0; uint32_t zero_bit = 0; - uint32_t byte_length; + //uint32_t byte_length; uint32_t *KS; uint32_t K[4],IV[4]; @@ -60,7 +60,7 @@ int nas_stream_encrypt_eea1(nas_stream_cipher_t *stream_cipher, uint8_t *out) n = ( stream_cipher->blength + 31 ) / 32; zero_bit = stream_cipher->blength & 0x7; - byte_length = stream_cipher->blength >> 3; + //byte_length = stream_cipher->blength >> 3; memset(&snow_3g_context, 0, sizeof(snow_3g_context)); /*Initialisation*/ diff --git a/openair3/SECU/nas_stream_eia2.c b/openair3/SECU/nas_stream_eia2.c index f1f64dd90a..4841dfc90b 100644 --- a/openair3/SECU/nas_stream_eia2.c +++ b/openair3/SECU/nas_stream_eia2.c @@ -112,6 +112,7 @@ int nas_stream_encrypt_eia2(nas_stream_cipher_t *stream_cipher, uint8_t out[4]) cmac_ctx = CMAC_CTX_new(); ret = CMAC_Init(cmac_ctx, stream_cipher->key, stream_cipher->key_length, cipher, NULL); ret = CMAC_Update(cmac_ctx, m, m_length + 8); + (void)ret; /* avoid gcc warning "set but not used" */ CMAC_Final(cmac_ctx, data, &size); CMAC_CTX_free(cmac_ctx); diff --git a/openair3/UDP/udp_eNB_task.c b/openair3/UDP/udp_eNB_task.c index 3e53f9f62f..d2a73d9b95 100644 --- a/openair3/UDP/udp_eNB_task.c +++ b/openair3/UDP/udp_eNB_task.c @@ -300,8 +300,8 @@ void *udp_eNB_task(void *args_p) int nb_events; struct epoll_event *events; MessageDef *received_message_p = NULL; - const char *msg_name = NULL; - instance_t instance = 0; + //const char *msg_name = NULL; + //instance_t instance = 0; udp_enb_init(NULL); itti_mark_task_ready(TASK_UDP); @@ -316,8 +316,8 @@ void *udp_eNB_task(void *args_p) if (received_message_p != NULL) { - msg_name = ITTI_MSG_NAME (received_message_p); - instance = ITTI_MSG_INSTANCE (received_message_p); + //msg_name = ITTI_MSG_NAME (received_message_p); + //instance = ITTI_MSG_INSTANCE (received_message_p); switch (ITTI_MSG_ID(received_message_p)) { case UDP_INIT: { diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c index 7df20f05c8..c111e76879 100644 --- a/targets/RT/USER/lte-softmodem.c +++ b/targets/RT/USER/lte-softmodem.c @@ -1276,7 +1276,7 @@ static void* eNB_thread_rx( void* param ) FILE *rx_time_file; char rx_time_name[101]; - int i; + //int i; if (opp_enabled == 1){ snprintf(rx_time_name, 100,"/tmp/%s_rx_time_thread_sf_%d", "eNB", proc->subframe); @@ -3225,10 +3225,11 @@ int main( int argc, char **argv ) if (input_fd) { printf("Reading in from file to antenna buffer %d\n",0); - fread(UE[0]->lte_ue_common_vars.rxdata[0], - sizeof(int32_t), - frame_parms[0]->samples_per_tti*10, - input_fd); + if (fread(UE[0]->lte_ue_common_vars.rxdata[0], + sizeof(int32_t), + frame_parms[0]->samples_per_tti*10, + input_fd) != frame_parms[0]->samples_per_tti*10) + printf("error reading from file\n"); } //p_exmimo_config->framing.tdd_config = TXRXSWITCH_TESTRX; } else { diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c index e72b4ec80a..4acb7e7a5f 100644 --- a/targets/RT/USER/lte-ue.c +++ b/targets/RT/USER/lte-ue.c @@ -607,7 +607,7 @@ static void *UE_thread_synch(void *arg) static void *UE_thread_tx(void *arg) { static int UE_thread_tx_retval; - int ret; + //int ret; PHY_VARS_UE *UE = (PHY_VARS_UE*)arg; -- 2.26.2