Adding freq domain deroration to DL
also fixed build wanings
This commit is contained in:
@@ -470,6 +470,7 @@ int main( int argc, char **argv ) {
|
|||||||
nr_init_frame_parms_ue(&UE[CC_id]->frame_parms, nrUE_config, *mac->scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0]);
|
nr_init_frame_parms_ue(&UE[CC_id]->frame_parms, nrUE_config, *mac->scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0]);
|
||||||
|
|
||||||
init_symbol_rotation(&UE[CC_id]->frame_parms);
|
init_symbol_rotation(&UE[CC_id]->frame_parms);
|
||||||
|
init_timeshift_rotation(&UE[CC_id]->frame_parms);
|
||||||
init_nr_ue_vars(UE[CC_id], 0, abstraction_flag);
|
init_nr_ue_vars(UE[CC_id], 0, abstraction_flag);
|
||||||
|
|
||||||
#ifdef FR2_TEST
|
#ifdef FR2_TEST
|
||||||
|
|||||||
@@ -749,7 +749,6 @@ void init_timeshift_rotation(NR_DL_FRAME_PARMS *fp)
|
|||||||
{
|
{
|
||||||
const double fd = 15e3*(float)(1<<fp->numerology_index);
|
const double fd = 15e3*(float)(1<<fp->numerology_index);
|
||||||
const double Tc=(1/480e3/4096);
|
const double Tc=(1/480e3/4096);
|
||||||
const double Nu=2048*64*(1/(float)(1<<fp->numerology_index));
|
|
||||||
const double Ncp0=16*64 + (144*64*(1/(float)(1<<fp->numerology_index)));
|
const double Ncp0=16*64 + (144*64*(1/(float)(1<<fp->numerology_index)));
|
||||||
const double Ncp1=(144*64*(1/(float)(1<<fp->numerology_index)));
|
const double Ncp1=(144*64*(1/(float)(1<<fp->numerology_index)));
|
||||||
double t0;
|
double t0;
|
||||||
|
|||||||
@@ -117,6 +117,8 @@ void apply_nr_rotation(NR_DL_FRAME_PARMS *fp,
|
|||||||
|
|
||||||
void init_symbol_rotation(NR_DL_FRAME_PARMS *fp);
|
void init_symbol_rotation(NR_DL_FRAME_PARMS *fp);
|
||||||
|
|
||||||
|
void init_timeshift_rotation(NR_DL_FRAME_PARMS *fp);
|
||||||
|
|
||||||
void apply_nr_rotation_ul(NR_DL_FRAME_PARMS *frame_parms,
|
void apply_nr_rotation_ul(NR_DL_FRAME_PARMS *frame_parms,
|
||||||
int32_t *rxdataF,
|
int32_t *rxdataF,
|
||||||
int slot,
|
int slot,
|
||||||
|
|||||||
@@ -157,6 +157,19 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
|
|||||||
(int16_t *)&common_vars->common_vars_rx_data_per_thread[proc->thread_id].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],
|
(int16_t *)&common_vars->common_vars_rx_data_per_thread[proc->thread_id].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],
|
||||||
frame_parms->ofdm_symbol_size,
|
frame_parms->ofdm_symbol_size,
|
||||||
15);
|
15);
|
||||||
|
|
||||||
|
int16_t *shift_rot;
|
||||||
|
if (symb_offset+symbol == (7 * (1 << frame_parms->numerology_index)))
|
||||||
|
shift_rot = frame_parms->timeshift_symbol_rotation[0];
|
||||||
|
else
|
||||||
|
shift_rot = frame_parms->timeshift_symbol_rotation[1];
|
||||||
|
|
||||||
|
multadd_cpx_vector((int16_t *)&common_vars->common_vars_rx_data_per_thread[proc->thread_id].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],
|
||||||
|
shift_rot,
|
||||||
|
(int16_t *)&common_vars->common_vars_rx_data_per_thread[proc->thread_id].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],
|
||||||
|
1,
|
||||||
|
frame_parms->ofdm_symbol_size,
|
||||||
|
15);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUG_FEP
|
#ifdef DEBUG_FEP
|
||||||
|
|||||||
Reference in New Issue
Block a user