Commit fb98ea82 authored by Florian Kaltenberger's avatar Florian Kaltenberger

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
parent 909d8c6f
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#ifdef DEBUG_UCI_TOOLS #ifdef DEBUG_UCI_TOOLS
#include "PHY/vars.h" #include "PHY/vars.h"
#endif #endif
#define DEBUG_UCI //#define DEBUG_UCI
uint64_t pmi2hex_2Ar1(uint32_t pmi) { uint64_t pmi2hex_2Ar1(uint32_t pmi) {
......
...@@ -368,7 +368,8 @@ int get_nCCE_offset(unsigned char L, int nCCE, int common_dci, unsigned short rn ...@@ -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) { 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 #ifdef EMOS
......
...@@ -570,7 +570,7 @@ void schedule_ulsch_rnti(module_id_t module_idP, ...@@ -570,7 +570,7 @@ void schedule_ulsch_rnti(module_id_t module_idP,
uint16_t TBS,i; uint16_t TBS,i;
int32_t buffer_occupancy=0; int32_t buffer_occupancy=0;
uint32_t cqi_req,cshift,ndi,mcs,rballoc,tpc; 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; static int32_t tpc_accumulated=0;
int n,CC_id; int n,CC_id;
...@@ -656,8 +656,7 @@ void schedule_ulsch_rnti(module_id_t module_idP, ...@@ -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 // this is the normalized RX power and this should be constant (regardless of mcs
normalized_rx_power = eNB_UE_stats->UL_rssi[0]; 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);
//target_rx_power = mac_xface->get_target_ul_rx_power(module_idP,CC_id)+5;
// this assumes accumulated tpc // this assumes accumulated tpc
if (subframeP==0) { if (subframeP==0) {
if (normalized_rx_power>(target_rx_power+1)) { if (normalized_rx_power>(target_rx_power+1)) {
......
...@@ -66,7 +66,7 @@ eNBs = ...@@ -66,7 +66,7 @@ eNBs =
srs_ackNackST =; srs_ackNackST =;
srs_MaxUpPts =;*/ srs_MaxUpPts =;*/
pusch_p0_Nominal = -98; pusch_p0_Nominal = -85;
pusch_alpha = "AL1"; pusch_alpha = "AL1";
pucch_p0_Nominal = -108; pucch_p0_Nominal = -108;
msg3_delta_Preamble = 6; msg3_delta_Preamble = 6;
...@@ -123,13 +123,13 @@ eNBs = ...@@ -123,13 +123,13 @@ eNBs =
log_config : log_config :
{ {
global_log_level ="debug"; global_log_level ="info";
global_log_verbosity ="medium"; global_log_verbosity ="medium";
hw_log_level ="debug"; hw_log_level ="debug";
hw_log_verbosity ="medium"; hw_log_verbosity ="medium";
phy_log_level ="debug"; phy_log_level ="info";
phy_log_verbosity ="medium"; phy_log_verbosity ="medium";
mac_log_level ="debug"; mac_log_level ="info";
mac_log_verbosity ="high"; mac_log_verbosity ="high";
rlc_log_level ="info"; rlc_log_level ="info";
rlc_log_verbosity ="medium"; rlc_log_verbosity ="medium";
......
...@@ -66,7 +66,7 @@ eNBs = ...@@ -66,7 +66,7 @@ eNBs =
srs_ackNackST =; srs_ackNackST =;
srs_MaxUpPts =;*/ srs_MaxUpPts =;*/
pusch_p0_Nominal = -108; pusch_p0_Nominal = -85;
pusch_alpha = "AL1"; pusch_alpha = "AL1";
pucch_p0_Nominal = -108; pucch_p0_Nominal = -108;
msg3_delta_Preamble = 6; msg3_delta_Preamble = 6;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment