From 916008f47d3a8e6814380cccfa0d1fabf212c8e0 Mon Sep 17 00:00:00 2001
From: Florian Kaltenberger <florian.kaltenberger@eurecom.fr>
Date: Wed, 28 Oct 2015 11:28:25 +0100
Subject: [PATCH] fixing a few compilation warnings in ulsim
---
openair1/PHY/LTE_TRANSPORT/proto.h | 5 ++++-
openair1/SIMULATION/LTE_PHY/ulsim.c | 16 ++++++++++++++--
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/proto.h b/openair1/PHY/LTE_TRANSPORT/proto.h
index eb32aab24e..e6aa7ef919 100644
--- a/openair1/PHY/LTE_TRANSPORT/proto.h
+++ b/openair1/PHY/LTE_TRANSPORT/proto.h
@@ -80,8 +80,11 @@ void clean_eNb_ulsch(LTE_eNB_ULSCH_t *ulsch, uint8_t abstraction_flag);
void free_ue_ulsch(LTE_UE_ULSCH_t *ulsch);
+LTE_eNB_ULSCH_t *new_eNB_ulsch(uint8_t Mdlharq,uint8_t max_turbo_iterations,uint8_t N_RB_UL, uint8_t abstraction_flag);
+
LTE_UE_ULSCH_t *new_ue_ulsch(uint8_t Mdlharq, unsigned char N_RB_UL, uint8_t abstraction_flag);
+uint8_t ul_subframe2pdcch_alloc_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n);
/** \fn dlsch_encoding(uint8_t *input_buffer,
@@ -1764,7 +1767,7 @@ double computeRhoB_UE(PDSCH_CONFIG_DEDICATED *pdsch_config_dedicated,
LTE_UE_DLSCH_t *dlsch_ue);
*/
- uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms, uint8_t tdd_mapindex, uint16_t Nf);
+uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms, uint8_t tdd_mapindex, uint16_t Nf);
/**@}*/
#endif
diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c
index dd697899b8..134e6b2885 100644
--- a/openair1/SIMULATION/LTE_PHY/ulsim.c
+++ b/openair1/SIMULATION/LTE_PHY/ulsim.c
@@ -214,6 +214,7 @@ int main(int argc, char **argv)
// FILE *rx_frame_file;
FILE *csv_fdUL=NULL;
+ /*
FILE *fperen=NULL;
char fperen_name[512];
@@ -222,6 +223,7 @@ int main(int argc, char **argv)
FILE *flogeren=NULL;
char flogeren_name[512];
+ */
/* FILE *ftxlev;
char ftxlev_name[512];
@@ -598,6 +600,7 @@ int main(int argc, char **argv)
time_meas_fd = fopen(time_meas_fname,"w");
}
+ /*
if(abstx) {
sprintf(fperen_name,"ULchan_estims_F_mcs%d_rb%d_chanMod%d_nframes%d_chanReal%d.m",mcs,nb_rb,chMod,n_frames,n_ch_rlz);
fperen = fopen(fperen_name,"a+");
@@ -614,6 +617,7 @@ int main(int argc, char **argv)
fprintf(flogeren,"mag_f = [");
fclose(flogeren);
}
+ */
/*
sprintf(ftxlev_name,"txlevel_mcs%d_rb%d_chanMod%d_nframes%d_chanReal%d.m",mcs,nb_rb,chMod,n_frames,n_ch_rlz);
@@ -626,6 +630,10 @@ int main(int argc, char **argv)
// CSV file
sprintf(csv_fname,"EULdataout_tx%d_mcs%d_nbrb%d_chan%d_nsimus%d_eren.m",transmission_mode,mcs,nb_rb,chMod,n_frames);
csv_fdUL = fopen(csv_fname,"w");
+ if (csv_fdUL == NULL) {
+ fprintf(stderr,"Problem opening file %s\n",csv_fname);
+ exit(-1);
+ }
fprintf(csv_fdUL,"data_all%d=[",mcs);
}
@@ -1270,11 +1278,13 @@ int main(int argc, char **argv)
PHY_vars_eNB->ulsch_eNB[0]->cyclicShift = cyclic_shift;// cyclic shift for DMRS
+ /*
if(abstx) {
namepointer_log2 = &flogeren_name;
namepointer_chMag = &fmageren_name;
//namepointer_txlev = &ftxlev;
}
+ */
start_meas(&PHY_vars_eNB->ulsch_demodulation_stats);
rx_ulsch(PHY_vars_eNB,
@@ -1285,6 +1295,7 @@ int main(int argc, char **argv)
cooperation_flag);
stop_meas(&PHY_vars_eNB->ulsch_demodulation_stats);
+ /*
if(abstx) {
namepointer_chMag = NULL;
@@ -1296,8 +1307,7 @@ int main(int argc, char **argv)
// flagMag = 1;
}
}
-
- ///////
+ */
start_meas(&PHY_vars_eNB->ulsch_decoding_stats);
ret= ulsch_decoding(PHY_vars_eNB,
@@ -1816,6 +1826,7 @@ int main(int argc, char **argv)
}//ch realization
+ /*
if(abstx) {
fperen = fopen(fperen_name,"a+");
fprintf(fperen,"];\n");
@@ -1829,6 +1840,7 @@ int main(int argc, char **argv)
fprintf(flogeren,"];\n");
fclose(flogeren);
}
+ */
// ftxlev = fopen(ftxlev_name,"a+");
//fprintf(ftxlev,"];\n");
--
GitLab