Skip to content

O
OpenXG-RAN
Commit b9363eef authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options

insert check on "ru->do_precoding" in RU TX chain for basic behaviour in monolithic eNB case

parent a64e7eef
Expand all Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 439 deletions
openair1/PHY/INIT/lte_init.c
View file @ b9363eef
This diff is collapsed.
openair1/SCHED/ru_procedures.c
View file @ b9363eef
...@@ -438,13 +438,12 @@ void feptx_prec(RU_t *ru) { ...@@ -438,13 +438,12 @@ void feptx_prec(RU_t *ru) {
for (aa=0;aa<ru->nb_tx;aa++) { for (aa=0;aa<ru->nb_tx;aa++) {
memset(ru->common.txdataF_BF[aa],0,sizeof(int32_t)*fp->ofdm_symbol_size*fp->symbols_per_tti); memset(ru->common.txdataF_BF[aa],0,sizeof(int32_t)*fp->ofdm_symbol_size*fp->symbols_per_tti);
for (p=0;p<NB_ANTENNA_PORTS_ENB;p++) { for (p=0;p<NB_ANTENNA_PORTS_ENB;p++) {
if (ru->do_precoding == 0) {
#ifdef NO_PRECODING if (p==0)
memcpy((void*)ru->common.txdataF_BF[aa], memcpy((void*)ru->common.txdataF_BF[aa],
(void*)&eNB->common_vars.txdataF[aa][subframe*fp->symbols_per_tti*fp->ofdm_symbol_size], (void*)&eNB->common_vars.txdataF[aa][subframe*fp->symbols_per_tti*fp->ofdm_symbol_size],
sizeof(int32_t)*fp->ofdm_symbol_size*fp->symbols_per_tti); sizeof(int32_t)*fp->ofdm_symbol_size*fp->symbols_per_tti);
#else } else {
if (p<fp->nb_antenna_ports_eNB) { if (p<fp->nb_antenna_ports_eNB) {
// For the moment this does nothing different than below, except ignore antenna ports 5,7,8. // For the moment this does nothing different than below, except ignore antenna ports 5,7,8.
for (l=0;l<pdcch_vars->num_pdcch_symbols;l++) for (l=0;l<pdcch_vars->num_pdcch_symbols;l++)
...@@ -473,39 +472,12 @@ void feptx_prec(RU_t *ru) { ...@@ -473,39 +472,12 @@ void feptx_prec(RU_t *ru) {
eNB->Mod_id); eNB->Mod_id);
} // for (l=pdcch_vars ....) } // for (l=pdcch_vars ....)
} // if (p<fp->nb_antenna_ports_eNB) ... } // if (p<fp->nb_antenna_ports_eNB) ...
#endif //NO_PRECODING } // ru->do_precoding!=0
} // for (p=0...) } // for (p=0...)
} // for (aa=0 ...) } // for (aa=0 ...)
if(ru->idx<2) if(ru->idx<2)
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC+ru->idx , 0); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC+ru->idx , 0);
// VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RU_FEPTX_PREC+ru->idx,0);
///////////////////////////////////////////////////
/* fdragon
eNB = eNB_list[0];
bw = ru->beam_weights[0];
fp = &eNB->frame_parms;
int nb_antenna_ports=15;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC+ru->idx , 1);
beam_precoding_one_eNB(eNB->common_vars.txdataF,
ru->common.txdataF_BF,
bw,
subframe,
nb_antenna_ports,
ru->nb_tx,
fp);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC+ru->idx , 0);
*/
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC+ru->idx , 0); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC+ru->idx , 0);
} }
else { else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment