summaryrefslogtreecommitdiff
path: root/cesar/mac/common/src/tonemask.c
diff options
context:
space:
mode:
Diffstat (limited to 'cesar/mac/common/src/tonemask.c')
-rw-r--r--cesar/mac/common/src/tonemask.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/cesar/mac/common/src/tonemask.c b/cesar/mac/common/src/tonemask.c
index a1e74117f5..0a47a6979b 100644
--- a/cesar/mac/common/src/tonemask.c
+++ b/cesar/mac/common/src/tonemask.c
@@ -13,6 +13,7 @@
#include "common/std.h"
#include "tonemask.h"
+#include "timings.h"
uint
tonemask_carrier_nb (const u32 *tonemask)
@@ -57,6 +58,8 @@ tonemask_update (tonemask_info_t *ti)
* QPSK. */
static const phy_gil_t robo_gil[] = {
PHY_GIL_417, PHY_GIL_417, PHY_GIL_567 };
+ static const uint robo_dx_tck[] = {
+ MAC_DX417_TCK, MAC_DX417_TCK, MAC_DX567_TCK };
static const phy_pb_size_t robo_pb_size[] = {
PHY_PB_SIZE_520, PHY_PB_SIZE_520, PHY_PB_SIZE_136 };
static const uint robo_nb_copies[] = { 4, 2, 5 };
@@ -64,7 +67,6 @@ tonemask_update (tonemask_info_t *ti)
for (m = PHY_MOD_ROBO; m < PHY_MOD_ROBO_NB; m++)
{
tonemap_t *tm = &ti->tonemap_robo[m];
- tm->strict = false;
tm->cpf = true;
tm->fecrate = PHY_FEC_RATE_1_2;
tm->gil = robo_gil[m];
@@ -78,6 +80,10 @@ tonemask_update (tonemask_info_t *ti)
tm->bits_per_pb[robo_pb_size[m]] =
tonemap_bits_per_pb (m, PHY_FEC_RATE_1_2, robo_pb_size[m],
tm->bits_per_symbol);
+ uint one_pb_symb_nb = CEIL_DIV (tm->bits_per_pb[robo_pb_size[m]],
+ tm->bits_per_symbol);
+ tm->one_pb_data_tck = MAC_PAYLOAD_TCK (one_pb_symb_nb,
+ robo_dx_tck[m]);
tm->phy_combo_params[PHY_PB_SIZE_136] = 0;
tm->phy_combo_params[PHY_PB_SIZE_520] = 0;
tm->phy_combo_params[robo_pb_size[m]] =