summaryrefslogtreecommitdiff
path: root/cesar/cp/sta
diff options
context:
space:
mode:
authorJérémy Dufour2011-08-31 17:40:15 +0200
committerJérémy Dufour2011-09-08 17:25:26 +0200
commit76fc594b7be3d657b8440f4fa2aa2e3f461f3ba6 (patch)
tree46bc6dd45b8ef17dc32effd76cf744dbbe431a29 /cesar/cp/sta
parentb850ddd69b08e5564eedddfe393c7f2e833f71c2 (diff)
cesar/cp/sta/action: rescale SNR in VS_GET_SNR, refs #2619
Diffstat (limited to 'cesar/cp/sta')
-rw-r--r--cesar/cp/sta/action/src/vs.c5
-rw-r--r--cesar/cp/sta/action/test/utest/src/vs.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/cesar/cp/sta/action/src/vs.c b/cesar/cp/sta/action/src/vs.c
index 1daf2482af..29c5216e82 100644
--- a/cesar/cp/sta/action/src/vs.c
+++ b/cesar/cp/sta/action/src/vs.c
@@ -19,6 +19,7 @@
#include "cp/inc/context.h"
#include "mac/common/tonemap.h"
#include "cp/sta/action/misc.h"
+#include "ce/rx/bitloading/nsr.h"
/**
* Handle STARTED => VS_GET_TONEMAP.REQ.
@@ -229,8 +230,8 @@ cp_sta_action_vs__started__vs_get_snr_req (cp_t *ctx, cp_mme_rx_t *mme)
carrier_gr)
{
data_to_send.snr[grp_snr_index] =
- data[(all_snr_index - PHY_CARRIER_OFFSET) %
- (BLK_SIZE/4)];
+ (data[(all_snr_index - PHY_CARRIER_OFFSET) %
+ (BLK_SIZE/4)]) / CE_RX_BL_NSR_SOUND_RESCALE;
grp_snr_index++;
}
}
diff --git a/cesar/cp/sta/action/test/utest/src/vs.c b/cesar/cp/sta/action/test/utest/src/vs.c
index 279d0e8205..a1b2f4dc0f 100644
--- a/cesar/cp/sta/action/test/utest/src/vs.c
+++ b/cesar/cp/sta/action/test/utest/src/vs.c
@@ -13,6 +13,7 @@
#include "common/std.h"
#include "lib/scenario/scenario.h"
#include "inc/test_sta_action.h"
+#include "ce/rx/bitloading/nsr.h"
blk_t* nsr_block;
@@ -171,6 +172,7 @@ vs_get_snr_test_case (test_t t)
{
snr[i] = -(i * CP_MSG_VS_GET_SNR_REQ_CARRIER_GR_NB + group -
PHY_CARRIER_OFFSET);
+ snr[i] /= CE_RX_BL_NSR_SOUND_RESCALE;
}
else
snr[i] = 0;