Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu
This commit is contained in:
@@ -45,6 +45,7 @@ int phy_init_RU(RU_t *ru) {
|
|||||||
if (ru->is_slave == 1) {
|
if (ru->is_slave == 1) {
|
||||||
generate_ul_ref_sigs_rx();
|
generate_ul_ref_sigs_rx();
|
||||||
}
|
}
|
||||||
|
else generate_ul_ref_sigs();
|
||||||
|
|
||||||
if (ru->if_south <= REMOTE_IF5) { // this means REMOTE_IF5 or LOCAL_RF, so allocate memory for time-domain signals
|
if (ru->if_south <= REMOTE_IF5) { // this means REMOTE_IF5 or LOCAL_RF, so allocate memory for time-domain signals
|
||||||
// Time-domain signals
|
// Time-domain signals
|
||||||
|
|||||||
@@ -139,27 +139,26 @@ void feptx0(RU_t *ru,
|
|||||||
int num_symb = 7;
|
int num_symb = 7;
|
||||||
|
|
||||||
if (subframe_select(fp,subframe) == SF_S)
|
if (subframe_select(fp,subframe) == SF_S)
|
||||||
num_symb = fp->dl_symbols_in_S_subframe+1;
|
num_symb = fp->dl_symbols_in_S_subframe+1;
|
||||||
|
|
||||||
if (ru->generate_dmrs_sync == 1 && slot == 0 && subframe == 1 && aa==0) {
|
if (ru->generate_dmrs_sync == 1 && slot == 2 && aa==0) {
|
||||||
//int32_t dmrs[ru->frame_parms.ofdm_symbol_size*14] __attribute__((aligned(32)));
|
//int32_t dmrs[ru->frame_parms.ofdm_symbol_size*14] __attribute__((aligned(32)));
|
||||||
//int32_t *dmrsp[2] ={dmrs,NULL}; //{&dmrs[(3-ru->frame_parms.Ncp)*ru->frame_parms.ofdm_symbol_size],NULL};
|
//int32_t *dmrsp[2] ={dmrs,NULL}; //{&dmrs[(3-ru->frame_parms.Ncp)*ru->frame_parms.ofdm_symbol_size],NULL};
|
||||||
|
generate_drs_pusch((PHY_VARS_UE *)NULL,
|
||||||
generate_drs_pusch((PHY_VARS_UE *)NULL,
|
(UE_rxtx_proc_t*)NULL,
|
||||||
(UE_rxtx_proc_t*)NULL,
|
fp,
|
||||||
fp,
|
ru->common.txdataF_BF,
|
||||||
ru->common.txdataF_BF,
|
0,
|
||||||
0,
|
AMP,
|
||||||
AMP,
|
0,
|
||||||
0,
|
0,
|
||||||
0,
|
fp->N_RB_DL,
|
||||||
fp->N_RB_DL,
|
aa);
|
||||||
aa);
|
|
||||||
}
|
}
|
||||||
normal_prefix_mod(&ru->common.txdataF_BF[aa][(slot&1)*slot_sizeF],
|
normal_prefix_mod(&ru->common.txdataF_BF[aa][(slot&1)*slot_sizeF],
|
||||||
(int*)&ru->common.txdata[aa][slot_offset],
|
(int*)&ru->common.txdata[aa][slot_offset],
|
||||||
num_symb,
|
num_symb,
|
||||||
fp);
|
fp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user