Skip to content

O
OpenXG-RAN
Commit 6ba07564 authored by Cedric Roux's avatar Cedric Roux
Browse files
Options

fix: do not modify dlsch[0]->g_pucch 

This is done in another function.
parent 8d7c06b1
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 12 deletions
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @ 6ba07564
...@@ -4043,7 +4043,6 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4043,7 +4043,6 @@ int generate_ue_dlsch_params_from_dci(int frame,
NPRB = RIV2nb_rb_LUT6[rballoc]; NPRB = RIV2nb_rb_LUT6[rballoc];
dlsch0_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3]; dlsch0_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3];
dlsch[0]->g_pucch += delta_PUCCH_lut[TPC&3];
} }
...@@ -4101,9 +4100,6 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4101,9 +4100,6 @@ int generate_ue_dlsch_params_from_dci(int frame,
dlsch0_harq = dlsch[0]->harq_processes[harq_pid]; dlsch0_harq = dlsch[0]->harq_processes[harq_pid];
NPRB = RIV2nb_rb_LUT25[rballoc]; NPRB = RIV2nb_rb_LUT25[rballoc];
dlsch0_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3]; dlsch0_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3];
dlsch[0]->g_pucch += delta_PUCCH_lut[TPC&3];
} }
if (vrb_type == LOCALIZED) { if (vrb_type == LOCALIZED) {
...@@ -4157,9 +4153,6 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4157,9 +4153,6 @@ int generate_ue_dlsch_params_from_dci(int frame,
dlsch0_harq = dlsch[0]->harq_processes[harq_pid]; dlsch0_harq = dlsch[0]->harq_processes[harq_pid];
NPRB = RIV2nb_rb_LUT50[rballoc]; NPRB = RIV2nb_rb_LUT50[rballoc];
dlsch0_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3]; dlsch0_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3];
dlsch[0]->g_pucch += delta_PUCCH_lut[TPC&3];
} }
if (vrb_type == LOCALIZED) { if (vrb_type == LOCALIZED) {
...@@ -4227,9 +4220,6 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -4227,9 +4220,6 @@ int generate_ue_dlsch_params_from_dci(int frame,
dlsch0_harq = dlsch[0]->harq_processes[harq_pid]; dlsch0_harq = dlsch[0]->harq_processes[harq_pid];
NPRB = RIV2nb_rb_LUT100[rballoc]; NPRB = RIV2nb_rb_LUT100[rballoc];
dlsch0_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3]; dlsch0_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3];
dlsch[0]->g_pucch += delta_PUCCH_lut[TPC&3];
} }
if (vrb_type == LOCALIZED) { if (vrb_type == LOCALIZED) {
...@@ -5153,12 +5143,10 @@ int generate_ue_dlsch_params_from_dci(int frame, ...@@ -5153,12 +5143,10 @@ int generate_ue_dlsch_params_from_dci(int frame,
if (dlsch0_harq != NULL) { if (dlsch0_harq != NULL) {
dlsch0_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3]; dlsch0_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3];
dlsch0->g_pucch += delta_PUCCH_lut[TPC&3];
} }
if (dlsch1_harq != NULL) { if (dlsch1_harq != NULL) {
dlsch1_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3]; dlsch1_harq->delta_PUCCH = delta_PUCCH_lut[TPC&3];
dlsch1->g_pucch += delta_PUCCH_lut[TPC&3];
} }
// assume one layer per codeword (2 antenna port case) // assume one layer per codeword (2 antenna port case)
......
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