From fb98ea82aeed4908466b9ba451506e7c14ef97a8 Mon Sep 17 00:00:00 2001
From: Florian Kaltenberger <florian.kaltenberger@eurecom.fr>
Date: Mon, 17 Nov 2014 15:32:27 +0000
Subject: [PATCH] UL power control now takes target rx power from configuration
file
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6025 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair1/PHY/LTE_TRANSPORT/uci_tools.c | 2 +-
openair1/SCHED/phy_procedures_lte_eNb.c | 3 ++-
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c | 5 ++---
.../PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.exmimo2.conf | 8 ++++----
.../PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/uci_tools.c b/openair1/PHY/LTE_TRANSPORT/uci_tools.c
index 39e703c093..9530a956d1 100644
--- a/openair1/PHY/LTE_TRANSPORT/uci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/uci_tools.c
@@ -44,7 +44,7 @@
#ifdef DEBUG_UCI_TOOLS
#include "PHY/vars.h"
#endif
-#define DEBUG_UCI
+//#define DEBUG_UCI
uint64_t pmi2hex_2Ar1(uint32_t pmi) {
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index 5da889c51d..b1e37011f8 100755
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -368,7 +368,8 @@ int get_nCCE_offset(unsigned char L, int nCCE, int common_dci, unsigned short rn
}
int16_t get_target_ul_rx_power(module_id_t module_idP, uint8_t CC_id) {
- return PHY_vars_eNB_g[module_idP][CC_id]->PHY_measurements_eNB[0].n0_power_tot_dBm;
+ //return PHY_vars_eNB_g[module_idP][CC_id]->PHY_measurements_eNB[0].n0_power_tot_dBm;
+ return PHY_vars_eNB_g[module_idP][CC_id]->lte_frame_parms.ul_power_control_config_common.p0_NominalPUSCH;
}
#ifdef EMOS
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index 483c1b87f5..a50f3f07e0 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -570,7 +570,7 @@ void schedule_ulsch_rnti(module_id_t module_idP,
uint16_t TBS,i;
int32_t buffer_occupancy=0;
uint32_t cqi_req,cshift,ndi,mcs,rballoc,tpc;
- int32_t normalized_rx_power, target_rx_power=-85;
+ int32_t normalized_rx_power, target_rx_power=-75;
static int32_t tpc_accumulated=0;
int n,CC_id;
@@ -656,8 +656,7 @@ void schedule_ulsch_rnti(module_id_t module_idP,
// this is the normalized RX power and this should be constant (regardless of mcs
normalized_rx_power = eNB_UE_stats->UL_rssi[0];
- //-mac_xface->get_hundred_times_delta_TF(module_idP,CC_id,rnti,harq_pid)/100;
- //target_rx_power = mac_xface->get_target_ul_rx_power(module_idP,CC_id)+5;
+ target_rx_power = mac_xface->get_target_ul_rx_power(module_idP,CC_id);
// this assumes accumulated tpc
if (subframeP==0) {
if (normalized_rx_power>(target_rx_power+1)) {
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.exmimo2.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.exmimo2.conf
index 26b6f31ef3..970f594c1c 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.exmimo2.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.exmimo2.conf
@@ -66,7 +66,7 @@ eNBs =
srs_ackNackST =;
srs_MaxUpPts =;*/
- pusch_p0_Nominal = -98;
+ pusch_p0_Nominal = -85;
pusch_alpha = "AL1";
pucch_p0_Nominal = -108;
msg3_delta_Preamble = 6;
@@ -123,13 +123,13 @@ eNBs =
log_config :
{
- global_log_level ="debug";
+ global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="debug";
hw_log_verbosity ="medium";
- phy_log_level ="debug";
+ phy_log_level ="info";
phy_log_verbosity ="medium";
- mac_log_level ="debug";
+ mac_log_level ="info";
mac_log_verbosity ="high";
rlc_log_level ="info";
rlc_log_verbosity ="medium";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf
index 019d895350..e804825dc9 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf
@@ -66,7 +66,7 @@ eNBs =
srs_ackNackST =;
srs_MaxUpPts =;*/
- pusch_p0_Nominal = -108;
+ pusch_p0_Nominal = -85;
pusch_alpha = "AL1";
pucch_p0_Nominal = -108;
msg3_delta_Preamble = 6;
--
GitLab