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

move DL beamforming channel estimation to dlsim top level file

Browse Source
This commit is contained in:
Xiwen JIANG
2015-09-29 10:34:55 +02:00
parent 1a1d843f16
commit e5013e5327
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/MODULATION/slot_fep.c
-11
View File
@@ -247,17 +247,6 @@ int slot_fep(PHY_VARS_UE *phy_vars_ue,
} }
} }
if(phy_vars_ue->transmission_mode[eNB_id] == 7) {
if(frame_parms->Ncp==0 && ((symbol==3) || (symbol==6) || (symbol==9) || (symbol==12)))
lte_dl_bf_channel_estimation(phy_vars_ue,eNB_id,0,Ns,5,symbol);
else if(frame_parms->Ncp==1 && ((symbol==4) || (symbol==7) || (symbol==10)))
msg("slot_fep(slot_fep.c):channel estimation not supported yet for TM7 extented CP.\n");
} else if(phy_vars_ue->transmission_mode[eNB_id] > 7) {
msg("slot_fep(slot_fep.c):transmission mode not supported yet.\n");
}
} }
#ifdef DEBUG_FEP #ifdef DEBUG_FEP
openair1/SIMULATION/LTE_PHY/dlsim.c
+13 -1
View File
@@ -564,7 +564,7 @@ int main(int argc, char **argv)
exit(-1); exit(-1);
} }
if (transmission_mode==7 && (n_tx_phy!=2 && n_tx_phy!=4 && n_tx_phy!=8 && n_tx_phy!=16 && n_tx_phy!=64)) { if (transmission_mode==7 && (n_tx_phy!=1 && n_tx_phy!=2 && n_tx_phy!=4 && n_tx_phy!=8 && n_tx_phy!=16 && n_tx_phy!=64)) {
msg("For TM7, physical antenna number should be an exponent of 2, maximum 64 antennas supported.\n"); msg("For TM7, physical antenna number should be an exponent of 2, maximum 64 antennas supported.\n");
exit(-1); exit(-1);
} }
@@ -3360,6 +3360,18 @@ PMI_FEEDBACK:
} }
if (dlsch_active == 1) { if (dlsch_active == 1) {
if (transmission_mode==7) {
if (PHY_vars_UE->lte_frame_parms.Ncp==0) {
if ((Ns==(2*subframe) && ((l==3) || (l==6))) ||
Ns==(1+(2*subframe)) && ((l==3) || (l==6))) {
lte_dl_bf_channel_estimation(PHY_vars_UE,eNB_id,0,Ns,5,l+7*(Ns%2==1));
}
} else {
msg("Beamforming channel estimation not supported yet for TM7 extented CP.\n");
}
}
if ((Ns==(1+(2*subframe))) && (l==0)) {// process PDSCH symbols 1,2,3,4,5,(6 Normal Prefix) if ((Ns==(1+(2*subframe))) && (l==0)) {// process PDSCH symbols 1,2,3,4,5,(6 Normal Prefix)
if ((transmission_mode == 5) && if ((transmission_mode == 5) &&