From 36717c683193d2fe59a987cd9b999376f732d2c7 Mon Sep 17 00:00:00 2001
From: Guy De Souza <desouza@eurecom.fr>
Date: Tue, 17 Apr 2018 10:18:00 +0200
Subject: [PATCH] Ofdm mod update
---
openair1/PHY/MODULATION/ofdm_mod.c | 16 ++++++++++++++++
openair1/SCHED_NR/nr_ru_procedures.c | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/openair1/PHY/MODULATION/ofdm_mod.c b/openair1/PHY/MODULATION/ofdm_mod.c
index 7392b7a86a..74aebcacd2 100644
--- a/openair1/PHY/MODULATION/ofdm_mod.c
+++ b/openair1/PHY/MODULATION/ofdm_mod.c
@@ -58,6 +58,22 @@ void normal_prefix_mod(int32_t *txdataF,int32_t *txdata,uint8_t nsymb,LTE_DL_FRA
}
+void nr_normal_prefix_mod(int32_t *txdataF,int32_t *txdata,uint8_t nsymb,NR_DL_FRAME_PARMS *frame_parms)
+{
+ PHY_ofdm_mod(txdataF, // input
+ txdata, // output
+ frame_parms->ofdm_symbol_size,
+ 1, // number of symbols
+ frame_parms->nb_prefix_samples0, // number of prefix samples
+ CYCLIC_PREFIX);
+ PHY_ofdm_mod(txdataF+frame_parms->ofdm_symbol_size, // input
+ txdata+OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES0, // output
+ frame_parms->ofdm_symbol_size,
+ nsymb - 1,
+ frame_parms->nb_prefix_samples, // number of prefix samples
+ CYCLIC_PREFIX);
+}
+
void PHY_ofdm_mod(int *input, /// pointer to complex input
int *output, /// pointer to complex output
int fftsize, /// FFT_SIZE
diff --git a/openair1/SCHED_NR/nr_ru_procedures.c b/openair1/SCHED_NR/nr_ru_procedures.c
index e626998967..103d612b30 100644
--- a/openair1/SCHED_NR/nr_ru_procedures.c
+++ b/openair1/SCHED_NR/nr_ru_procedures.c
@@ -236,7 +236,7 @@ void nr_feptx_ofdm(RU_t *ru) {
fp);
// if S-subframe generate first slot only
if (subframe_select(fp,subframe) == SF_DL)
- normal_prefix_mod(&ru->common.txdataF_BF[aa][slot_offset_F+slot_sizeF],
+ nr_normal_prefix_mod(&ru->common.txdataF_BF[aa][slot_offset_F+slot_sizeF],
dummy_tx_b+(fp->samples_per_subframe / fp->slots_per_subframe),
14,
fp);
--
GitLab