maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changing txdataF to contain one slot only

Browse Source
This commit is contained in:
Khalid Ahmed
2019-06-04 13:42:05 +02:00
committed by Thomas Schlichter
parent d9e077ead0
commit 54ebd39b79
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/INIT/nr_init_ue.c
+1 -1
View File
@@ -788,7 +788,7 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
for (i=0; i<fp->nb_antennas_tx; i++) { for (i=0; i<fp->nb_antennas_tx; i++) {
common_vars->txdata[i] = (int32_t*)malloc16_clear( fp->samples_per_subframe*10*sizeof(int32_t) ); common_vars->txdata[i] = (int32_t*)malloc16_clear( fp->samples_per_subframe*10*sizeof(int32_t) );
common_vars->txdataF[i] = (int32_t *)malloc16_clear( fp->samples_per_frame_wCP*sizeof(int32_t) ); common_vars->txdataF[i] = (int32_t *)malloc16_clear( fp->samples_per_slot_wCP*sizeof(int32_t) );
} }
// init RX buffers // init RX buffers
openair1/SIMULATION/NR_PHY/ulsim.c
+3 -6
View File
@@ -166,7 +166,6 @@ int main(int argc, char **argv) {
int ap; int ap;
int tx_offset; int tx_offset;
int sample_offsetF; int sample_offsetF;
int slot_offsetF;
int txlev; int txlev;
cpuf = get_cpu_freq_GHz(); cpuf = get_cpu_freq_GHz();
@@ -626,8 +625,6 @@ int main(int argc, char **argv) {
if (start_sc >= frame_parms->ofdm_symbol_size) if (start_sc >= frame_parms->ofdm_symbol_size)
start_sc -= frame_parms->ofdm_symbol_size; start_sc -= frame_parms->ofdm_symbol_size;
slot_offsetF = slot*frame_parms->symbols_per_slot*frame_parms->ofdm_symbol_size;
for (ap=0; ap<harq_process_ul_ue->Nl; ap++) { for (ap=0; ap<harq_process_ul_ue->Nl; ap++) {
// DMRS params for this ap // DMRS params for this ap
@@ -643,7 +640,7 @@ int main(int argc, char **argv) {
for (l=start_symbol; l<start_symbol+nb_symb_sch; l++) { for (l=start_symbol; l<start_symbol+nb_symb_sch; l++) {
k = start_sc; k = start_sc;
sample_offsetF = l*frame_parms->ofdm_symbol_size + k + slot_offsetF; sample_offsetF = l*frame_parms->ofdm_symbol_size + k;
for (i=0; i<nb_rb*NR_NB_SC_PER_RB; i++) { for (i=0; i<nb_rb*NR_NB_SC_PER_RB; i++) {
if ((l == dmrs_symbol) && (k == ((start_sc+get_dmrs_freq_idx(n, k_prime, delta, dmrs_type))%(frame_parms->ofdm_symbol_size)))) { if ((l == dmrs_symbol) && (k == ((start_sc+get_dmrs_freq_idx(n, k_prime, delta, dmrs_type))%(frame_parms->ofdm_symbol_size)))) {
@@ -688,14 +685,14 @@ m, l, k, ((int16_t*)txdataF[ap])[(sample_offsetF)<<1],
for (ap=0; ap<harq_process_ul_ue->Nl; ap++) { for (ap=0; ap<harq_process_ul_ue->Nl; ap++) {
if (frame_parms->Ncp == 1) { // extended cyclic prefix if (frame_parms->Ncp == 1) { // extended cyclic prefix
PHY_ofdm_mod(&txdataF[ap][slot_offsetF], PHY_ofdm_mod(txdataF[ap],
&txdata[ap][tx_offset], &txdata[ap][tx_offset],
frame_parms->ofdm_symbol_size, frame_parms->ofdm_symbol_size,
12, 12,
frame_parms->nb_prefix_samples, frame_parms->nb_prefix_samples,
CYCLIC_PREFIX); CYCLIC_PREFIX);
} else { // normal cyclic prefix } else { // normal cyclic prefix
nr_normal_prefix_mod(&txdataF[ap][slot_offsetF], nr_normal_prefix_mod(txdataF[ap],
&txdata[ap][tx_offset], &txdata[ap][tx_offset],
14, 14,
frame_parms); frame_parms);