summaryrefslogtreecommitdiff
path: root/hal/phy/maximus
diff options
context:
space:
mode:
authorburet2007-10-04 12:55:48 +0000
committerburet2007-10-04 12:55:48 +0000
commit9d0a91001b7da12aed5dc2723130ca3e555d6fe1 (patch)
tree3f1a6fe1938aefb0f3b067cd31ac0f40e5bd2c80 /hal/phy/maximus
parent634753dc659766adac27ef75268ab27862bad45f (diff)
Maximus HAL PHY: fixes #26.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@772 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'hal/phy/maximus')
-rw-r--r--hal/phy/maximus/src/maximus_phy_ctrl_cb.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/hal/phy/maximus/src/maximus_phy_ctrl_cb.c b/hal/phy/maximus/src/maximus_phy_ctrl_cb.c
index 879e7a9da8..e00a9a2d58 100644
--- a/hal/phy/maximus/src/maximus_phy_ctrl_cb.c
+++ b/hal/phy/maximus/src/maximus_phy_ctrl_cb.c
@@ -64,17 +64,11 @@ maximus_phy_tx_frame_cb (void *data)
tx_frame_data->ctx->control.current_tx_param.fc_10 = tx_frame_data->ctx->control.next_tx_param.fc_10;
tx_frame_data->ctx->control.current_tx_param.fc_mode = tx_frame_data->ctx->control.next_tx_param.fc_mode;
tx_frame_data->ctx->control.current_tx_param.short_ppdu = tx_frame_data->ctx->control.next_tx_param.short_ppdu;
- if (!tx_frame_data->ctx->control.current_tx_param.short_ppdu) // else no data symbols will be sent
- {
- tx_frame_data->ctx->control.current_tx_param.mod = tx_frame_data->ctx->control.next_tx_param.mod;
- if (PHY_MOD_TM == tx_frame_data->ctx->control.current_tx_param.mod) // else tonemap is not used
- {
- tx_frame_data->ctx->control.current_tx_param.fecrate = tx_frame_data->ctx->control.next_tx_param.fecrate;
- tx_frame_data->ctx->control.current_tx_param.pb_size = tx_frame_data->ctx->control.next_tx_param.pb_size;
- tx_frame_data->ctx->control.current_tx_param.gil = tx_frame_data->ctx->control.next_tx_param.gil;
- tx_frame_data->ctx->control.current_tx_param.tonemap_index = tx_frame_data->ctx->control.next_tx_param.tonemap_index;
- }
- }
+ tx_frame_data->ctx->control.current_tx_param.mod = tx_frame_data->ctx->control.next_tx_param.mod;
+ tx_frame_data->ctx->control.current_tx_param.fecrate = tx_frame_data->ctx->control.next_tx_param.fecrate;
+ tx_frame_data->ctx->control.current_tx_param.pb_size = tx_frame_data->ctx->control.next_tx_param.pb_size;
+ tx_frame_data->ctx->control.current_tx_param.gil = tx_frame_data->ctx->control.next_tx_param.gil;
+ tx_frame_data->ctx->control.current_tx_param.tonemap_index = tx_frame_data->ctx->control.next_tx_param.tonemap_index;
memcpy(tx_frame_data->ctx->control.current_tx_param.fc_av, tx_frame_data->ctx->control.next_tx_param.fc_av, 4*sizeof(u32));
// reset next TX frame netclock message id