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

adding condition for multi L1 and TDD slot select in nr_feptx_prec

Browse Source
This commit is contained in:
Wang Tsu-Han
2019-08-09 16:55:18 +02:00
parent 1d3023a5f6
commit 4fbf754de5
1 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED_NR/nr_ru_procedures.c
+32 -23
View File
@@ -243,33 +243,42 @@ void nr_feptx_ofdm(RU_t *ru,int frame_tx,int tti_tx) {
void nr_feptx_prec(RU_t *ru,int frame,int tti_tx) { void nr_feptx_prec(RU_t *ru,int frame,int tti_tx) {
int l,aa; int l,aa;
NR_DL_FRAME_PARMS *fp=ru->nr_frame_parms; PHY_VARS_gNB **gNB_list = ru->gNB_list,*gNB;
NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
nfapi_nr_config_request_t *cfg;
int32_t ***bw; int32_t ***bw;
if (ru->nb_tx == 1) {
if (ru->num_gNB == 1){
gNB = gNB_list[0];
cfg = &gNB->gNB_config;
if (nr_slot_select(cfg,tti_tx) == SF_UL) return;
if (ru->nb_tx == 1) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC , 1); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC , 1);
memcpy((void*)ru->common.txdataF_BF[0], memcpy((void*)ru->common.txdataF_BF[0],
(void*)ru->gNB_list[0]->common_vars.txdataF[0][tti_tx*fp->symbols_per_slot*fp->ofdm_symbol_size], (void*)&gNB->common_vars.txdataF[0][tti_tx*fp->symbols_per_slot*fp->ofdm_symbol_size],
fp->samples_per_slot_wCP*sizeof(int32_t)); fp->samples_per_slot_wCP*sizeof(int32_t));
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC , 0); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC , 0);
} }// if (ru->nb_tx == 1)
else { else {
bw = ru->beam_weights[0]; bw = ru->beam_weights[0];
for (l=0;l<fp->symbols_per_slot;l++) { for (l=0;l<fp->symbols_per_slot;l++) {
for (aa=0;aa<ru->nb_tx;aa++) { for (aa=0;aa<ru->nb_tx;aa++) {
nr_beam_precoding(ru->gNB_list[0]->common_vars.txdataF, nr_beam_precoding(gNB->common_vars.txdataF,
ru->common.txdataF_BF, ru->common.txdataF_BF,
fp, fp,
bw, bw,
tti_tx, tti_tx,
l, l,
aa); aa);
} }// for (aa=0;aa<ru->nb_tx;aa++)
} }// for (l=0;l<fp->symbols_per_slot;l++)
} }// if (ru->nb_tx == 1)
}// if (ru->num_gNB == 1)
} }