From 23fa1ee31f918e730cb5ec952fa6f8cb88e8c1e5 Mon Sep 17 00:00:00 2001 From: Javier Morgade Date: Thu, 11 Apr 2019 21:53:43 +0200 Subject: [PATCH] FeMBMS PMCH (Physical Multicast Channel) procedures implemented/validated 3GPP TS 36.211 version 14.2.0 Release 14 Section 6.5 3GPP TS 36.211 version 14.2.0 Release 14 Section 6.10.2 --- openair1/PHY/LTE_UE_TRANSPORT/pmch_ue.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/openair1/PHY/LTE_UE_TRANSPORT/pmch_ue.c b/openair1/PHY/LTE_UE_TRANSPORT/pmch_ue.c index 0c5cb583a2..06249f3f56 100644 --- a/openair1/PHY/LTE_UE_TRANSPORT/pmch_ue.c +++ b/openair1/PHY/LTE_UE_TRANSPORT/pmch_ue.c @@ -153,7 +153,8 @@ void mch_extract_rbs_khz_1dot25(int **rxdataF, for (aarx=0; aarxnb_antennas_rx; aarx++) { for (i=0,j=0; iN_RB_DL*72; i++) { if( ((i-offset)%6) != 0 ){ - rxdataF_ext[aarx][j+0] = rxdataF[aarx][i+4344 +0]; + //rxdataF_ext[aarx][j+0] = rxdataF[aarx][i+4344 +0]; + rxdataF_ext[aarx][j+0] = rxdataF[aarx][i+frame_parms->first_carrier_offset_khz_1dot25 +0]; rxdataF_ext[aarx][(frame_parms->N_RB_DL*60)+j+0] = rxdataF[aarx][i+1+0]; //DC dl_ch_estimates_ext[aarx][j+0] = dl_ch_estimates[aarx][i+0]; dl_ch_estimates_ext[aarx][(frame_parms->N_RB_DL*60)+j+0] = dl_ch_estimates[aarx][i+(frame_parms->N_RB_DL*72)+0]; @@ -1445,12 +1446,6 @@ int rx_pmch_khz_1dot25(PHY_VARS_UE *ue, LTE_UE_DLSCH_t **dlsch = &ue->dlsch_MCH[eNB_id]; int avgs,aarx; - //int mcs=2; - - uint32_t Nsoft = 1827072; - ue->dlsch_MCH[0] = new_ue_dlsch(1,8,Nsoft,MAX_TURBO_ITERATIONS_MBSFN,25,0); - - mch_extract_rbs_khz_1dot25(common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[subframe]].rxdataF, common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[subframe]].dl_ch_estimates[eNB_id], @@ -1460,13 +1455,11 @@ int rx_pmch_khz_1dot25(PHY_VARS_UE *ue, subframe, frame_parms); - //if((subframe&0x1)==0){ - mch_channel_level_khz_1dot25(pdsch_vars[eNB_id]->dl_ch_estimates_ext, + mch_channel_level_khz_1dot25(pdsch_vars[eNB_id]->dl_ch_estimates_ext, frame_parms, avg_pmch, /*symbol,*/ frame_parms->N_RB_DL); - //} avgs = 0; @@ -1494,7 +1487,6 @@ int rx_pmch_khz_1dot25(PHY_VARS_UE *ue, pdsch_vars[eNB_id]->log2_maxh); if (frame_parms->nb_antennas_rx > 1){ - getchar(); mch_detection_mrc_khz_1dot25(frame_parms, pdsch_vars[eNB_id]->rxdataF_comp0, pdsch_vars[eNB_id]->dl_ch_mag0,