Commit 04eed3bd authored by Cedric Roux's avatar Cedric Roux

remove "unused variable" and "set but not used" warnings

parent 3f8c74ca
...@@ -10,12 +10,12 @@ RRC_Rel10=( ...@@ -10,12 +10,12 @@ RRC_Rel10=(
X2AP_Rel11_2=( X2AP_Rel11_2=(
"X2ap-CriticalityDiagnostics-IE-List.h" ae96308b37fcbcbf39da5012e42968135fc5f27b "fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff" "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" "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=( S1AP_Rel10_5=(
"NativeInteger.c" 9f173e87daa1e7378618dbb060a10aae752d74be "fix_asn1.data/S1AP.rel10.5/NativeInteger.c.diff" "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)" red_color="$(tput setaf 1)"
......
...@@ -177,7 +177,6 @@ hashtable_rc_t hashtable_dump_content (const hash_table_t * const hashtblP, char ...@@ -177,7 +177,6 @@ hashtable_rc_t hashtable_dump_content (const hash_table_t * const hashtblP, char
{ {
hash_node_t *node = NULL; hash_node_t *node = NULL;
unsigned int i = 0; unsigned int i = 0;
unsigned int num_elements = 0;
if (hashtblP == NULL) { if (hashtblP == NULL) {
*remaining_bytes_in_buffer_pP = snprintf( *remaining_bytes_in_buffer_pP = snprintf(
buffer_pP, buffer_pP,
......
...@@ -128,8 +128,8 @@ void phy_config_sib2_eNB(uint8_t Mod_id, ...@@ -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_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; //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; //int32_t rx_total_gain_eNB_dB = PHY_vars_eNB_g[Mod_id][CC_id]->rx_total_gain_eNB_dB;
int i; 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); 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, ...@@ -683,11 +683,11 @@ void phy_config_dedicated_scell_eNB(uint8_t Mod_id,
int CC_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]); 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 PhysicalConfigDedicatedSCell_r10 *physicalConfigDedicatedSCell_r10 = sCellToAddMod_r10->radioResourceConfigDedicatedSCell_r10->physicalConfigDedicatedSCell_r10;
//struct RadioResourceConfigCommonSCell_r10 *physicalConfigCommonSCell_r10 = sCellToAddMod_r10->radioResourceConfigCommonSCell_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; ARFCN_ValueEUTRA_t dl_CarrierFreq_r10 = sCellToAddMod_r10->cellIdentification_r10->dl_CarrierFreq_r10;
uint32_t carrier_freq_local; uint32_t carrier_freq_local;
......
...@@ -50,13 +50,13 @@ void lte_eNB_I0_measurements(PHY_VARS_eNB *phy_vars_eNB, ...@@ -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]; PHY_MEASUREMENTS_eNB *phy_measurements = &phy_vars_eNB->PHY_measurements_eNB[eNB_id];
int32_t *rb_mask = phy_vars_eNB->rb_mask_ul; 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; uint32_t rb;
int32_t *ul_ch; int32_t *ul_ch;
int32_t n0_power_tot; int32_t n0_power_tot;
int len; int len;
int offset; int offset;
int Nsymb = (frame_parms->Ncp==NORMAL)?14:12; //int Nsymb = (frame_parms->Ncp==NORMAL)?14:12;
// noise measurements // noise measurements
// for the moment we measure the noise on the 7th OFDM symbol (in S subframe) // for the moment we measure the noise on the 7th OFDM symbol (in S subframe)
......
...@@ -572,7 +572,7 @@ void lte_ue_measurements(PHY_VARS_UE *phy_vars_ue, ...@@ -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) // 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__) #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_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]; dl_ch1_128 = (__m128i *)&phy_vars_ue->lte_ue_common_vars.dl_ch_estimates[eNB_id][2+aarx][4];
......
...@@ -54,11 +54,11 @@ void fill_dci(DCI_PDU *DCI_pdu, uint8_t sched_subframe, PHY_VARS_eNB *phy_vars_e ...@@ -54,11 +54,11 @@ void fill_dci(DCI_PDU *DCI_pdu, uint8_t sched_subframe, PHY_VARS_eNB *phy_vars_e
{ {
int i; 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]; uint8_t transmission_mode = phy_vars_eNB->transmission_mode[0];
uint32_t rballoc = 0x7FFF; uint32_t rballoc = 0x7FFF;
uint32_t rballoc2 = 0x000F; //uint32_t rballoc2 = 0x000F;
int subframe = phy_vars_eNB->proc[sched_subframe].subframe_tx; int subframe = phy_vars_eNB->proc[sched_subframe].subframe_tx;
LTE_eNB_DLSCH_t *DLSCH_ptr = phy_vars_eNB->dlsch_eNB[0][0]; 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 ...@@ -585,7 +585,7 @@ void fill_dci_emos(DCI_PDU *DCI_pdu, uint8_t subframe, PHY_VARS_eNB *phy_vars_eN
{ {
int i; 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]; uint8_t transmission_mode = phy_vars_eNB->transmission_mode[0];
//uint32_t rballoc = 0x00F0; //uint32_t rballoc = 0x00F0;
......
...@@ -1822,6 +1822,7 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e ...@@ -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); 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) 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_ ...@@ -2493,6 +2494,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
} }
sect_id = 0; 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++) { 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_ ...@@ -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 } // loop i=0 ... NUMBER_OF_UE_MAX-1
(void)pusch_active; /* remove gcc warning "set but not used" */
// if (pusch_active == 0) { // if (pusch_active == 0) {
if (abstraction_flag == 0) { if (abstraction_flag == 0) {
// LOG_D(PHY,"[eNB] Frame %d, subframe %d Doing I0_measurements\n", // LOG_D(PHY,"[eNB] Frame %d, subframe %d Doing I0_measurements\n",
......
...@@ -46,16 +46,16 @@ int8_t pucch_power_cntl(PHY_VARS_UE *phy_vars_ue,uint8_t subframe,uint8_t eNB_id ...@@ -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; 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)) // P_pucch = P_opucch+ PL + h(nCQI,nHARQ) + delta_pucchF(pucch_fmt) + g(i))
// //
if ((pucch_fmt == pucch_format1a) || //if ((pucch_fmt == pucch_format1a) ||
(pucch_fmt == pucch_format1b)) { // Update g_pucch based on TPC/delta_PUCCH received in PDCCH for this process // (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; //harq_pid = phy_vars_ue->dlsch_ue[eNB_id][0]->harq_ack[subframe].harq_id;
//this is now done in dci_tools //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; //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)+ 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+ phy_vars_ue->lte_frame_parms.ul_power_control_config_common.p0_NominalPUCCH+
......
...@@ -562,9 +562,9 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP) ...@@ -562,9 +562,9 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP)
const char* pusch_alpha = NULL; const char* pusch_alpha = NULL;
libconfig_int pucch_p0_Nominal = 0; libconfig_int pucch_p0_Nominal = 0;
libconfig_int msg3_delta_Preamble = 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_Format1 = NULL;
const char* pucch_deltaF_Format1a = NULL; //const char* pucch_deltaF_Format1a = NULL;
const char* pucch_deltaF_Format1b = NULL; const char* pucch_deltaF_Format1b = NULL;
const char* pucch_deltaF_Format2 = NULL; const char* pucch_deltaF_Format2 = NULL;
const char* pucch_deltaF_Format2a = NULL; const char* pucch_deltaF_Format2a = NULL;
......
...@@ -1488,23 +1488,23 @@ fill_DLSCH_dci( ...@@ -1488,23 +1488,23 @@ fill_DLSCH_dci(
// loop over all allocated UEs and compute frequency allocations for PDSCH // loop over all allocated UEs and compute frequency allocations for PDSCH
int UE_id = -1; int UE_id = -1;
uint8_t first_rb,nb_rb=3; uint8_t /* first_rb, */ nb_rb=3;
rnti_t rnti; rnti_t rnti;
unsigned char *vrb_map; //unsigned char *vrb_map;
uint8_t rballoc_sub[25]; uint8_t rballoc_sub[25];
//uint8_t number_of_subbands=13; //uint8_t number_of_subbands=13;
unsigned char round; //unsigned char round;
unsigned char harq_pid; unsigned char harq_pid;
void *DLSCH_dci=NULL; void *DLSCH_dci=NULL;
DCI_PDU *DCI_pdu; DCI_PDU *DCI_pdu;
int i; int i;
void *BCCH_alloc_pdu; //void *BCCH_alloc_pdu;
int size_bits,size_bytes; int size_bits,size_bytes;
int CC_id; int CC_id;
eNB_MAC_INST *eNB =&eNB_mac_inst[module_idP]; eNB_MAC_INST *eNB =&eNB_mac_inst[module_idP];
UE_list_t *UE_list = &eNB->UE_list; UE_list_t *UE_list = &eNB->UE_list;
RA_TEMPLATE *RA_template; //RA_TEMPLATE *RA_template;
start_meas(&eNB->fill_DLSCH_dci); start_meas(&eNB->fill_DLSCH_dci);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_FILL_DLSCH_DCI,VCD_FUNCTION_IN); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_FILL_DLSCH_DCI,VCD_FUNCTION_IN);
......
...@@ -1082,7 +1082,7 @@ boolean_t CCE_allocation_infeasible(int module_idP, ...@@ -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_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; int ret;
boolean_t res=FALSE; boolean_t res=FALSE;
......
...@@ -751,7 +751,7 @@ void dlsch_scheduler_pre_processor_reset (int module_idP, ...@@ -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; 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; int RBGsize = PHY_vars_eNB_g[module_idP][CC_id]->lte_frame_parms.N_RB_DL/N_RBG;
#ifdef SF05_LIMIT #ifdef SF05_LIMIT
int subframe05_limit=0; //int subframe05_limit=0;
int sf05_upper=-1,sf05_lower=-1; int sf05_upper=-1,sf05_lower=-1;
#endif #endif
LTE_eNB_UE_stats *eNB_UE_stats = mac_xface->get_eNB_UE_stats(module_idP,CC_id,rnti); 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, ...@@ -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) 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_list_t *UE_list = &eNB_mac_inst[module_idP].UE_list;
UE_TEMPLATE *UE_template; UE_TEMPLATE *UE_template;
...@@ -1231,7 +1231,7 @@ void sort_ue_ul (module_id_t module_idP,int frameP, sub_frame_t subframeP) ...@@ -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 UE_id1,UE_id2;
int pCCid1,pCCid2; int pCCid1,pCCid2;
int round1,round2; int round1,round2;
int i=0,ii=0,j=0; int i=0,ii=0;
rnti_t rnti1,rnti2; rnti_t rnti1,rnti2;
UE_list_t *UE_list = &eNB_mac_inst[module_idP].UE_list; UE_list_t *UE_list = &eNB_mac_inst[module_idP].UE_list;
......
...@@ -1032,6 +1032,8 @@ pdcp_remove_UE( ...@@ -1032,6 +1032,8 @@ pdcp_remove_UE(
} }
(void)h_rc; /* remove gcc warning "set but not used" */
return 1; return 1;
} }
......
...@@ -599,6 +599,7 @@ rlc_am_mac_status_indication ( ...@@ -599,6 +599,7 @@ rlc_am_mac_status_indication (
rlc_sn_t sn_end = (rlc->vt_a - 1) & RLC_AM_SN_MASK; rlc_sn_t sn_end = (rlc->vt_a - 1) & RLC_AM_SN_MASK;
int found_pdu = 0; int found_pdu = 0;
rlc_sn_t found_pdu_sn = 0; // avoid warning rlc_sn_t found_pdu_sn = 0; // avoid warning
(void)found_pdu_sn; /* avoid gcc warning "set but not used" */
while (sn != sn_end) { while (sn != sn_end) {
...@@ -917,6 +918,8 @@ rlc_am_mac_data_indication ( ...@@ -917,6 +918,8 @@ rlc_am_mac_data_indication (
int octet_index, index; int octet_index, index;
#endif #endif
(void)l_rlc_p; /* avoid gcc warning "unused variable" */
#if TRACE_RLC_AM_PDU || MESSAGE_CHART_GENERATOR #if TRACE_RLC_AM_PDU || MESSAGE_CHART_GENERATOR
if (data_indP.data.nb_elements > 0) { if (data_indP.data.nb_elements > 0) {
......
...@@ -634,7 +634,7 @@ rlc_op_status_t rrc_rlc_config_req ( ...@@ -634,7 +634,7 @@ rlc_op_status_t rrc_rlc_config_req (
const rlc_info_t rlc_infoP) 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", LOG_D(RLC, PROTOCOL_CTXT_FMT" CONFIG_REQ for RAB %u\n",
PROTOCOL_CTXT_ARGS(ctxt_pP), PROTOCOL_CTXT_ARGS(ctxt_pP),
......
...@@ -74,7 +74,7 @@ int dump_eNB_l2_stats(char *buffer, int length) ...@@ -74,7 +74,7 @@ int dump_eNB_l2_stats(char *buffer, int length)
int eNB_id,UE_id,number_of_cards; int eNB_id,UE_id,number_of_cards;
int len= length; int len= length;
int CC_id=0; int CC_id=0;
int i,j; int i;
protocol_ctxt_t ctxt; protocol_ctxt_t ctxt;
rlc_op_status_t rlc_status; rlc_op_status_t rlc_status;
unsigned int stat_rlc_mode; unsigned int stat_rlc_mode;
......
...@@ -261,6 +261,7 @@ static void init_SI_UE( const protocol_ctxt_t* const ctxt_pP, const uint8_t eNB_ ...@@ -261,6 +261,7 @@ static void init_SI_UE( const protocol_ctxt_t* const ctxt_pP, const uint8_t eNB_
#ifdef Rel10 #ifdef Rel10
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if 0
static void init_MCCH_UE(module_id_t ue_mod_idP, uint8_t eNB_index) static void init_MCCH_UE(module_id_t ue_mod_idP, uint8_t eNB_index)
{ {
int i; int i;
...@@ -274,6 +275,7 @@ static void init_MCCH_UE(module_id_t ue_mod_idP, uint8_t eNB_index) ...@@ -274,6 +275,7 @@ static void init_MCCH_UE(module_id_t ue_mod_idP, uint8_t eNB_index)
} }
} }
#endif #endif
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void openair_rrc_lite_ue_init_security( const protocol_ctxt_t* const ctxt_pP ) static void openair_rrc_lite_ue_init_security( const protocol_ctxt_t* const ctxt_pP )
......
...@@ -411,7 +411,7 @@ rrc_rx_tx( ...@@ -411,7 +411,7 @@ rrc_rx_tx(
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
{ {
uint8_t UE_id; //uint8_t UE_id;
int32_t current_timestamp_ms, ref_timestamp_ms; int32_t current_timestamp_ms, ref_timestamp_ms;
struct timeval ts; struct timeval ts;
#ifdef LOCALIZATION #ifdef LOCALIZATION
...@@ -547,6 +547,9 @@ rrc_rx_tx( ...@@ -547,6 +547,9 @@ rrc_rx_tx(
} }
#endif #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); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_OUT);
......
...@@ -1131,8 +1131,8 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration( ...@@ -1131,8 +1131,8 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration(
int i; int i;
// configure SRB1/SRB2, PhysicalConfigDedicated, MAC_MainConfig for UE // configure SRB1/SRB2, PhysicalConfigDedicated, MAC_MainConfig for UE
eNB_RRC_INST* rrc_inst = &eNB_rrc_inst[ctxt_pP->module_id]; //eNB_RRC_INST* rrc_inst = &eNB_rrc_inst[ctxt_pP->module_id];
struct PhysicalConfigDedicated** physicalConfigDedicated = &ue_context_pP->ue_context.physicalConfigDedicated; //struct PhysicalConfigDedicated** physicalConfigDedicated = &ue_context_pP->ue_context.physicalConfigDedicated;
struct SRB_ToAddMod *SRB2_config = NULL; struct SRB_ToAddMod *SRB2_config = NULL;
struct SRB_ToAddMod__rlc_Config *SRB2_rlc_config = NULL; struct SRB_ToAddMod__rlc_Config *SRB2_rlc_config = NULL;
...@@ -1145,7 +1145,7 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration( ...@@ -1145,7 +1145,7 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration(
struct DRB_ToAddMod *DRB_config = NULL; struct DRB_ToAddMod *DRB_config = NULL;
struct RLC_Config *DRB_rlc_config = NULL; struct RLC_Config *DRB_rlc_config = NULL;
struct PDCP_Config *DRB_pdcp_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 PDCP_Config__rlc_UM *PDCP_rlc_UM = NULL;
struct LogicalChannelConfig *DRB_lchan_config = NULL; struct LogicalChannelConfig *DRB_lchan_config = NULL;
struct LogicalChannelConfig__ul_SpecificParameters struct LogicalChannelConfig__ul_SpecificParameters
...@@ -1163,7 +1163,7 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration( ...@@ -1163,7 +1163,7 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration(
#if Rel10 #if Rel10
long *sr_ProhibitTimer_r9 = NULL; long *sr_ProhibitTimer_r9 = NULL;
// uint8_t sCellIndexToAdd = rrc_find_free_SCell_index(enb_mod_idP, ue_mod_idP, 1); // uint8_t sCellIndexToAdd = rrc_find_free_SCell_index(enb_mod_idP, ue_mod_idP, 1);
uint8_t sCellIndexToAdd = 0; //uint8_t sCellIndexToAdd = 0;
#endif #endif
long *logicalchannelgroup, *logicalchannelgroup_drb; long *logicalchannelgroup, *logicalchannelgroup_drb;
...@@ -2097,8 +2097,8 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover( ...@@ -2097,8 +2097,8 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover(
QuantityConfig_t *quantityConfig; QuantityConfig_t *quantityConfig;
MobilityControlInfo_t *mobilityInfo; MobilityControlInfo_t *mobilityInfo;
// HandoverCommand_t handoverCommand; // HandoverCommand_t handoverCommand;
uint8_t sourceModId = //uint8_t sourceModId =
get_adjacent_cell_mod_id(ue_context_pP->ue_context.handover_info->as_context.reestablishmentInfo->sourcePhysCellId); // get_adjacent_cell_mod_id(ue_context_pP->ue_context.handover_info->as_context.reestablishmentInfo->sourcePhysCellId);
#if Rel10 #if Rel10
long *sr_ProhibitTimer_r9; long *sr_ProhibitTimer_r9;
#endif #endif
...@@ -3010,7 +3010,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete( ...@@ -3010,7 +3010,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
uint8_t *kUPenc = NULL; uint8_t *kUPenc = NULL;
DRB_ToAddModList_t* DRB_configList = ue_context_pP->ue_context.DRB_configList; 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) #if defined(ENABLE_SECURITY)
......
...@@ -86,6 +86,7 @@ rrc_eNB_process_GTPV1U_CREATE_TUNNEL_RESP( ...@@ -86,6 +86,7 @@ rrc_eNB_process_GTPV1U_CREATE_TUNNEL_RESP(
create_tunnel_resp_pP->num_tunnels, create_tunnel_resp_pP->num_tunnels,
ue_context_p->ue_context.enb_gtp_ebi[0], ue_context_p->ue_context.enb_gtp_ebi[0],
ue_context_p->ue_context.enb_gtp_teid[0]); ue_context_p->ue_context.enb_gtp_teid[0]);
(void)rnti; /* avoid gcc warning "set but not used" */
return 0; return 0;
} else { } else {
return -1; return -1;
......
...@@ -672,7 +672,7 @@ rrc_eNB_send_S1AP_NAS_FIRST_REQ( ...@@ -672,7 +672,7 @@ rrc_eNB_send_S1AP_NAS_FIRST_REQ(
if (rrcConnectionSetupComplete->registeredMME != NULL) { if (rrcConnectionSetupComplete->registeredMME != NULL) {
/* Fill GUMMEI */ /* Fill GUMMEI */
struct RegisteredMME *r_mme = rrcConnectionSetupComplete->registeredMME; 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; 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 ...@@ -859,7 +859,7 @@ int rrc_eNB_process_S1AP_INITIAL_CONTEXT_SETUP_REQ(MessageDef *msg_p, const char
{ {
uint16_t ue_initial_id; uint16_t ue_initial_id;
uint32_t eNB_ue_s1ap_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_req_t create_tunnel_req;
gtpv1u_enb_create_tunnel_resp_t create_tunnel_resp; 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 ...@@ -1170,7 +1170,7 @@ int rrc_eNB_process_S1AP_UE_CONTEXT_RELEASE_COMMAND (MessageDef *msg_p, const ch
*/ */
{ {
int e_rab; int e_rab;
int mod_id = 0; //int mod_id = 0;
MessageDef *msg_delete_tunnels_p = NULL; MessageDef *msg_delete_tunnels_p = NULL;
MSC_LOG_TX_MESSAGE( MSC_LOG_TX_MESSAGE(
......
...@@ -158,6 +158,7 @@ remove_node_entry (node_struct * node, node_list * node_vector) ...@@ -158,6 +158,7 @@ remove_node_entry (node_struct * node, node_list * node_vector)
if (list->next->node->id == node->id) { if (list->next->node->id == node->id) {
toremove = tmp; // TODO delete the entry toremove = tmp; // TODO delete the entry
(void)toremove; /* avoid gcc warning "set but not used" */
tmp = list->next->next; tmp = list->next->next;
if (tmp != NULL) { if (tmp != NULL) {
...@@ -259,13 +260,11 @@ node_list * ...@@ -259,13 +260,11 @@ node_list *
remove_node (node_list * list, int nid, int node_type) remove_node (node_list * list, int nid, int node_type)
{ {
int found;
node_list *current = NULL, *previous = NULL; node_list *current = NULL, *previous = NULL;
//int cond=0; //int cond=0;
//int i=0; //int i=0;
if (list == NULL) { if (list == NULL) {
found = 1; //false
return NULL; return NULL;
} else { } else {
//start search //start search
...@@ -280,12 +279,10 @@ remove_node (node_list * list, int nid, int node_type) ...@@ -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 //holds: current = NULL or type != node_type or.., but not both
if (current == NULL) { if (current == NULL) {
found = 1;
LOG_E (OMG, " Element to remove is not found\n "); LOG_E (OMG, " Element to remove is not found\n ");
return NULL; return NULL;
} //value not found } //value not found
else { else {
found = 0; // true value found
if (current == list) { if (current == list) {
list = current->next; list = current->next;
...@@ -322,7 +319,6 @@ node_struct * ...@@ -322,7 +319,6 @@ node_struct *
find_node (node_list * list, int nid, int node_type) find_node (node_list * list, int nid, int node_type)
{ {
int found;
node_list *current; node_list *current;
if (list == NULL) { if (list == NULL) {
...@@ -340,7 +336,6 @@ find_node (node_list * list, int nid, int node_type) ...@@ -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 //holds: current = NULL or type != node_type or.., but not both
if (current == NULL) { if (current == NULL) {
found = 1;
LOG_D (OMG, LOG_D (OMG,
" Element to find in Node_Vector with ID: %d could not be found\n ", " Element to find in Node_Vector with ID: %d could not be found\n ",
nid); nid);
...@@ -380,7 +375,7 @@ node_list * ...@@ -380,7 +375,7 @@ node_list *
reset_node_list (node_list * list) reset_node_list (node_list * list)
{ {
node_list *tmp; node_list *tmp;
node_list *last = list; //node_list *last = list;
if (list == NULL) { if (list == NULL) {
//printf("Node_list is NULL\n"); //printf("Node_list is NULL\n");
......
...@@ -301,7 +301,7 @@ set_new_mob_type (int id, int node_t, int mob_t, double cur_time) ...@@ -301,7 +301,7 @@ set_new_mob_type (int id, int node_t, int mob_t, double cur_time)
int prev_mob; int prev_mob;
node_list *tmp; node_list *tmp;
job_list *tmp2, *prev_job; //job_list *tmp2, *prev_job;
pair_struct *pair; pair_struct *pair;
double pause_p; double pause_p;
......
...@@ -173,7 +173,7 @@ place_steadystaterwp_node (node_struct * node) ...@@ -173,7 +173,7 @@ place_steadystaterwp_node (node_struct * node)
void void
sleep_steadystaterwp_node (pair_struct * pair, double cur_time) sleep_steadystaterwp_node (pair_struct * pair, double cur_time)
{ {
static int initial = 1; //static int initial = 1;
node_struct *node; node_struct *node;
node = pair->b; node = pair->b;
node->mobile = 0; node->mobile = 0;
...@@ -209,10 +209,10 @@ sleep_steadystaterwp_node (pair_struct * pair, double cur_time) ...@@ -209,10 +209,10 @@ sleep_steadystaterwp_node (pair_struct * pair, double cur_time)
void void
move_steadystaterwp_node (pair_struct * pair, double cur_time) move_steadystaterwp_node (pair_struct * pair, double cur_time)
{ {
static int initial = 1; //static int initial = 1;
double distance, journeytime_next, max_distance;