summaryrefslogtreecommitdiff
path: root/cesar/cp/eoc/sta/action
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-12-17 16:46:59 +0100
committerNélio Laranjeiro2012-12-17 17:12:21 +0100
commit24d8fbb617a963326b6507f1594015db7392579d (patch)
tree10b031b2d9f85966ec1c756bbb1a0cc8eff7e1c8 /cesar/cp/eoc/sta/action
parent85f6155e4cd0a04683df64cdc2324932750578e3 (diff)
parent2325e706df5cbc7779b6757b96f26148510a9bb2 (diff)
Merge branch 'master-t3485-avg-att' into eoc-drv-t3485-avg-att
Conflicts: cesar/hal/phy/maximus/inc/maximus_phy_ctx.h cesar/hal/phy/phy.h cesar/hal/phy/src/rx.c cesar/mac/common/sta.h cesar/mac/pbproc/pbproc.h cesar/mac/pbproc/src/fsm_rx_data.c common/lib/mmtcgen/mme.txt
Diffstat (limited to 'cesar/cp/eoc/sta/action')
-rw-r--r--cesar/cp/eoc/sta/action/src/vs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cesar/cp/eoc/sta/action/src/vs.c b/cesar/cp/eoc/sta/action/src/vs.c
index 5240bea23d..d6c105aad3 100644
--- a/cesar/cp/eoc/sta/action/src/vs.c
+++ b/cesar/cp/eoc/sta/action/src/vs.c
@@ -76,7 +76,7 @@ cp_eoc_sta_action_vs__vs_eoc_get_info_req (
snr_sum = ce_rx_bl_nsr_compute_total_mean (
&sta->ce_rx_bt);
snr = 10 * log (snr_sum);
- attenuation = sta->upstream_att + agc_offset;
+ attenuation = sta->agc_gain + agc_offset;
}
blk_release (sta);
}