From a287aa27e1291285de5460314bd9569e9388658c Mon Sep 17 00:00:00 2001 From: Guy De Souza Date: Tue, 18 Sep 2018 15:06:36 +0200 Subject: [PATCH] minor memcpy/memset fix --- openair1/SCHED_NR/nr_ru_procedures.c | 3 +-- openair1/SCHED_NR/phy_procedures_nr_gNB.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/openair1/SCHED_NR/nr_ru_procedures.c b/openair1/SCHED_NR/nr_ru_procedures.c index 70a5735b58..700b3db5b4 100644 --- a/openair1/SCHED_NR/nr_ru_procedures.c +++ b/openair1/SCHED_NR/nr_ru_procedures.c @@ -101,8 +101,7 @@ void nr_feptx_ofdm_2thread(RU_t *ru) { // this copy should be done in the precoding thread (currently inactive) for (int aa=0;aanb_tx;aa++) memcpy((void*)ru->common.txdataF_BF[aa], - (void*)&ru->gNB_list[0]->common_vars.txdataF[aa][subframe*fp->samples_per_subframe_wCP], - fp->samples_per_subframe_wCP*sizeof(int32_t)); + (void*)ru->gNB_list[0]->common_vars.txdataF[aa], fp->samples_per_subframe_wCP*sizeof(int32_t)); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_OFDM , 1 ); diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c index c02c7765f1..7e831ec84b 100644 --- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c +++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c @@ -170,8 +170,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB, // clear the transmit data array for the current subframe for (aa=0; aarf_config.tx_antenna_ports.value; aa++) { - memset(&gNB->common_vars.txdataF[aa][subframe*fp->samples_per_subframe_wCP], - 0,fp->samples_per_subframe_wCP*sizeof(int32_t)); + memset(gNB->common_vars.txdataF[aa],0,fp->samples_per_subframe_wCP*sizeof(int32_t)); } if (nfapi_mode == 0 || nfapi_mode == 1) {