Commit 5f823b40 authored by Cedric Roux's avatar Cedric Roux
Browse files

some more warning removals

parent f514c065
...@@ -288,7 +288,7 @@ int emu_transport_handle_ue_info(bypass_msg_header_t *messg, ...@@ -288,7 +288,7 @@ int emu_transport_handle_ue_info(bypass_msg_header_t *messg,
n_ue, total_header+total_tbs,total_header,total_tbs); n_ue, total_header+total_tbs,total_header,total_tbs);
} }
#warning "CC id should be adjusted, set to zero for the moment" //#warning "CC id should be adjusted, set to zero for the moment"
memcpy(&UE_transport_info[n_ue][CC_id], UE_info, total_header + total_tbs); memcpy(&UE_transport_info[n_ue][CC_id], UE_info, total_header + total_tbs);
/* Go to the next UE info */ /* Go to the next UE info */
......
...@@ -291,7 +291,6 @@ void fill_phy_enb_vars(unsigned int enb_id, uint8_t CC_id,unsigned int next_slot ...@@ -291,7 +291,6 @@ void fill_phy_enb_vars(unsigned int enb_id, uint8_t CC_id,unsigned int next_slot
LTE_eNB_DLSCH_t *dlsch_eNB; LTE_eNB_DLSCH_t *dlsch_eNB;
unsigned short ue_id; unsigned short ue_id;
uint8_t nb_total_dci; uint8_t nb_total_dci;
int i;
// eNB // eNB
// PBCH : copy payload // PBCH : copy payload
......
...@@ -220,7 +220,7 @@ int main(int argc, char **argv) ...@@ -220,7 +220,7 @@ int main(int argc, char **argv)
uint8_t N_RB_DL=25,osf=1; uint8_t N_RB_DL=25,osf=1;
frame_t frame_type = FDD; frame_t frame_type = FDD;
int xforms=0; int xforms=0;
FD_lte_phy_scope_ue *form_ue; FD_lte_phy_scope_ue *form_ue = NULL;
char title[255]; char title[255];
uint32_t DLSCH_RB_ALLOC = 0x1fff; uint32_t DLSCH_RB_ALLOC = 0x1fff;
int numCCE=0; int numCCE=0;
...@@ -2624,6 +2624,8 @@ PMI_FEEDBACK: ...@@ -2624,6 +2624,8 @@ PMI_FEEDBACK:
num_pdcch_symbols, num_pdcch_symbols,
PHY_vars_eNB->dlsch_eNB[k][0], PHY_vars_eNB->dlsch_eNB[k][0],
PHY_vars_eNB->dlsch_eNB[k][1]); PHY_vars_eNB->dlsch_eNB[k][1]);
/* avoid gcc warnings */
(void)re_allocated;
stop_meas(&PHY_vars_eNB->dlsch_modulation_stats); stop_meas(&PHY_vars_eNB->dlsch_modulation_stats);
/* /*
......
...@@ -583,10 +583,10 @@ int main(int argc, char **argv) ...@@ -583,10 +583,10 @@ int main(int argc, char **argv)
mcs,N_RB_DL,mcs,N_RB_DL,errs[0], mcs,N_RB_DL,mcs,N_RB_DL,errs[0],
mcs,N_RB_DL,mcs,N_RB_DL,trials); mcs,N_RB_DL,mcs,N_RB_DL,trials);
else else
fprintf(fd,"SNR_awgn_%d = [SNR_awgn_%d %d]; errs_mch_awgn_%d =[errs_mch_awgn_%f %d]; mch_trials_awgn_%d =[mch_trials_awgn_%d %d];\n", fprintf(fd,"SNR_awgn_%d = [SNR_awgn_%d %f]; errs_mch_awgn_%d =[errs_mch_awgn_%d %d]; mch_trials_awgn_%d =[mch_trials_awgn_%d %d];\n",
mcs,N_RB_DL,mcs,N_RB_DL,SNR, N_RB_DL,N_RB_DL,SNR,
mcs,N_RB_DL,mcs,N_RB_DL,errs[0], N_RB_DL,N_RB_DL,errs[0],
mcs,N_RB_DL,mcs,N_RB_DL,trials); N_RB_DL,N_RB_DL,trials);
fflush(fd); fflush(fd);
......
...@@ -80,9 +80,9 @@ int main(int argc, char **argv) ...@@ -80,9 +80,9 @@ int main(int argc, char **argv)
unsigned char pbch_pdu[6]; unsigned char pbch_pdu[6];
// int sync_pos, sync_pos_slot; // int sync_pos, sync_pos_slot;
// FILE *rx_frame_file; // FILE *rx_frame_file;
FILE *output_fd; FILE *output_fd = NULL;
uint8_t write_output_file=0; uint8_t write_output_file=0;
int result; //int result;
int freq_offset; int freq_offset;
// int subframe_offset; // int subframe_offset;
// char fname[40], vname[40]; // char fname[40], vname[40];
...@@ -91,8 +91,8 @@ int main(int argc, char **argv) ...@@ -91,8 +91,8 @@ int main(int argc, char **argv)
uint16_t Nid_cell=0; uint16_t Nid_cell=0;
int n_frames=1; int n_frames=1;
channel_desc_t *eNB2UE,*eNB2UE1,*eNB2UE2; channel_desc_t *eNB2UE,*eNB2UE1 = NULL,*eNB2UE2 = NULL;
uint32_t nsymb,tx_lev,tx_lev1,tx_lev2; uint32_t nsymb,tx_lev,tx_lev1 = 0,tx_lev2 = 0;
uint8_t extended_prefix_flag=0; uint8_t extended_prefix_flag=0;
int8_t interf1=-21,interf2=-21; int8_t interf1=-21,interf2=-21;
LTE_DL_FRAME_PARMS *frame_parms; LTE_DL_FRAME_PARMS *frame_parms;
...@@ -104,12 +104,12 @@ int main(int argc, char **argv) ...@@ -104,12 +104,12 @@ int main(int argc, char **argv)
char input_val_str[50],input_val_str2[50]; char input_val_str[50],input_val_str2[50];
// double input_val1,input_val2; // double input_val1,input_val2;
// uint16_t amask=0; // uint16_t amask=0;
uint8_t frame_mod4,num_pdcch_symbols; uint8_t frame_mod4,num_pdcch_symbols = 0;
uint16_t NB_RB=25; uint16_t NB_RB=25;
SCM_t channel_model=AWGN;//Rayleigh1_anticorr; SCM_t channel_model=AWGN;//Rayleigh1_anticorr;
DCI_ALLOC_t dci_alloc[8]; //DCI_ALLOC_t dci_alloc[8];
uint8_t abstraction_flag=0;//,calibration_flag=0; uint8_t abstraction_flag=0;//,calibration_flag=0;
double pbch_sinr; double pbch_sinr;
int pbch_tx_ant; int pbch_tx_ant;
...@@ -782,7 +782,10 @@ int main(int argc, char **argv) ...@@ -782,7 +782,10 @@ int main(int argc, char **argv)
i=0; i=0;
while (!feof(input_fd)) { while (!feof(input_fd)) {
fscanf(input_fd,"%s %s",input_val_str,input_val_str2);//&input_val1,&input_val2); if (fscanf(input_fd,"%s %s",input_val_str,input_val_str2) != 2) { //&input_val1,&input_val2);
printf("%s:%d:%s: error with fscanf, exiting\n", __FILE__, __LINE__, __FUNCTION__);
exit(1);
}
if ((i%4)==0) { if ((i%4)==0) {
((short*)txdata[0])[i/2] = (short)((1<<15)*strtod(input_val_str,NULL)); ((short*)txdata[0])[i/2] = (short)((1<<15)*strtod(input_val_str,NULL));
......
...@@ -67,9 +67,9 @@ DCI_PDU *get_dci(LTE_DL_FRAME_PARMS *lte_frame_parms,uint8_t log2L, uint8_t log2 ...@@ -67,9 +67,9 @@ DCI_PDU *get_dci(LTE_DL_FRAME_PARMS *lte_frame_parms,uint8_t log2L, uint8_t log2
uint32_t UL_alloc_pdu[2]; uint32_t UL_alloc_pdu[2];
int i; int i;
int dci_length_bytes,dci_length; int dci_length_bytes=0,dci_length=0;
int BCCH_pdu_size_bits, BCCH_pdu_size_bytes; int BCCH_pdu_size_bits=0, BCCH_pdu_size_bytes=0;
int UL_pdu_size_bits, UL_pdu_size_bytes; int UL_pdu_size_bits=0, UL_pdu_size_bytes=0;
int mcs = 3; int mcs = 3;
DCI_pdu.Num_ue_spec_dci = 0; DCI_pdu.Num_ue_spec_dci = 0;
...@@ -789,6 +789,11 @@ int main(int argc, char **argv) ...@@ -789,6 +789,11 @@ int main(int argc, char **argv)
while (!feof(input_fd)) { while (!feof(input_fd)) {
ret=fscanf(input_fd,"%s %s",input_val_str,input_val_str2);//&input_val1,&input_val2); ret=fscanf(input_fd,"%s %s",input_val_str,input_val_str2);//&input_val1,&input_val2);
if (ret != 2) {
printf("%s:%d:%s: fscanf error, exiting\n", __FILE__, __LINE__, __FUNCTION__);
exit(1);
}
if ((i%4)==0) { if ((i%4)==0) {
((short*)txdata[0])[i/2] = (short)((1<<15)*strtod(input_val_str,NULL)); ((short*)txdata[0])[i/2] = (short)((1<<15)*strtod(input_val_str,NULL));
((short*)txdata[0])[(i/2)+1] = (short)((1<<15)*strtod(input_val_str2,NULL)); ((short*)txdata[0])[(i/2)+1] = (short)((1<<15)*strtod(input_val_str2,NULL));
......
...@@ -58,6 +58,8 @@ PHY_VARS_UE *PHY_vars_UE; ...@@ -58,6 +58,8 @@ PHY_VARS_UE *PHY_vars_UE;
extern uint16_t prach_root_sequence_map0_3[838]; extern uint16_t prach_root_sequence_map0_3[838];
void dump_prach_config(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe);
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
...@@ -74,7 +76,7 @@ int main(int argc, char **argv) ...@@ -74,7 +76,7 @@ int main(int argc, char **argv)
int **txdata; int **txdata;
double **s_re,**s_im,**r_re,**r_im; double **s_re,**s_im,**r_re,**r_im;
double iqim=0.0; double iqim=0.0;
int trial, ntrials=1; int trial; //, ntrials=1;
uint8_t transmission_mode = 1,n_tx=1,n_rx=1; uint8_t transmission_mode = 1,n_tx=1,n_rx=1;
uint16_t Nid_cell=0; uint16_t Nid_cell=0;
...@@ -82,7 +84,7 @@ int main(int argc, char **argv) ...@@ -82,7 +84,7 @@ int main(int argc, char **argv)
uint8_t hs_flag=0; uint8_t hs_flag=0;
int n_frames=1; int n_frames=1;
channel_desc_t *UE2eNB; channel_desc_t *UE2eNB;
uint32_t nsymb,tx_lev,tx_lev_dB; uint32_t nsymb,tx_lev; //,tx_lev_dB;
uint8_t extended_prefix_flag=0; uint8_t extended_prefix_flag=0;
// int8_t interf1=-19,interf2=-19; // int8_t interf1=-19,interf2=-19;
LTE_DL_FRAME_PARMS *frame_parms; LTE_DL_FRAME_PARMS *frame_parms;
...@@ -101,8 +103,8 @@ int main(int argc, char **argv) ...@@ -101,8 +103,8 @@ int main(int argc, char **argv)
uint16_t preamble_energy_list[64],preamble_tx=99,preamble_delay_list[64]; uint16_t preamble_energy_list[64],preamble_tx=99,preamble_delay_list[64];
uint16_t preamble_max,preamble_energy_max; uint16_t preamble_max,preamble_energy_max;
PRACH_RESOURCES_t prach_resources; PRACH_RESOURCES_t prach_resources;
uint8_t prach_fmt; //uint8_t prach_fmt;
int N_ZC; //int N_ZC;
int delay = 0; int delay = 0;
double delay_avg=0; double delay_avg=0;
double ue_speed = 0; double ue_speed = 0;
...@@ -126,7 +128,8 @@ int main(int argc, char **argv) ...@@ -126,7 +128,8 @@ int main(int argc, char **argv)
case 'a': case 'a':
printf("Running AWGN simulation\n"); printf("Running AWGN simulation\n");
awgn_flag = 1; awgn_flag = 1;
ntrials=1; /* ntrials not used later, no need to set */
//ntrials=1;
break; break;
case 'd': case 'd':
...@@ -404,9 +407,11 @@ int main(int argc, char **argv) ...@@ -404,9 +407,11 @@ int main(int argc, char **argv)
PHY_vars_eNB->lte_frame_parms.prach_config_common.prach_ConfigInfo.highSpeedFlag=hs_flag; PHY_vars_eNB->lte_frame_parms.prach_config_common.prach_ConfigInfo.highSpeedFlag=hs_flag;
PHY_vars_eNB->lte_frame_parms.prach_config_common.prach_ConfigInfo.prach_FreqOffset=0; PHY_vars_eNB->lte_frame_parms.prach_config_common.prach_ConfigInfo.prach_FreqOffset=0;
prach_fmt = get_prach_fmt(PHY_vars_eNB->lte_frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex, /* N_ZC not used later, so prach_fmt is also useless, don't set */
PHY_vars_eNB->lte_frame_parms.frame_type); //prach_fmt = get_prach_fmt(PHY_vars_eNB->lte_frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex,
N_ZC = (prach_fmt <4)?839:139; // PHY_vars_eNB->lte_frame_parms.frame_type);
/* N_ZC not used later, no need to set */
//N_ZC = (prach_fmt <4)?839:139;
compute_prach_seq(&PHY_vars_eNB->lte_frame_parms.prach_config_common,PHY_vars_eNB->lte_frame_parms.frame_type,PHY_vars_eNB->X_u); compute_prach_seq(&PHY_vars_eNB->lte_frame_parms.prach_config_common,PHY_vars_eNB->lte_frame_parms.frame_type,PHY_vars_eNB->X_u);
...@@ -430,7 +435,8 @@ int main(int argc, char **argv) ...@@ -430,7 +435,8 @@ int main(int argc, char **argv)
subframe, subframe,
0); //Nf 0); //Nf
tx_lev_dB = (unsigned int) dB_fixed(tx_lev); /* tx_lev_dB not used later, no need to set */
//tx_lev_dB = (unsigned int) dB_fixed(tx_lev);
write_output("txsig0_new.m","txs0", &txdata[0][subframe*frame_parms->samples_per_tti],frame_parms->samples_per_tti,1,1); write_output("txsig0_new.m","txs0", &txdata[0][subframe*frame_parms->samples_per_tti],frame_parms->samples_per_tti,1,1);
//write_output("txsig1.m","txs1", txdata[1],FRAME_LENGTH_COMPLEX_SAMPLES,1,1); //write_output("txsig1.m","txs1", txdata[1],FRAME_LENGTH_COMPLEX_SAMPLES,1,1);
......
...@@ -285,6 +285,9 @@ void *eNB_app_task(void *args_p) ...@@ -285,6 +285,9 @@ void *eNB_app_task(void *args_p)
instance_t instance; instance_t instance;
int result; int result;
/* for no gcc warnings */
(void)instance;
itti_mark_task_ready (TASK_ENB_APP); itti_mark_task_ready (TASK_ENB_APP);
# if defined(ENABLE_USE_MME) # if defined(ENABLE_USE_MME)
...@@ -420,5 +423,8 @@ void *eNB_app_task(void *args_p) ...@@ -420,5 +423,8 @@ void *eNB_app_task(void *args_p)
#endif #endif
/* for no gcc warnings */
(void)enb_properties_p;
return NULL; return NULL;
} }
...@@ -649,6 +649,10 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP) ...@@ -649,6 +649,10 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP)
char* osa_log_level = NULL; char* osa_log_level = NULL;
char* osa_log_verbosity = NULL; char* osa_log_verbosity = NULL;
/* for no gcc warnings */
(void)astring;
(void)my_int;
memset((char*) (enb_properties.properties), 0 , MAX_ENB * sizeof(Enb_properties_t *)); memset((char*) (enb_properties.properties), 0 , MAX_ENB * sizeof(Enb_properties_t *));
memset((char*)active_enb, 0 , MAX_ENB * sizeof(char*)); memset((char*)active_enb, 0 , MAX_ENB * sizeof(char*));
......
...@@ -86,7 +86,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag, ...@@ -86,7 +86,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
int mbsfn_status[MAX_NUM_CCs]; int mbsfn_status[MAX_NUM_CCs];
protocol_ctxt_t ctxt; protocol_ctxt_t ctxt;
#ifdef EXMIMO #ifdef EXMIMO
int ret; //int ret;
#endif #endif
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
MessageDef *msg_p; MessageDef *msg_p;
......
...@@ -692,7 +692,7 @@ pdcp_data_ind( ...@@ -692,7 +692,7 @@ pdcp_data_ind(
#if defined(USER_MODE) && defined(OAI_EMU) #if defined(USER_MODE) && defined(OAI_EMU)
if (oai_emulation.info.otg_enabled == 1) { if (oai_emulation.info.otg_enabled == 1) {
unsigned int dst_instance; //unsigned int dst_instance;
int ctime; int ctime;
if ((pdcp_p->rlc_mode == RLC_MODE_AM)&&(MBMS_flagP==0) ) { if ((pdcp_p->rlc_mode == RLC_MODE_AM)&&(MBMS_flagP==0) ) {
......
...@@ -313,6 +313,8 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP) ...@@ -313,6 +313,8 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
hash_key_t key = HASHTABLE_NOT_A_KEY_VALUE; hash_key_t key = HASHTABLE_NOT_A_KEY_VALUE;
hashtable_rc_t h_rc; hashtable_rc_t h_rc;
struct pdcp_netlink_element_s* data_p = NULL; struct pdcp_netlink_element_s* data_p = NULL;
/* avoid gcc warnings */
(void)data_p;
module_id_t ue_id = 0; module_id_t ue_id = 0;
pdcp_t* pdcp_p = NULL; pdcp_t* pdcp_p = NULL;
# if defined(PDCP_USE_NETLINK_QUEUES) # if defined(PDCP_USE_NETLINK_QUEUES)
...@@ -565,7 +567,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP) ...@@ -565,7 +567,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
} }
} else { // rb_id =0, thus interpreated as broadcast and transported as multiple unicast } else { // rb_id =0, thus interpreated as broadcast and transported as multiple unicast
// is a broadcast packet, we have to send this packet on all default RABS of all connected UEs // is a broadcast packet, we have to send this packet on all default RABS of all connected UEs
#warning CODE TO BE REVIEWED, ONLY WORK FOR SIMPLE TOPOLOGY CASES //#warning CODE TO BE REVIEWED, ONLY WORK FOR SIMPLE TOPOLOGY CASES
for (ue_id = 0; ue_id < NB_UE_INST; ue_id++) { for (ue_id = 0; ue_id < NB_UE_INST; ue_id++) {
if (oai_emulation.info.eNB_ue_module_id_to_rnti[ctxt_cpy.module_id][ue_id] != NOT_A_RNTI) { if (oai_emulation.info.eNB_ue_module_id_to_rnti[ctxt_cpy.module_id][ue_id] != NOT_A_RNTI) {
ctxt.rnti = oai_emulation.info.eNB_ue_module_id_to_rnti[ctxt_cpy.module_id][ue_id]; ctxt.rnti = oai_emulation.info.eNB_ue_module_id_to_rnti[ctxt_cpy.module_id][ue_id];
......
...@@ -682,6 +682,12 @@ rlc_am_mac_data_request ( ...@@ -682,6 +682,12 @@ rlc_am_mac_data_request (
MessageDef *msg_p; MessageDef *msg_p;
# endif # endif
int octet_index, index; int octet_index, index;
/* for no gcc warnings */
(void)num_nack;
(void)message_string;
(void)message_string_size;
(void)octet_index;
(void)index;
#endif #endif
list_init (&data_req.data, NULL); list_init (&data_req.data, NULL);
...@@ -916,6 +922,12 @@ rlc_am_mac_data_indication ( ...@@ -916,6 +922,12 @@ rlc_am_mac_data_indication (
MessageDef *msg_p; MessageDef *msg_p;
# endif # endif
int octet_index, index; int octet_index, index;
/* for no gcc warnings */
(void)num_nack;
(void)message_string;
(void)message_string_size;
(void)octet_index;
(void)index;
#endif #endif
(void)l_rlc_p; /* avoid gcc warning "unused variable" */ (void)l_rlc_p; /* avoid gcc warning "unused variable" */
......
...@@ -745,7 +745,7 @@ rlc_um_data_req (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, mem_block_t ...@@ -745,7 +745,7 @@ rlc_um_data_req (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, mem_block_t
/* /*
* Print every single octet in hexadecimal form * Print every single octet in hexadecimal form
*/ */
message_string_size += sprintf(&message_string[message_string_size], " %02x", (uint8_t*)(&sdu_pP->data[data_offset])[octet_index]); message_string_size += sprintf(&message_string[message_string_size], " %02x", ((uint8_t*)(&sdu_pP->data[data_offset]))[octet_index]);
/* /*
* Align newline and pipes according to the octets in groups of 2 * Align newline and pipes according to the octets in groups of 2
*/ */
......
...@@ -602,6 +602,9 @@ rlc_module_init (void) ...@@ -602,6 +602,9 @@ rlc_module_init (void)
int k; int k;
module_id_t module_id1; module_id_t module_id1;
/* for no gcc warnings */
(void)k;
LOG_D(RLC, "MODULE INIT\n"); LOG_D(RLC, "MODULE INIT\n");
rlc_rrc_data_ind = NULL; rlc_rrc_data_ind = NULL;
rlc_rrc_data_conf = NULL; rlc_rrc_data_conf = NULL;
......
...@@ -87,6 +87,11 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP ...@@ -87,6 +87,11 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
#endif #endif
/* for no gcc warnings */
(void)rlc_union_p;
(void)key;
(void)h_rc;
LOG_D(RLC, PROTOCOL_CTXT_FMT" CONFIG REQ ASN1 \n", LOG_D(RLC, PROTOCOL_CTXT_FMT" CONFIG REQ ASN1 \n",
PROTOCOL_CTXT_ARGS(ctxt_pP)); PROTOCOL_CTXT_ARGS(ctxt_pP));
...@@ -463,6 +468,9 @@ rlc_op_status_t rrc_rlc_remove_rlc ( ...@@ -463,6 +468,9 @@ rlc_op_status_t rrc_rlc_remove_rlc (
#endif #endif
/* for no gcc warnings */
(void)lcid;
#ifdef Rel10 #ifdef Rel10
if (MBMS_flagP == TRUE) { if (MBMS_flagP == TRUE) {
......
...@@ -355,6 +355,10 @@ mac_rrc_lite_data_ind( ...@@ -355,6 +355,10 @@ mac_rrc_lite_data_ind(
SRB_INFO *Srb_info; SRB_INFO *Srb_info;
protocol_ctxt_t ctxt; protocol_ctxt_t ctxt;
sdu_size_t sdu_size = 0; sdu_size_t sdu_size = 0;
/* for no gcc warnings */
(void)sdu_size;
/* /*
int si_window; int si_window;
*/ */
...@@ -389,7 +393,7 @@ mac_rrc_lite_data_ind( ...@@ -389,7 +393,7 @@ mac_rrc_lite_data_ind(
itti_send_msg_to_task (TASK_RRC_UE, ctxt.instance, message_p); itti_send_msg_to_task (TASK_RRC_UE, ctxt.instance, message_p);
} }
#else #else
decode_BCCH_DLSCH_Message(&ctxt,eNB_indexP,sduP,sdu_lenP, 0, 0); decode_BCCH_DLSCH_Message(&ctxt,eNB_indexP,(uint8_t*)sduP,sdu_lenP, 0, 0);
#endif #endif
} }
...@@ -634,7 +638,7 @@ rrc_lite_data_ind( ...@@ -634,7 +638,7 @@ rrc_lite_data_ind(
buffer_pP, buffer_pP,
sdu_sizeP); sdu_sizeP);
} else { } else {
#warning "LG put 0 to arg4 that is eNB index" //#warning "LG put 0 to arg4 that is eNB index"
rrc_ue_decode_dcch( rrc_ue_decode_dcch(
ctxt_pP, ctxt_pP,
DCCH_index, DCCH_index,
......
...@@ -141,7 +141,9 @@ static uint8_t check_trigger_meas_event( ...@@ -141,7 +141,9 @@ static uint8_t check_trigger_meas_event(
Q_OffsetRange_t ofn, Q_OffsetRange_t ocn, Hysteresis_t hys, Q_OffsetRange_t ofn, Q_OffsetRange_t ocn, Hysteresis_t hys,
Q_OffsetRange_t ofs, Q_OffsetRange_t ocs, long a3_offset, TimeToTrigger_t ttt); Q_OffsetRange_t ofs, Q_OffsetRange_t ocs, long a3_offset, TimeToTrigger_t ttt);
#ifdef Rel10
static void decode_MBSFNAreaConfiguration(module_id_t module_idP, uint8_t eNB_index, frame_t frameP,uint8_t mbsfn_sync_area); static void decode_MBSFNAreaConfiguration(module_id_t module_idP, uint8_t eNB_index, frame_t frameP,uint8_t mbsfn_sync_area);
#endif
...@@ -151,10 +153,13 @@ static void decode_MBSFNAreaConfiguration(module_id_t module_idP, uint8_t eNB_in ...@@ -151,10 +153,13 @@ static void decode_MBSFNAreaConfiguration(module_id_t module_idP, uint8_t eNB_in
/*------------------------------------------------------------------------------*/ /*------------------------------------------------------------------------------*/
/* to avoid gcc warnings when compiling with certain options */
#if defined(ENABLE_USE_MME) || ENABLE_RAL
static Rrc_State_t rrc_get_state (module_id_t ue_mod_idP) static Rrc_State_t rrc_get_state (module_id_t ue_mod_idP)
{ {
return UE_rrc_inst[ue_mod_idP].RrcState; return UE_rrc_inst[ue_mod_idP].RrcState;
} }
#endif
static Rrc_Sub_State_t rrc_get_sub_state (module_id_t ue_mod_idP) static Rrc_Sub_State_t rrc_get_sub_state (module_id_t ue_mod_idP)
{ {
...@@ -1298,7 +1303,7 @@ rrc_ue_process_radioResourceConfigDedicated( ...@@ -1298,7 +1303,7 @@ rrc_ue_process_radioResourceConfigDedicated(
UE_rrc_inst[ctxt_pP->module_id].sib1[eNB_index]->cellAccessRelatedInfo.cellIdentity.buf[1], UE_rrc_inst[ctxt_pP->module_id].sib1[eNB_index]->cellAccessRelatedInfo.cellIdentity.buf[1],
UE_rrc_inst[ctxt_pP->module_id].sib1[eNB_index]->cellAccessRelatedInfo.cellIdentity.buf[2], UE_rrc_inst[ctxt_pP->module_id].sib1[eNB_index]->cellAccessRelatedInfo.cellIdentity.buf[2],
UE_rrc_inst[ctxt_pP->module_id].sib1[eNB_index]->cellAccessRelatedInfo.cellIdentity.buf[3]); UE_rrc_inst[ctxt_pP->module_id].sib1[eNB_index]->cellAccessRelatedInfo.cellIdentity.buf[3]);
# endif OAI_EMU # endif /* OAI_EMU */
#endif #endif
} }
......
...@@ -253,6 +253,9 @@ openair_rrc_top_init( ...@@ -253,6 +253,9 @@ openair_rrc_top_init(
OAI_UECapability_t *UECap = NULL; OAI_UECapability_t *UECap = NULL;
int CC_id; int CC_id;
/* for no gcc warnings */
(void)CC_id;
LOG_D(RRC, "[OPENAIR][INIT] Init function start: NB_UE_INST=%d, NB_eNB_INST=%d\n", NB_UE_INST, NB_eNB_INST); LOG_D(RRC, "[OPENAIR][INIT] Init function start: NB_UE_INST=%d, NB_eNB_INST=%d\n", NB_UE_INST, NB_eNB_INST);
if (NB_UE_INST > 0) { if (NB_UE_INST > 0) {
......
...@@ -796,6 +796,8 @@ rrc_eNB_free_UE( ...@@ -796,6 +796,8 @@ rrc_eNB_free_UE(
protocol_ctxt_t ctxt; protocol_ctxt_t ctxt;
#if !defined(ENABLE_USE_MME) #if !defined(ENABLE_USE_MME)