maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix some more compiler warnings

Browse Source 
Pre-ci tests passed


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4389 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Cedric Roux
2013-11-13 17:32:46 +00:00
parent 2c89929611
commit a58a5bc8c7
17 changed files with 81 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/SIMU/USER/channel_sim.c
+25 -15
View File
@@ -388,8 +388,12 @@ void do_DL_sig(double **r_re0,double **r_im0,
12);
rx_pwr2 = signal_energy(rxdata[0]+slot_offset,512);
#ifdef DEBUG_SIM
#ifdef DEBUG_SIM
LOG_D(OCM,"[SIM][DL] UE %d : rx_pwr (ADC out) %f dB (%d) for slot %d (subframe %d), writing to %p\n",UE_id, 10*log10((double)rx_pwr2),rx_pwr2,next_slot,next_slot>>1,rxdata);
#else
UNUSED_VARIABLE(rx_pwr2);
UNUSED_VARIABLE(tx_pwr);
UNUSED_VARIABLE(rx_pwr);
#endif
//}// UE_index loop
}
@@ -400,8 +404,9 @@ void do_DL_sig(double **r_re0,double **r_im0,
void do_UL_sig(double **r_re0,double **r_im0,double **r_re,double **r_im,double **s_re,double **s_im,channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX],node_desc_t *enb_data[NUMBER_OF_eNB_MAX],node_desc_t *ue_data[NUMBER_OF_UE_MAX],u16 next_slot,u8 abstraction_flag,LTE_DL_FRAME_PARMS *frame_parms, u32 frame) {
s32 **txdata,**rxdata;
#ifdef PHY_ABSTRACTION_UL
s32 att_eNB_id=-1;
#endif
u8 eNB_id=0,UE_id=0;
u8 nb_antennas_rx = UE2eNB[0][0]->nb_rx; // number of rx antennas at eNB
@@ -411,18 +416,18 @@ void do_UL_sig(double **r_re0,double **r_im0,double **r_re,double **r_im,double
s32 rx_pwr2;
u32 i,aa;
u32 slot_offset,slot_offset_meas;
double min_path_loss=-200;
u16 ul_nb_rb=0 ;
u16 ul_fr_rb=0;
int ulnbrb2 ;
int ulfrrb2 ;
u8 harq_pid;
u8 hold_channel=0;
int subframe = (next_slot>>1);
// u8 aatx,aarx;
u8 hold_channel=0;
#ifdef PHY_ABSTRACTION_UL
double min_path_loss=-200;
int subframe = (next_slot>>1);
u8 harq_pid;
u16 ul_nb_rb=0;
u16 ul_fr_rb=0;
#endif
if (next_slot==4)
{
@@ -624,8 +629,13 @@ void do_UL_sig(double **r_re0,double **r_im0,double **r_re,double **r_im,double
rx_pwr2 = signal_energy(rxdata[0]+slot_offset,frame_parms->samples_per_tti>>1);
#ifdef DEBUG_SIM
printf("[SIM][UL] eNB %d rx_pwr (ADC out) %f dB (%d) for slot %d (subframe %d)\n",eNB_id,10*log10((double)rx_pwr2),rx_pwr2,next_slot,next_slot>>1);
#endif
printf("[SIM][UL] eNB %d rx_pwr (ADC out) %f dB (%d) for slot %d (subframe %d)\n",
eNB_id,10*log10((double)rx_pwr2),rx_pwr2,next_slot,next_slot>>1);
#else
UNUSED_VARIABLE(tx_pwr);
UNUSED_VARIABLE(rx_pwr);
UNUSED_VARIABLE(rx_pwr2);
#endif
} // eNB_id
} // abstraction_flag==0
targets/SIMU/USER/sinr_sim.c
-1
View File
@@ -205,7 +205,6 @@ void calc_path_loss(node_desc_t* enb_data, node_desc_t* ue_data, channel_desc_t
void init_snr(channel_desc_t* eNB2UE, node_desc_t *enb_data, node_desc_t *ue_data, double* sinr_dB, double* N0, u8 transmission_mode, u16 q, u8 dl_power_off) {
int return_value;
u16 nb_rb = 25; //No. of resource blocks
double thermal_noise,abs_channel,channelx, channely,channelx_i, channely_i ;
int count;