Commit 5894bcac authored by laurent's avatar laurent

rebase develop

parent ef469b9b
...@@ -46,18 +46,18 @@ void normal_prefix_mod(int32_t *txdataF,int32_t *txdata,uint8_t nsymb,LTE_DL_FRA ...@@ -46,18 +46,18 @@ void normal_prefix_mod(int32_t *txdataF,int32_t *txdata,uint8_t nsymb,LTE_DL_FRA
PHY_ofdm_mod(txdataF, // input PHY_ofdm_mod(txdataF, // input
txdata, // output txdata, // output
frame_parms->ofdm_symbol_size, frame_parms->ofdm_symbol_size,
1, // number of symbols 1, // number of symbols
frame_parms->nb_prefix_samples0, // number of prefix samples frame_parms->nb_prefix_samples0, // number of prefix samples
CYCLIC_PREFIX); CYCLIC_PREFIX);
PHY_ofdm_mod(txdataF+frame_parms->ofdm_symbol_size, // input PHY_ofdm_mod(txdataF+frame_parms->ofdm_symbol_size, // input
txdata+OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES0, // output txdata+OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES0, // output
frame_parms->ofdm_symbol_size, frame_parms->ofdm_symbol_size,
nsymb-1, nsymb-1,
frame_parms->nb_prefix_samples, // number of prefix samples frame_parms->nb_prefix_samples, // number of prefix samples
CYCLIC_PREFIX); CYCLIC_PREFIX);
...@@ -341,11 +341,11 @@ void do_OFDM_mod(int32_t **txdataF, int32_t **txdata, uint32_t frame,uint16_t ne ...@@ -341,11 +341,11 @@ void do_OFDM_mod(int32_t **txdataF, int32_t **txdata, uint32_t frame,uint16_t ne
} }
void apply_nr_rotation(NR_DL_FRAME_PARMS *fp, void apply_nr_rotation(NR_DL_FRAME_PARMS *fp,
int16_t* trxdata, int16_t* trxdata,
int slot, int slot,
int first_symbol, int first_symbol,
int nsymb, int nsymb,
int length) { int length) {
int symb_offset = (slot%fp->slots_per_subframe)*fp->symbols_per_slot; int symb_offset = (slot%fp->slots_per_subframe)*fp->symbols_per_slot;
int16_t *symbol_rotation = fp->symbol_rotation[0]; int16_t *symbol_rotation = fp->symbol_rotation[0];
...@@ -362,9 +362,9 @@ void apply_nr_rotation(NR_DL_FRAME_PARMS *fp, ...@@ -362,9 +362,9 @@ void apply_nr_rotation(NR_DL_FRAME_PARMS *fp,
rotate_cpx_vector((c16_t*)trxdata + (sidx * length * 2), rotate_cpx_vector((c16_t*)trxdata + (sidx * length * 2),
(c16_t*)&symbol_rotation[2 * (sidx + first_symbol + symb_offset)], (c16_t*)&symbol_rotation[2 * (sidx + first_symbol + symb_offset)],
(c16_t*) trxdata + (sidx * length * 2), (c16_t*) trxdata + (sidx * length * 2),
length, length,
15); 15);
} }
} }
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