summaryrefslogtreecommitdiff
path: root/cesar/maximus
diff options
context:
space:
mode:
Diffstat (limited to 'cesar/maximus')
-rw-r--r--cesar/maximus/stationtest/src/main_example.c5
-rw-r--r--cesar/maximus/stationtest/src/test_false_alarm.c5
-rw-r--r--cesar/maximus/stationtest/src/test_send.c5
-rw-r--r--cesar/maximus/stationtest/src/test_tx_rx.c18
4 files changed, 17 insertions, 16 deletions
diff --git a/cesar/maximus/stationtest/src/main_example.c b/cesar/maximus/stationtest/src/main_example.c
index fb871bd8fe..78aa221065 100644
--- a/cesar/maximus/stationtest/src/main_example.c
+++ b/cesar/maximus/stationtest/src/main_example.c
@@ -26,9 +26,8 @@ bool phy_rx_fc_cb (void *user, u32 rx_date, const u32 *fc_av)
{
diag_write_string("=> phy_rx_fc_cb\n");
- phy_rx_prepare(phy, false, PHY_MOD_MINI_ROBO,
- PHY_FEC_RATE_1_2, PHY_PB_SIZE_136, PHY_GIL_567,
- 0 /* tonemap_index */, 0 /* symbol_nb */);
+ phy_rx_prepare(phy, PHY_COMBO_PARAMS (PHY_MOD_MINI_ROBO, PHY_FEC_RATE_1_2,
+ PHY_PB_SIZE_136), PHY_GIL_567, 0);
return true;
}
diff --git a/cesar/maximus/stationtest/src/test_false_alarm.c b/cesar/maximus/stationtest/src/test_false_alarm.c
index b141853a29..e04e012de0 100644
--- a/cesar/maximus/stationtest/src/test_false_alarm.c
+++ b/cesar/maximus/stationtest/src/test_false_alarm.c
@@ -30,9 +30,8 @@ bool phy_rx_fc_cb (void *user, u32 rx_date, const u32 *fc_av)
// Reset IT
maximus_pending_isrs &= (0 << PHY_HAL_INTERRUPT_PHY);
- phy_rx_prepare(ctx, false, PHY_MOD_MINI_ROBO,
- PHY_FEC_RATE_1_2, PHY_PB_SIZE_136, PHY_GIL_567,
- 0 /* tonemap_index */, 0 /* symbol_nb */);
+ phy_rx_prepare(ctx, PHY_COMBO_PARAMS (PHY_MOD_MINI_ROBO, PHY_FEC_RATE_1_2,
+ PHY_PB_SIZE_136), PHY_GIL_567, 0);
return true;
}
diff --git a/cesar/maximus/stationtest/src/test_send.c b/cesar/maximus/stationtest/src/test_send.c
index e3f20c3c6b..f5017df4e4 100644
--- a/cesar/maximus/stationtest/src/test_send.c
+++ b/cesar/maximus/stationtest/src/test_send.c
@@ -40,9 +40,8 @@ bool phy_rx_fc_cb (void *user, u32 rx_date, const u32 *fc_av)
diag_write_string("=> phy_rx_fc_cb\n");
// When the FC is received, prepare RX
- phy_rx_prepare(ctx, short_ppdu, (phy_mod_t)mod,
- (phy_fecrate_t)fecrate, (phy_pb_size_t)pb_size, (phy_gil_t)gil,
- 0 /* tonemap_index */, 0 /* symbol_nb */);
+ phy_rx_prepare(ctx, PHY_COMBO_PARAMS (mod, fecrate, pb_size),
+ (phy_gil_t)gil, 0);
return true;
}
diff --git a/cesar/maximus/stationtest/src/test_tx_rx.c b/cesar/maximus/stationtest/src/test_tx_rx.c
index 85ecda0974..32b3f719d6 100644
--- a/cesar/maximus/stationtest/src/test_tx_rx.c
+++ b/cesar/maximus/stationtest/src/test_tx_rx.c
@@ -132,9 +132,8 @@ bool phy_rx_fc_cb (void *user, u32 rx_date, const u32 *fc_av)
maximus_pending_isrs &= (0 << PHY_HAL_INTERRUPT_PHY);
// When the FC is received, prepare RX
- phy_rx_prepare(ctx, short_ppdu, (phy_mod_t)mod,
- (phy_fecrate_t)fecrate, (phy_pb_size_t)pb_size, (phy_gil_t)gil,
- 0 /* tonemap_index */, 0 /* symbol_nb */);
+ phy_rx_prepare(ctx, PHY_COMBO_PARAMS (mod, fecrate, pb_size),
+ (phy_gil_t)gil, 0);
return true;
}
@@ -173,9 +172,14 @@ bool phy_pbdma_cb (void *user, u32 status_word)
if (status.end_rx_pb)
{
// Set TX parameters
- phy_tx_param (ctx, ctx->control.rx_param.fc_mode, ctx->control.rx_param.short_ppdu,
- ctx->control.rx_param.mod, ctx->control.rx_param.fecrate, ctx->control.rx_param.pb_size,
- ctx->control.rx_param.gil, ctx->control.rx_param.tonemap_index);
+ if (ctx->control.rx_param.short_ppdu)
+ phy_tx_param_short (ctx, ctx->control.rx_param.fc_mode);
+ else
+ phy_tx_param (ctx, ctx->control.rx_param.fc_mode,
+ PHY_COMBO_PARAMS (ctx->control.rx_param.mod,
+ ctx->control.rx_param.fecrate,
+ ctx->control.rx_param.pb_size),
+ ctx->control.rx_param.gil);
if (0 != ctx->control.rx_param.fc_10)
{
phy_tx_fc10 (ctx, (u32)my_station.current_tick_tck +
@@ -260,7 +264,7 @@ int set_tonemask (fcall_ctx_t *fcall, fcall_param_t **param, sci_msg_t **msg, vo
tonemap2.data = tonemap2_data;
tonemap1.next = &tonemap2;
tonemap1.data = tonemap1_data;
- phy_set_tonemap(ctx, 0 /* tonemap_index */, &tonemap1);
+ phy_set_tonemap(ctx, &tonemap1);
/* now make the return parameter list */
fcall_param_reset(*param);