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

Fixed some warnings.

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4511 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
winckel
2013-11-25 13:45:13 +00:00
parent 7e4aacabca
commit cef118a2be
2 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/SIMU/USER/oaisim_functions.c
+1 -1
View File
@@ -745,7 +745,7 @@ void update_omg () {
if (oai_emulation.info.omg_model_enb >= MAX_NUM_MOB_TYPES) { // mix mobility model if (oai_emulation.info.omg_model_enb >= MAX_NUM_MOB_TYPES) { // mix mobility model
for (eNB_id = oai_emulation.info.first_enb_local; eNB_id < (oai_emulation.info.first_enb_local + oai_emulation.info.nb_enb_local); eNB_id++) { for (eNB_id = oai_emulation.info.first_enb_local; eNB_id < (oai_emulation.info.first_enb_local + oai_emulation.info.nb_enb_local); eNB_id++) {
new_omg_model = randomGen (STATIC, RWALK); new_omg_model = randomGen (STATIC, RWALK);
LOG_D (OMG,"[eNB] Node of ID %d is changing mobility generator ->%d \n", UE_id, new_omg_model); LOG_D (OMG,"[eNB] Node of ID %d is changing mobility generator ->%d \n", eNB_id, new_omg_model);
// reset the mobility model for a specific node // reset the mobility model for a specific node
set_new_mob_type (eNB_id, eNB, new_omg_model, oai_emulation.info.time_s); set_new_mob_type (eNB_id, eNB, new_omg_model, oai_emulation.info.time_s);
} }
targets/SIMU/USER/sinr_sim.c
+12 -7
View File
@@ -536,8 +536,8 @@ void get_beta_map() {
} }
} }
// else { // else {
fgets(buffer, 1000, fp); if (fgets (buffer, 1000, fp) != NULL) {
fgets(buffer, 1000, fp); if (fgets (buffer, 1000, fp) != NULL) {
table_length[mcs] = 0; table_length[mcs] = 0;
while (!feof (fp)) { while (!feof (fp)) {
u = 0; u = 0;
@@ -552,8 +552,10 @@ void get_beta_map() {
sinr_bler_map[mcs][1][table_length[mcs]] = (perf_array[4] / perf_array[5]); sinr_bler_map[mcs][1][table_length[mcs]] = (perf_array[4] / perf_array[5]);
table_length[mcs]++; table_length[mcs]++;
} }
fgets(buffer, 1000, fp); if (fgets (buffer, 1000, fp) != NULL) {
}
}
}
} }
fclose(fp); fclose(fp);
// } // }
@@ -592,7 +594,7 @@ void get_MIESM_param() {
while (!feof(fp)) { while (!feof(fp)) {
table_len =0; table_len =0;
cnt++; cnt++;
fgets(buffer, 10000, fp); if (fgets(buffer, 10000, fp) != NULL) {
result = strtok (buffer, ","); result = strtok (buffer, ",");
while (result != NULL) { while (result != NULL) {
MI_map_4qam[cnt][table_len] = atof (result); MI_map_4qam[cnt][table_len] = atof (result);
@@ -600,6 +602,7 @@ void get_MIESM_param() {
table_len++; table_len++;
} }
} }
}
fclose(fp); fclose(fp);
for (t = 0; t < 162; t++){ for (t = 0; t < 162; t++){
// MI_map_4Qam[0][t] = pow(10,0.1*(MI_map_4Qam[0][t])); // MI_map_4Qam[0][t] = pow(10,0.1*(MI_map_4Qam[0][t]));
@@ -611,7 +614,7 @@ void get_MIESM_param() {
while (!feof(fp)) { while (!feof(fp)) {
table_len =0; table_len =0;
cnt++; cnt++;
fgets(buffer, 10000, fp); if (fgets (buffer, 10000, fp) != NULL) {
result = strtok (buffer, ","); result = strtok (buffer, ",");
while (result != NULL) { while (result != NULL) {
MI_map_16qam[cnt][table_len] = atof (result); MI_map_16qam[cnt][table_len] = atof (result);
@@ -619,6 +622,7 @@ void get_MIESM_param() {
table_len++; table_len++;
} }
} }
}
fclose(fp); fclose(fp);
for (t = 0; t < 197; t++){ for (t = 0; t < 197; t++){
// MI_map_16Qam[0][t] = pow(10,0.1*(MI_map_16Qam[0][t])); // MI_map_16Qam[0][t] = pow(10,0.1*(MI_map_16Qam[0][t]));
@@ -632,7 +636,7 @@ void get_MIESM_param() {
cnt++; cnt++;
if(cnt==3) if(cnt==3)
break; break;
fgets(buffer, 10000, fp); if (fgets (buffer, 10000, fp) != NULL) {
result = strtok(buffer, ","); result = strtok(buffer, ",");
while (result != NULL) { while (result != NULL) {
MI_map_64qam[cnt][table_len]= atof(result); MI_map_64qam[cnt][table_len]= atof(result);
@@ -640,6 +644,7 @@ void get_MIESM_param() {
table_len++; table_len++;
} }
} }
}
fclose(fp); fclose(fp);
for (t = 0; t < 227; t++){ for (t = 0; t < 227; t++){
//MI_map_64Qam[0][t] = pow(10,0.1*(MI_map_64Qam[0][t])); //MI_map_64Qam[0][t] = pow(10,0.1*(MI_map_64Qam[0][t]));