Skip to content

O
OpenXG-RAN
Commit 814dfdda authored by Florian Kaltenberger's avatar Florian Kaltenberger Committed by Raymond Knopp
Browse files
Options

reverting some changes for regression

parent d0a1b4cd
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
View file @ 814dfdda
...@@ -659,7 +659,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB, ...@@ -659,7 +659,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB,
((int16_t *)&nqpsk[3])[0] = gain_lin_QPSK; ((int16_t *)&nqpsk[3])[0] = gain_lin_QPSK;
((int16_t *)&nqpsk[3])[1] = gain_lin_QPSK; ((int16_t *)&nqpsk[3])[1] = gain_lin_QPSK;
if ((dlsch0_harq->status == ACTIVE) && (dlsch1_harq->status == ACTIVE)) { //this is for TM3, TM4, TM8 if (dlsch0_harq && (dlsch0_harq->status == ACTIVE) && dlsch1_harq && (dlsch1_harq->status == ACTIVE)) { //this is for TM3, TM4, TM8
x0 = dlsch0_harq->e; x0 = dlsch0_harq->e;
mimo_mode = dlsch0_harq->mimo_mode; mimo_mode = dlsch0_harq->mimo_mode;
...@@ -672,7 +672,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB, ...@@ -672,7 +672,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB,
first_layer1 = dlsch1_harq->first_layer; first_layer1 = dlsch1_harq->first_layer;
mod_order1 = get_Qm(dlsch1_harq->mcs); mod_order1 = get_Qm(dlsch1_harq->mcs);
} else if ((dlsch0_harq->status == ACTIVE) && (dlsch1_harq->status != ACTIVE)){ //This is for SIS0 TM1, TM6, etc } else if (dlsch0_harq && (dlsch0_harq->status == ACTIVE)){ //This is for SIS0 TM1, TM6, etc
x0 = dlsch0_harq->e; x0 = dlsch0_harq->e;
mimo_mode = dlsch0_harq->mimo_mode; mimo_mode = dlsch0_harq->mimo_mode;
...@@ -680,7 +680,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB, ...@@ -680,7 +680,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB,
Nlayers0 = dlsch0_harq->Nlayers; Nlayers0 = dlsch0_harq->Nlayers;
mod_order0 = get_Qm(dlsch0_harq->mcs); mod_order0 = get_Qm(dlsch0_harq->mcs);
} else if ((dlsch0_harq->status != ACTIVE) && (dlsch1_harq->status == ACTIVE)){ // This is for TM4 retransmission } else if (dlsch1_harq && (dlsch1_harq->status == ACTIVE)){ // This is for TM4 retransmission
x0 = dlsch1_harq->e; x0 = dlsch1_harq->e;
mimo_mode = dlsch1_harq->mimo_mode; mimo_mode = dlsch1_harq->mimo_mode;
...@@ -2558,8 +2558,8 @@ int dlsch_modulation(PHY_VARS_eNB* phy_vars_eNB, ...@@ -2558,8 +2558,8 @@ int dlsch_modulation(PHY_VARS_eNB* phy_vars_eNB,
rb, rb,
re_offset, re_offset,
symbol_offset, symbol_offset,
dlsch0->harq_processes[harq_pid], (dlsch0 == NULL) ? NULL : dlsch0->harq_processes[harq_pid],
dlsch1->harq_processes[harq_pid], (dlsch1 == NULL) ? NULL : dlsch1->harq_processes[harq_pid],
pilots, pilots,
((pilots) ? amp_rho_b : amp_rho_a), ((pilots) ? amp_rho_b : amp_rho_a),
get_pmi_temp, get_pmi_temp,
......
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