Skip to content

O
OpenXG-RAN
Commit cb326e4a authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options

tracing information in pucchsim

parent 33ec87ae
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
openair1/PHY/LTE_TRANSPORT/pucch.c
View file @ cb326e4a
...@@ -2369,8 +2369,8 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB, ...@@ -2369,8 +2369,8 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
off=(re<<1) + (24*l) + (nsymb>>1)*24; off=(re<<1) + (24*l) + (nsymb>>1)*24;
tmp_re = ((rxcomp[aa][off]*(int32_t)cfo[l<<1])>>15) - ((rxcomp[aa][1+off]*(int32_t)cfo[1+(l<<1)])>>15); tmp_re = ((rxcomp[aa][off]*(int32_t)cfo[l<<1])>>15) - ((rxcomp[aa][1+off]*(int32_t)cfo[1+(l<<1)])>>15);
tmp_im = ((rxcomp[aa][off]*(int32_t)cfo[1+(l<<1)])>>15) + ((rxcomp[aa][1+off]*(int32_t)cfo[(l<<1)])>>15); tmp_im = ((rxcomp[aa][off]*(int32_t)cfo[1+(l<<1)])>>15) + ((rxcomp[aa][1+off]*(int32_t)cfo[(l<<1)])>>15);
stat_re += (((tmp_re*chest_re)>>15) + ((tmp_im*chest_im)>>15))/4; stat_re += (((tmp_re*chest_re)>>15) + ((tmp_im*chest_im)>>15));///4;
stat_im += (((tmp_re*chest_im)>>15) - ((tmp_im*chest_re)>>15))/4; stat_im += (((tmp_re*chest_im)>>15) - ((tmp_im*chest_re)>>15));///4;
off+=2; off+=2;
#ifdef DEBUG_PUCCH_RX #ifdef DEBUG_PUCCH_RX
printf("[PHY][eNB] PUCCH subframe %d (%d,%d) => (%d,%d) x (%d,%d) : (%d,%d)\n",subframe,l,re, printf("[PHY][eNB] PUCCH subframe %d (%d,%d) => (%d,%d) x (%d,%d) : (%d,%d)\n",subframe,l,re,
...@@ -2384,8 +2384,8 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB, ...@@ -2384,8 +2384,8 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
off=(re<<1) + (24*l) + (nsymb>>1)*24; off=(re<<1) + (24*l) + (nsymb>>1)*24;
tmp_re = ((rxcomp[aa][off]*(int32_t)cfo[l<<1])>>15) - ((rxcomp[aa][1+off]*(int32_t)cfo[1+(l<<1)])>>15); tmp_re = ((rxcomp[aa][off]*(int32_t)cfo[l<<1])>>15) - ((rxcomp[aa][1+off]*(int32_t)cfo[1+(l<<1)])>>15);
tmp_im = ((rxcomp[aa][off]*(int32_t)cfo[1+(l<<1)])>>15) + ((rxcomp[aa][1+off]*(int32_t)cfo[(l<<1)])>>15); tmp_im = ((rxcomp[aa][off]*(int32_t)cfo[1+(l<<1)])>>15) + ((rxcomp[aa][1+off]*(int32_t)cfo[(l<<1)])>>15);
stat_re += (((tmp_re*chest_re)>>15) + ((tmp_im*chest_im)>>15))/4; stat_re += (((tmp_re*chest_re)>>15) + ((tmp_im*chest_im)>>15));///4;
stat_im += (((tmp_re*chest_im)>>15) - ((tmp_im*chest_re)>>15))/4; stat_im += (((tmp_re*chest_im)>>15) - ((tmp_im*chest_re)>>15));///4;
off+=2; off+=2;
#ifdef DEBUG_PUCCH_RX #ifdef DEBUG_PUCCH_RX
printf("[PHY][eNB] PUCCH subframe %d (%d,%d) => (%d,%d) x (%d,%d) : (%d,%d)\n",subframe,l,re, printf("[PHY][eNB] PUCCH subframe %d (%d,%d) => (%d,%d) x (%d,%d) : (%d,%d)\n",subframe,l,re,
......
openair1/SIMULATION/LTE_PHY/pucchsim.c
View file @ cb326e4a
...@@ -378,12 +378,12 @@ int main(int argc, char **argv) ...@@ -378,12 +378,12 @@ int main(int argc, char **argv)
init_ul_hopping(&eNB->frame_parms); init_ul_hopping(&eNB->frame_parms);
init_ul_hopping(&UE->frame_parms); init_ul_hopping(&UE->frame_parms);
eNB->frame_parms.pucch_config_common.deltaPUCCH_Shift = 2; eNB->frame_parms.pucch_config_common.deltaPUCCH_Shift = 1;
eNB->frame_parms.pucch_config_common.nRB_CQI = 4; eNB->frame_parms.pucch_config_common.nRB_CQI = 0;
eNB->frame_parms.pucch_config_common.nCS_AN = 6; eNB->frame_parms.pucch_config_common.nCS_AN = 0;
UE->frame_parms.pucch_config_common.deltaPUCCH_Shift = 2; UE->frame_parms.pucch_config_common.deltaPUCCH_Shift = 1;
UE->frame_parms.pucch_config_common.nRB_CQI = 4; UE->frame_parms.pucch_config_common.nRB_CQI = 0;
UE->frame_parms.pucch_config_common.nCS_AN = 6; UE->frame_parms.pucch_config_common.nCS_AN = 0;
......
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