Commit 3e38cd26 authored by Cedric Roux's avatar Cedric Roux
Browse files

add frame parameter to rx_pucch for the T logger

parent db488285
...@@ -1665,6 +1665,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB, ...@@ -1665,6 +1665,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB,
uint16_t n2_pucch, uint16_t n2_pucch,
uint8_t shortened_format, uint8_t shortened_format,
uint8_t *payload, uint8_t *payload,
int frame,
uint8_t subframe, uint8_t subframe,
uint8_t pucch1_thres); uint8_t pucch1_thres);
......
...@@ -437,6 +437,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB, ...@@ -437,6 +437,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB,
uint16_t n2_pucch, uint16_t n2_pucch,
uint8_t shortened_format, uint8_t shortened_format,
uint8_t *payload, uint8_t *payload,
int frame,
uint8_t subframe, uint8_t subframe,
uint8_t pucch1_thres) uint8_t pucch1_thres)
{ {
...@@ -793,7 +794,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB, ...@@ -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_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; 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)); T_INT(stat_max), T_INT(sigma2_dB+pucch1_thres));
/* /*
......
...@@ -3180,6 +3180,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_ ...@@ -3180,6 +3180,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, // n2_pucch 0, // n2_pucch
0, // shortened format, should be use_srs flag, later 0, // shortened format, should be use_srs flag, later
&SR_payload, &SR_payload,
frame,
subframe, subframe,
PUCCH1_THRES); PUCCH1_THRES);
...@@ -3241,6 +3242,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_ ...@@ -3241,6 +3242,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, //n2_pucch 0, //n2_pucch
0, // shortened format 0, // shortened format
pucch_payload0, pucch_payload0,
frame,
subframe, subframe,
PUCCH1a_THRES); PUCCH1a_THRES);
...@@ -3252,6 +3254,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_ ...@@ -3252,6 +3254,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, //n2_pucch 0, //n2_pucch
0, // shortened format 0, // shortened format
pucch_payload0, pucch_payload0,
frame,
subframe, subframe,
PUCCH1a_THRES); PUCCH1a_THRES);
} }
...@@ -3313,6 +3316,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_ ...@@ -3313,6 +3316,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, //n2_pucch 0, //n2_pucch
0, // shortened format 0, // shortened format
pucch_payload0, pucch_payload0,
frame,
subframe, subframe,
PUCCH1a_THRES); PUCCH1a_THRES);
else { else {
...@@ -3344,6 +3348,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_ ...@@ -3344,6 +3348,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, // n2_pucch 0, // n2_pucch
0, // shortened format 0, // shortened format
pucch_payload0, pucch_payload0,
frame,
subframe, subframe,
PUCCH1a_THRES); PUCCH1a_THRES);
else { else {
...@@ -3367,6 +3372,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_ ...@@ -3367,6 +3372,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
0, //n2_pucch 0, //n2_pucch
0, // shortened format 0, // shortened format
pucch_payload1, pucch_payload1,
frame,
subframe, subframe,
PUCCH1a_THRES); PUCCH1a_THRES);
else { else {
......
...@@ -610,6 +610,7 @@ int main(int argc, char **argv) ...@@ -610,6 +610,7 @@ int main(int argc, char **argv)
n2_pucch, n2_pucch,
0, //shortened_format, 0, //shortened_format,
&pucch_payload_rx, //payload, &pucch_payload_rx, //payload,
0 /* frame not defined, let's pass 0 */,
subframe, subframe,
pucch1_thres); pucch1_thres);
......
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