From 1e857d5ba5a22789a9e302487905dc908ffe5a71 Mon Sep 17 00:00:00 2001
From: Anta Huang <anta.huang@eurecom.fr>
Date: Fri, 4 Aug 2017 18:19:38 +0200
Subject: [PATCH] Update the naming of cell config parameters
---
.../ENB_APP/MESSAGES/V2/config_messages.proto | 10 +++++-----
openair2/ENB_APP/flexran_agent_common.c | 20 +++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/openair2/ENB_APP/MESSAGES/V2/config_messages.proto b/openair2/ENB_APP/MESSAGES/V2/config_messages.proto
index f19de4923f..1be6f7f43a 100644
--- a/openair2/ENB_APP/MESSAGES/V2/config_messages.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/config_messages.proto
@@ -38,11 +38,11 @@ message flex_cell_config {
optional uint32 srs_mac_up_pts = 32; // Boolean value. See TS 36.211, section 5.5.3.2. TDD only
optional uint32 enable_64QAM = 33; // One of the FLEQ_* enum values
optional uint32 carrier_index = 34; // Carrier component index
- optional uint32 op_dl_freq = 35; // operating downlink frequency
- optional uint32 op_ul_freq = 36; // operating uplink frequency
- optional uint32 op_eutra_band= 37; // operating band
- optional int32 op_dl_pdsch_power = 38; // operating downlink power
- optional int32 op_ul_pusch_power = 39; // operating uplink power
+ optional uint32 dl_freq = 35; // operating downlink frequency
+ optional uint32 ul_freq = 36; // operating uplink frequency
+ optional uint32 eutra_band= 37; // operating band
+ optional int32 dl_pdsch_power = 38; // operating downlink power
+ optional int32 ul_pusch_power = 39; // operating uplink power
}
message flex_ue_config {
diff --git a/openair2/ENB_APP/flexran_agent_common.c b/openair2/ENB_APP/flexran_agent_common.c
index d71e9496c8..e3f96c05dc 100644
--- a/openair2/ENB_APP/flexran_agent_common.c
+++ b/openair2/ENB_APP/flexran_agent_common.c
@@ -1013,20 +1013,20 @@ int flexran_agent_enb_config_reply(mid_t mod_id, const void *params, Protocol__F
cell_conf[i]->srs_mac_up_pts = flexran_get_srs_MaxUpPts(enb_id,i);
cell_conf[i]->has_srs_mac_up_pts = 1;
- cell_conf[i]->op_dl_freq = flexran_agent_get_operating_dl_freq (enb_id,i);
- cell_conf[i]->has_op_dl_freq = 1;
+ cell_conf[i]->dl_freq = flexran_agent_get_operating_dl_freq (enb_id,i);
+ cell_conf[i]->has_dl_freq = 1;
- cell_conf[i]->op_ul_freq = flexran_agent_get_operating_ul_freq (enb_id, i);
- cell_conf[i]->has_op_ul_freq = 1;
+ cell_conf[i]->ul_freq = flexran_agent_get_operating_ul_freq (enb_id, i);
+ cell_conf[i]->has_ul_freq = 1;
- cell_conf[i]->op_eutra_band = flexran_agent_get_operating_eutra_band (enb_id,i);
- cell_conf[i]->has_op_eutra_band = 1;
+ cell_conf[i]->eutra_band = flexran_agent_get_operating_eutra_band (enb_id,i);
+ cell_conf[i]->has_eutra_band = 1;
- cell_conf[i]->op_dl_pdsch_power = flexran_agent_get_operating_pdsch_refpower(enb_id, i);
- cell_conf[i]->has_op_dl_pdsch_power = 1;
+ cell_conf[i]->dl_pdsch_power = flexran_agent_get_operating_pdsch_refpower(enb_id, i);
+ cell_conf[i]->has_dl_pdsch_power = 1;
- cell_conf[i]->op_ul_pusch_power = flexran_agent_get_operating_pusch_p0 (enb_id,i);
- cell_conf[i]->has_op_ul_pusch_power = 1;
+ cell_conf[i]->ul_pusch_power = flexran_agent_get_operating_pusch_p0 (enb_id,i);
+ cell_conf[i]->has_ul_pusch_power = 1;
if (flexran_get_enable64QAM(enb_id,i) == 0) {
--
2.26.2