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

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5929 818b1a75-f10b-46b9-bf7c-635c3b92a50f

Browse Source
This commit is contained in:
Raymond Knopp
2014-10-21 19:05:46 +00:00
parent b4e354a5f4
commit 6a4edfbcf1
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/LTE_PHY/ulsim.c
+11 -10
View File
@@ -1190,10 +1190,10 @@ int main(int argc, char **argv) {
stop_meas(&PHY_vars_eNB->phy_proc_rx); stop_meas(&PHY_vars_eNB->phy_proc_rx);
if (cqi_flag > 0) { if (cqi_flag > 0) {
cqi_error = 0; cqi_error = 0;
if (PHY_vars_eNB->ulsch_eNB[0]->Or1 < 32) { if (PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->Or1 < 32) {
for (i=2;i<4;i++) { for (i=2;i<4;i++) {
// printf("cqi %d : %d (%d)\n",i,PHY_vars_eNB->ulsch_eNB[0]->o[i],PHY_vars_UE->ulsch_ue[0]->o[i]); // printf("cqi %d : %d (%d)\n",i,PHY_vars_eNB->ulsch_eNB[0]->o[i],PHY_vars_UE->ulsch_ue[0]->o[i]);
if (PHY_vars_eNB->ulsch_eNB[0]->o[i] != PHY_vars_UE->ulsch_ue[0]->o[i]) if (PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->o[i] != PHY_vars_UE->ulsch_ue[0]->o[i])
cqi_error = 1; cqi_error = 1;
} }
} }
@@ -1202,15 +1202,15 @@ int main(int argc, char **argv) {
} }
if (cqi_error == 1) { if (cqi_error == 1) {
cqi_errors++; cqi_errors++;
if (PHY_vars_eNB->ulsch_eNB[0]->cqi_crc_status == 1) if (PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->cqi_crc_status == 1)
cqi_crc_falsepositives++; cqi_crc_falsepositives++;
} }
else { else {
if (PHY_vars_eNB->ulsch_eNB[0]->cqi_crc_status == 0) if (PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->cqi_crc_status == 0)
cqi_crc_falsenegatives++; cqi_crc_falsenegatives++;
} }
} }
if (PHY_vars_eNB->ulsch_eNB[0]->o_ACK[0] != PHY_vars_UE->ulsch_ue[0]->o_ACK[0]) if (PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->o_ACK[0] != PHY_vars_UE->ulsch_ue[0]->o_ACK[0])
ack_errors++; ack_errors++;
// msg("ulsch_coding: O[%d] %d\n",i,o_flip[i]); // msg("ulsch_coding: O[%d] %d\n",i,o_flip[i]);
@@ -1221,9 +1221,10 @@ int main(int argc, char **argv) {
iter_trials++; iter_trials++;
if (n_frames==1) { if (n_frames==1) {
printf("No ULSCH errors found, o_ACK[0]= %d, cqi_crc_status=%d\n",PHY_vars_eNB->ulsch_eNB[0]->o_ACK[0],PHY_vars_eNB->ulsch_eNB[0]->cqi_crc_status); printf("No ULSCH errors found, o_ACK[0]= %d, cqi_crc_status=%d\n",PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->o_ACK[0],PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->cqi_crc_status);
if (PHY_vars_eNB->ulsch_eNB[0]->cqi_crc_status==1) if (PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->cqi_crc_status==1)
print_CQI(PHY_vars_eNB->ulsch_eNB[0]->o,PHY_vars_eNB->ulsch_eNB[0]->uci_format,0); print_CQI(PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->o,
PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->uci_format,0);
dump_ulsch(PHY_vars_eNB,subframe,0); dump_ulsch(PHY_vars_eNB,subframe,0);
exit(-1); exit(-1);
} }
@@ -1235,7 +1236,7 @@ int main(int argc, char **argv) {
errs[round]++; errs[round]++;
if (n_frames==1) { if (n_frames==1) {
printf("ULSCH errors found o_ACK[0]= %d\n",PHY_vars_eNB->ulsch_eNB[0]->o_ACK[0]); printf("ULSCH errors found o_ACK[0]= %d\n",PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->o_ACK[0]);
for (s=0;s<PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->C;s++) { for (s=0;s<PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->C;s++) {
if (s<PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->Cminus) if (s<PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->Cminus)
@@ -1309,7 +1310,7 @@ int main(int argc, char **argv) {
cqi_crc_falsepositives,round_trials[0]+round_trials[1]+round_trials[2]+round_trials[3], cqi_crc_falsepositives,round_trials[0]+round_trials[1]+round_trials[2]+round_trials[3],
cqi_crc_falsenegatives,round_trials[0]+round_trials[1]+round_trials[2]+round_trials[3]); cqi_crc_falsenegatives,round_trials[0]+round_trials[1]+round_trials[2]+round_trials[3]);
} }
if (PHY_vars_eNB->ulsch_eNB[0]->o_ACK[0] > 0) if (PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->o_ACK[0] > 0)
printf("ACK/NAK errors %d/%d\n",ack_errors,round_trials[0]+round_trials[1]+round_trials[2]+round_trials[3]); printf("ACK/NAK errors %d/%d\n",ack_errors,round_trials[0]+round_trials[1]+round_trials[2]+round_trials[3]);