Skip to content

O
OpenXG-RAN
Commit eef2a582 authored by Laurent Thomas's avatar Laurent Thomas
Browse files
Options

fix bug introduced by thisbranch

parent b69c4465
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 20 deletions
openair1/PHY/NR_TRANSPORT/pucch_rx.c
View file @ eef2a582
...@@ -321,15 +321,19 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB, ...@@ -321,15 +321,19 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
} }
} }
} }
LOG_D(PHY,"PUCCH IDFT[%d/%d] = (%d,%d)=>%f\n",mcs[i],seq_index,corr_re[0][0],corr_im[0][0],10*log10((double)corr_re[0][0]*corr_re[0][0] + (double)corr_im[0][0]*corr_im[0][0])); LOG_D(PHY,"PUCCH IDFT[%d/%d] = (%d,%d)=>%f\n",
if (pucch_pdu->nr_of_symbols) LOG_D(PHY,"PUCCH 2nd symbol IDFT[%d/%d] = (%d,%d)=>%f\n",mcs[i],seq_index,corr_re[0][1],corr_im[0][1],10*log10((double)corr_re[0][1]*corr_re[0][1] + (double)corr_im[0][1]*corr_im[0][1])); mcs[i],seq_index,corr_re[0][0],corr_im[0][0],
if (pucch_pdu->freq_hop_flag == 0 && pucch_pdu->nr_of_symbols==1) {// non-coherent correlation 10*log10((double)corr_re[0][0]*corr_re[0][0] + (double)corr_im[0][0]*corr_im[0][0]));
if (pucch_pdu->nr_of_symbols==2)
LOG_D(PHY,"PUCCH 2nd symbol IDFT[%d/%d] = (%d,%d)=>%f\n",
mcs[i],seq_index,corr_re[0][1],corr_im[0][1],
10*log10((double)corr_re[0][1]*corr_re[0][1] + (double)corr_im[0][1]*corr_im[0][1]));
if (pucch_pdu->freq_hop_flag == 0) {
if (pucch_pdu->nr_of_symbols==1) {// non-coherent correlation
temp=0; temp=0;
for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++)
temp+=(int64_t)corr_re[aa][0]*corr_re[aa][0] + (int64_t)corr_im[aa][0]*corr_im[aa][0]; temp+=(int64_t)corr_re[aa][0]*corr_re[aa][0] + (int64_t)corr_im[aa][0]*corr_im[aa][0];
} } else {
else if (pucch_pdu->freq_hop_flag == 0 && pucch_pdu->nr_of_symbols==2) {
int64_t corr_re2=0; int64_t corr_re2=0;
int64_t corr_im2=0; int64_t corr_im2=0;
temp=0; temp=0;
...@@ -340,7 +344,7 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB, ...@@ -340,7 +344,7 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
temp+=corr_re2*corr_re2 + corr_im2*corr_im2; temp+=corr_re2*corr_re2 + corr_im2*corr_im2;
} }
} }
else if (pucch_pdu->freq_hop_flag == 1) { } else if (pucch_pdu->freq_hop_flag == 1) {
// full non-coherent combining of 2 symbols for frequency-hopping case // full non-coherent combining of 2 symbols for frequency-hopping case
temp=0; temp=0;
for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++) for (int aa=0;aa<frame_parms->nb_antennas_rx;aa++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment