From 3e38cd2651dbb80b8a65ef059fabc6b2b9f0fddd Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Wed, 11 May 2016 16:35:27 +0200
Subject: [PATCH] add frame parameter to rx_pucch for the T logger
---
openair1/PHY/LTE_TRANSPORT/proto.h | 1 +
openair1/PHY/LTE_TRANSPORT/pucch.c | 3 ++-
openair1/SCHED/phy_procedures_lte_eNb.c | 6 ++++++
openair1/SIMULATION/LTE_PHY/pucchsim.c | 1 +
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/proto.h b/openair1/PHY/LTE_TRANSPORT/proto.h
index 9afea790b..4781737be 100644
--- a/openair1/PHY/LTE_TRANSPORT/proto.h
+++ b/openair1/PHY/LTE_TRANSPORT/proto.h
@@ -1665,6 +1665,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB,
uint16_t n2_pucch,
uint8_t shortened_format,
uint8_t *payload,
+ int frame,
uint8_t subframe,
uint8_t pucch1_thres);
diff --git a/openair1/PHY/LTE_TRANSPORT/pucch.c b/openair1/PHY/LTE_TRANSPORT/pucch.c
index 07789e48e..51b13c82c 100644
--- a/openair1/PHY/LTE_TRANSPORT/pucch.c
+++ b/openair1/PHY/LTE_TRANSPORT/pucch.c
@@ -437,6 +437,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB,
uint16_t n2_pucch,
uint8_t shortened_format,
uint8_t *payload,
+ int frame,
uint8_t subframe,
uint8_t pucch1_thres)
{
@@ -793,7 +794,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB,
phy_vars_eNB->pucch1_stats_thres[UE_id][(subframe<<10)+phy_vars_eNB->pucch1_stats_cnt[UE_id][subframe]] = sigma2_dB+pucch1_thres;
phy_vars_eNB->pucch1_stats_cnt[UE_id][subframe] = (phy_vars_eNB->pucch1_stats_cnt[UE_id][subframe]+1)&1023;
- T(T_PUCCH_1_ENERGY, T_INT(phy_vars_eNB->Mod_id), T_INT(UE_id), T_INT(-1), T_INT(subframe),
+ T(T_PUCCH_1_ENERGY, T_INT(phy_vars_eNB->Mod_id), T_INT(UE_id), T_INT(frame), T_INT(subframe),
T_INT(stat_max), T_INT(sigma2_dB+pucch1_thres));
/*
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index d16ac720e..7bf32eba4 100755
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -3180,6 +3180,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, // n2_pucch
0, // shortened format, should be use_srs flag, later
&SR_payload,
+ frame,
subframe,
PUCCH1_THRES);
@@ -3241,6 +3242,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, //n2_pucch
0, // shortened format
pucch_payload0,
+ frame,
subframe,
PUCCH1a_THRES);
@@ -3252,6 +3254,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, //n2_pucch
0, // shortened format
pucch_payload0,
+ frame,
subframe,
PUCCH1a_THRES);
}
@@ -3313,6 +3316,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, //n2_pucch
0, // shortened format
pucch_payload0,
+ frame,
subframe,
PUCCH1a_THRES);
else {
@@ -3344,6 +3348,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, // n2_pucch
0, // shortened format
pucch_payload0,
+ frame,
subframe,
PUCCH1a_THRES);
else {
@@ -3367,6 +3372,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, //n2_pucch
0, // shortened format
pucch_payload1,
+ frame,
subframe,
PUCCH1a_THRES);
else {
diff --git a/openair1/SIMULATION/LTE_PHY/pucchsim.c b/openair1/SIMULATION/LTE_PHY/pucchsim.c
index 42de78ac7..54f96a61e 100644
--- a/openair1/SIMULATION/LTE_PHY/pucchsim.c
+++ b/openair1/SIMULATION/LTE_PHY/pucchsim.c
@@ -610,6 +610,7 @@ int main(int argc, char **argv)
n2_pucch,
0, //shortened_format,
&pucch_payload_rx, //payload,
+ 0 /* frame not defined, let's pass 0 */,
subframe,
pucch1_thres);
--
GitLab