diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c index 7ab8e449e9..46ee54d429 100644 --- a/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c +++ b/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c @@ -693,6 +693,7 @@ int32_t dlsch_qpsk_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms, uint8_t num_pdcch_symbols, uint16_t nb_rb, uint8_t subframe, + uint16_t mod_order_0, uint32_t rb_alloc) { @@ -723,6 +724,9 @@ int32_t dlsch_qpsk_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms, else //pilots=0 amp_tmp=0x1fff;//1.5*dlsch0->sqrt_rho_a; already taken into account + if (mod_order_0==6) + amp_tmp=amp_tmp<<1; // to compensate for >> 1 shift in modulation + pbch_pss_sss_adjust=adjust_G2(frame_parms,&rb_alloc,2,subframe,symbol); @@ -928,6 +932,7 @@ void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms, int32_t **dl_ch_mag, uint16_t nb_rb, uint8_t subframe, + uint16_t mod_order_0, uint32_t rb_alloc) { int16_t rho_amp_x0[2*frame_parms->N_RB_DL*12]; @@ -965,6 +970,9 @@ void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms, len = nb_rb*12 - pbch_pss_sss_adjust; } + if (mod_order_0==6) + amp_tmp=amp_tmp<<1; // to compensate for >> 1 shift in modulation + len_acc+=len; multadd_complex_vector_real_scalar((int16_t *)sic_data, @@ -1186,6 +1194,7 @@ void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms, int32_t **dl_ch_magb, uint16_t nb_rb, uint8_t subframe, + uint16_t mod_order_0, uint32_t rb_alloc) { int16_t rho_amp_x0[2*frame_parms->N_RB_DL*12]; @@ -1225,6 +1234,9 @@ void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms, len = nb_rb*12 - pbch_pss_sss_adjust; } + if (mod_order_0==6) + amp_tmp=amp_tmp<<1; // to compensate for >> 1 shift in modulation + len_acc+=len; multadd_complex_vector_real_scalar((int16_t *)sic_data, diff --git a/openair1/PHY/LTE_TRANSPORT/proto.h b/openair1/PHY/LTE_TRANSPORT/proto.h index 359e1a3d7f..336df6faec 100644 --- a/openair1/PHY/LTE_TRANSPORT/proto.h +++ b/openair1/PHY/LTE_TRANSPORT/proto.h @@ -848,6 +848,7 @@ int32_t dlsch_qpsk_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms, uint8_t num_pdcch_symbols, uint16_t nb_rb, uint8_t subframe, + uint16_t mod_order_0, uint32_t rb_alloc); void dlsch_16qam_llr(LTE_DL_FRAME_PARMS *frame_parms, @@ -882,6 +883,7 @@ void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms, int32_t **dl_ch_mag, uint16_t nb_rb, uint8_t subframe, + uint16_t mod_order_0, uint32_t rb_alloc); void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms, @@ -894,6 +896,7 @@ void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms, int32_t **dl_ch_magb, uint16_t nb_rb, uint8_t subframe, + uint16_t mod_order_0, uint32_t rb_alloc); diff --git a/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c b/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c index db39d978a0..ac541da032 100644 --- a/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c +++ b/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c @@ -4385,6 +4385,7 @@ int main(int argc, char **argv) num_pdcch_symbols, dlsch0_eNB_harq->nb_rb, subframe, + get_Qm(eNB->dlsch[0][0]->harq_processes[0]->mcs), dlsch0_eNB_harq->rb_alloc[0]); break; @@ -4399,6 +4400,7 @@ int main(int argc, char **argv) UE->pdsch_vars[subframe&0x1][eNB_id]->dl_ch_mag1[UE->dlsch[subframe&0x1][0][1]->current_harq_pid][round_sic], dlsch0_eNB_harq->nb_rb, subframe, + get_Qm(eNB->dlsch[0][0]->harq_processes[0]->mcs), dlsch0_eNB_harq->rb_alloc[0]); break; case 6: @@ -4412,6 +4414,7 @@ int main(int argc, char **argv) UE->pdsch_vars[subframe&0x1][eNB_id]->dl_ch_magb1[UE->dlsch[subframe&0x1][0][1]->current_harq_pid][round_sic], dlsch0_eNB_harq->nb_rb, subframe, + get_Qm(eNB->dlsch[0][0]->harq_processes[0]->mcs), dlsch0_eNB_harq->rb_alloc[0]); break; }