From 4ecd73c984fa2887f41b10a11849639eee76d30e Mon Sep 17 00:00:00 2001
From: Xavier Arteaga <xavier@softwareradiosystems.com>
Date: Tue, 21 Nov 2017 11:51:18 +0100
Subject: [PATCH] Added power allocation p_a in UE

---
 lib/include/srslte/asn1/liblte_rrc.h | 2 +-
 lib/src/phy/phch/pdsch.c             | 2 +-
 srsue/src/phy/phch_worker.cc         | 8 ++++++++
 srsue/src/upper/rrc.cc               | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/include/srslte/asn1/liblte_rrc.h b/lib/include/srslte/asn1/liblte_rrc.h
index c5c3b60e2..d508f3697 100644
--- a/lib/include/srslte/asn1/liblte_rrc.h
+++ b/lib/include/srslte/asn1/liblte_rrc.h
@@ -3926,7 +3926,7 @@ typedef enum{
 }LIBLTE_RRC_PDSCH_CONFIG_P_A_ENUM;
 static const char liblte_rrc_pdsch_config_p_a_text[LIBLTE_RRC_PDSCH_CONFIG_P_A_N_ITEMS][20] = {   "-6", "-4.77",    "-3", "-1.77",
                                                                                                    "0",     "1",     "2",     "3"};
-static const double liblte_rrc_pdsch_config_p_a_num[LIBLTE_RRC_PDSCH_CONFIG_P_A_N_ITEMS] = {-6, -4.77, -3, -1.77, 0, 1, 2, 3};
+static const float liblte_rrc_pdsch_config_p_a_num[LIBLTE_RRC_PDSCH_CONFIG_P_A_N_ITEMS] = {-6, -4.77f, -3, -1.77f, 0, 1, 2, 3};
 // Structs
 // PDSCH Config Common struct defined above
 // Functions
diff --git a/lib/src/phy/phch/pdsch.c b/lib/src/phy/phch/pdsch.c
index 3fb57fbbd..f9899ef99 100644
--- a/lib/src/phy/phch/pdsch.c
+++ b/lib/src/phy/phch/pdsch.c
@@ -688,7 +688,7 @@ int srslte_pdsch_decode(srslte_pdsch_t *q,
 
     float pdsch_scaling = 1.0f;
     if (q->rho_a != 0.0f) {
-      pdsch_scaling = 1/q->rho_a;
+      pdsch_scaling = q->rho_a;
     }
 
     // Pre-decoder
diff --git a/srsue/src/phy/phch_worker.cc b/srsue/src/phy/phch_worker.cc
index 97fad0720..529dd92f2 100644
--- a/srsue/src/phy/phch_worker.cc
+++ b/srsue/src/phy/phch_worker.cc
@@ -601,6 +601,14 @@ int phch_worker::decode_pdsch(srslte_ra_dl_grant_t *grant, uint8_t *payload[SRSL
       valid_config = false;
   }
 
+  /* Set power allocation */
+  float rho_a = 1.0f, rho_b = 1.0f;
+  if (phy->config->dedicated.pdsch_cnfg_ded < LIBLTE_RRC_PDSCH_CONFIG_P_A_N_ITEMS) {
+    float rho_a_db = liblte_rrc_pdsch_config_p_a_num[(int) phy->config->dedicated.pdsch_cnfg_ded];
+    rho_a = powf(10.0f, rho_a_db / 20.0f) * sqrtf(2.0f);
+  }
+  srslte_ue_dl_set_power_alloc(&ue_dl, rho_a, rho_b);
+
   Debug("DL Buffer TTI %d: Decoding PDSCH\n", tti);
 
   /* Setup PDSCH configuration for this CFI, SFIDX and RVIDX */
diff --git a/srsue/src/upper/rrc.cc b/srsue/src/upper/rrc.cc
index 7b4bef710..0127514f7 100644
--- a/srsue/src/upper/rrc.cc
+++ b/srsue/src/upper/rrc.cc
@@ -1472,8 +1472,10 @@ void rrc::apply_phy_config_dedicated(LIBLTE_RRC_PHYSICAL_CONFIG_DEDICATED_STRUCT
   }
   if (phy_cnfg->pdsch_cnfg_ded_present) {
     current_cfg->pdsch_cnfg_ded = phy_cnfg->pdsch_cnfg_ded;
+    rrc_log->info("Set PDSCH-Config=%s (present)\n", liblte_rrc_pdsch_config_p_a_text[(int) current_cfg->pdsch_cnfg_ded]);
   } else if (apply_defaults) {
     current_cfg->pdsch_cnfg_ded = LIBLTE_RRC_PDSCH_CONFIG_P_A_DB_0;
+    rrc_log->info("Set PDSCH-Config=%s (default)\n", liblte_rrc_pdsch_config_p_a_text[(int) current_cfg->pdsch_cnfg_ded]);
   }
 
   if (phy_cnfg->cqi_report_cnfg_present) {