From 0fb133830cbad01b040ef4f92b5cd9255603b0ec Mon Sep 17 00:00:00 2001
From: hongzhi wang <hongzhi.wang@tcl.com>
Date: Wed, 6 Jun 2018 18:16:01 +0200
Subject: [PATCH] nr parms bug fix
---
openair1/PHY/INIT/nr_parms.c | 16 +++++-----------
targets/RT/USER/nr-uesoftmodem.c | 3 ++-
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/openair1/PHY/INIT/nr_parms.c b/openair1/PHY/INIT/nr_parms.c
index 489462f9ef..1fcaaed494 100644
--- a/openair1/PHY/INIT/nr_parms.c
+++ b/openair1/PHY/INIT/nr_parms.c
@@ -277,23 +277,17 @@ int nr_init_frame_parms_ue(nfapi_config_request_t* config,
AssertFatal(1==0,"Invalid numerology index %d", mu);
}
-frame_parms->nb_prefix_samples0 = 160;
+ frame_parms->nb_prefix_samples0 = 160;
frame_parms->nb_prefix_samples = 144;
frame_parms->symbols_per_tti = 14;
frame_parms->numerology_index = 0;
frame_parms->ttis_per_subframe = 1;
frame_parms->slots_per_tti = 2; //only slot config 1 is supported
-frame_parms->nb_prefix_samples=(frame_parms->nb_prefix_samples*3)>>2;
- frame_parms->nb_prefix_samples0=(frame_parms->nb_prefix_samples0*3)>>2;
-frame_parms->ofdm_symbol_size = 2048;
- frame_parms->samples_per_tti = 30720;
-//#ifdef UE_NR_PHY_DEMO
- frame_parms->samples_per_subframe = 30720 * frame_parms->ttis_per_subframe;
-//#else
-// frame_parms->samples_per_subframe = 30720;
-//#endif
- frame_parms->first_carrier_offset = 2048-600;
+ frame_parms->ofdm_symbol_size = 2048;
+ frame_parms->samples_per_tti = 30720;
+ frame_parms->samples_per_subframe = 30720 * frame_parms->ttis_per_subframe;
+ frame_parms->first_carrier_offset = 2048-600;
frame_parms->symbols_per_slot = ((Ncp == NORMAL)? 14 : 12); // to redefine for different slot formats
frame_parms->samples_per_subframe_wCP = frame_parms->ofdm_symbol_size * frame_parms->symbols_per_slot * frame_parms->slots_per_subframe;
diff --git a/targets/RT/USER/nr-uesoftmodem.c b/targets/RT/USER/nr-uesoftmodem.c
index 403c9e374e..c34c10044f 100644
--- a/targets/RT/USER/nr-uesoftmodem.c
+++ b/targets/RT/USER/nr-uesoftmodem.c
@@ -1077,6 +1077,7 @@ int main( int argc, char **argv ) {
}
rx_gain[CC_id][0] = 81;
+ tx_max_power[CC_id] = -40;
UE[CC_id]->rx_total_gain_dB = (int)rx_gain[CC_id][0] + rx_gain_off;
UE[CC_id]->tx_power_max_dBm = tx_max_power[CC_id];
@@ -1094,7 +1095,7 @@ int main( int argc, char **argv ) {
}
- // printf("tx_max_power = %d -> amp %d\n",tx_max_power,get_tx_amp(tx_max_poHwer,tx_max_power));
+ // printf("tx_max_power = %d -> amp %d\n",tx_max_power[0],get_tx_amp(tx_max_poHwer,tx_max_power));
fill_modeled_runtime_table(runtime_phy_rx,runtime_phy_tx);
--
GitLab