maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closing review comments

Browse Source 
MR 1081
This commit is contained in:
Sakthivel Velumani
2021-03-26 14:41:56 +01:00
parent 03ba68d42e
commit 1d2e5cabd8
3 changed files with 132 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+2 -2
View File
@@ -596,8 +596,8 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
pil += 2; pil += 2;
re_offset = (re_offset+2) % gNB->frame_parms.ofdm_symbol_size; re_offset = (re_offset+2) % gNB->frame_parms.ofdm_symbol_size;
rxF = (int16_t *)&rxdataF[aarx][(symbol_offset+nushift+re_offset)]; rxF = (int16_t *)&rxdataF[aarx][(symbol_offset+nushift+re_offset)];
ch[0]>>=2; ch[0] /=4 ;
ch[1]>>=2; ch[1] /=4 ;
((__m128i*)ul_ch)[0]=_mm_set1_epi32(*(int32_t*)ch); ((__m128i*)ul_ch)[0]=_mm_set1_epi32(*(int32_t*)ch);
((__m128i*)ul_ch)[1]=((__m128i*)ul_ch)[0]; ((__m128i*)ul_ch)[1]=((__m128i*)ul_ch)[0];
((__m128i*)ul_ch)[2]=((__m128i*)ul_ch)[0]; ((__m128i*)ul_ch)[2]=((__m128i*)ul_ch)[0];
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+4 -6
View File
@@ -690,11 +690,11 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
uint16_t rb_offset = (bwp_start_subcarrier - ue->frame_parms.first_carrier_offset) / 12 - BWPStart; uint16_t rb_offset = (bwp_start_subcarrier - ue->frame_parms.first_carrier_offset) / 12 - BWPStart;
uint8_t config_type = ue->dmrs_DownlinkConfig.pdsch_dmrs_type; uint8_t config_type = ue->dmrs_DownlinkConfig.pdsch_dmrs_type;
int8_t delta = get_delta(p, config_type); int8_t delta = get_delta(p, config_type);
nushift = delta;
ue->frame_parms.nushift = nushift;
nr_pdsch_dmrs_rx(ue,Ns,ue->nr_gold_pdsch[eNB_offset][Ns][symbol][0], &pilot[0],1000,0,nb_rb_pdsch+rb_offset); nr_pdsch_dmrs_rx(ue,Ns,ue->nr_gold_pdsch[eNB_offset][Ns][symbol][0], &pilot[0],1000,0,nb_rb_pdsch+rb_offset);
if (config_type == pdsch_dmrs_type1 && ue->fd_lin_interpolation == 1){ if (config_type == pdsch_dmrs_type1 && ue->fd_lin_interpolation == 1){
nushift = (p>>1)&1;
ue->frame_parms.nushift = nushift;
switch (delta) { switch (delta) {
case 0://port 0,1 case 0://port 0,1
@@ -733,8 +733,6 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
break; break;
} }
} else if (ue->fd_lin_interpolation == 1) {//pdsch_dmrs_type2 } else if (ue->fd_lin_interpolation == 1) {//pdsch_dmrs_type2
nushift = delta;
ue->frame_parms.nushift = nushift;
switch (delta) { switch (delta) {
case 0://port 0,1 case 0://port 0,1
fl = filt8_l2;//left interpolation Filter should be fml fl = filt8_l2;//left interpolation Filter should be fml
@@ -1269,8 +1267,8 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
pil += 2; pil += 2;
re_offset = (re_offset+2) % ue->frame_parms.ofdm_symbol_size; re_offset = (re_offset+2) % ue->frame_parms.ofdm_symbol_size;
rxF = (int16_t *)&rxdataF[aarx][(symbol_offset+nushift+re_offset)]; rxF = (int16_t *)&rxdataF[aarx][(symbol_offset+nushift+re_offset)];
ch[0]>>=2; ch[0] /=4 ;
ch[1]>>=2; ch[1] /=4 ;
((__m128i*)dl_ch)[0]=_mm_set1_epi32(*(int32_t*)ch); ((__m128i*)dl_ch)[0]=_mm_set1_epi32(*(int32_t*)ch);
((__m128i*)dl_ch)[1]=((__m128i*)dl_ch)[0]; ((__m128i*)dl_ch)[1]=((__m128i*)dl_ch)[0];
((__m128i*)dl_ch)[2]=((__m128i*)dl_ch)[0]; ((__m128i*)dl_ch)[2]=((__m128i*)dl_ch)[0];
openair1/SIMULATION/NR_PHY/ulsim.c
+2 -2
View File
@@ -904,8 +904,8 @@ int main(int argc, char **argv)
((int16_t*)&gNB->common_vars.rxdata[0][slot_offset])[i], ((int16_t*)&gNB->common_vars.rxdata[0][slot_offset])[i],
((int16_t*)&gNB->common_vars.rxdata[0][slot_offset])[1+i]); ((int16_t*)&gNB->common_vars.rxdata[0][slot_offset])[1+i]);
mod_order = nr_get_Qm_ul(Imcs, 0); mod_order = nr_get_Qm_ul(Imcs, mcs_table);
code_rate = nr_get_code_rate_ul(Imcs, 0); code_rate = nr_get_code_rate_ul(Imcs, mcs_table);
} }
for (SNR = snr0; SNR < snr1; SNR += snr_step) { for (SNR = snr0; SNR < snr1; SNR += snr_step) {