summaryrefslogtreecommitdiff
path: root/ce/src/bitloading.c
diff options
context:
space:
mode:
Diffstat (limited to 'ce/src/bitloading.c')
-rw-r--r--ce/src/bitloading.c35
1 files changed, 21 insertions, 14 deletions
diff --git a/ce/src/bitloading.c b/ce/src/bitloading.c
index b0f5b08dc3..381affaa23 100644
--- a/ce/src/bitloading.c
+++ b/ce/src/bitloading.c
@@ -78,7 +78,6 @@ bitloading_run (mac_store_t *mac_store_ctx, mpdu_measure_t *measure)
{
ret = bitloading_dynamic_step (ssta, measure);
}
- ssta->rxce.measurement_computed_nb++;
blk_release (ssta);
return ret;
}
@@ -94,23 +93,30 @@ bitloading_initial_step (sta_t *ssta, mpdu_measure_t *measure)
ret.stei = ssta->tei;
ret.changed_tonemaps = NULL;
{
- bitloading_worst_tonemap_compute (&ssta->rxce.tm_in_build, measure->chandata_head[PHY_CHANDATA_TYPE_NRJ]);
- if (ssta->rxce.measurement_computed_nb >= FRAME_NB_TO_COMPUTE_IN_INITIAL_STEP)
+ if (measure->chandata_head[PHY_CHANDATA_TYPE_NRJ])
{
- tms->default_tmi = tonemap_set_first_free (tms, ssta->rxce.tm_in_build);
- ssta->rxce.tm_in_build = NULL;
- ret.changed_tonemaps = tms;
- ret.new_tmi = tms->default_tmi;
- ret.old_tmi = TONEMAP_INDEX_NULL;
+ bitloading_worst_tonemap_compute (&ssta->rxce.tm_in_build, measure->chandata_head[PHY_CHANDATA_TYPE_NRJ]);
+ if (ssta->rxce.measurement_computed_nb >= FRAME_NB_TO_COMPUTE_IN_INITIAL_STEP)
+ {
+ tms->default_tmi = tonemap_set_first_free (tms, ssta->rxce.tm_in_build);
+ ssta->rxce.tm_in_build = NULL;
+ ret.changed_tonemaps = tms;
+ ret.new_tmi = tms->default_tmi;
+ ret.old_tmi = TONEMAP_INDEX_NULL;
+ }
}
+ ssta->rxce.measurement_computed_nb++;
}
- if (bitloading_mpdu_noise_stability (measure->chandata_head[PHY_CHANDATA_TYPE_NRJ_SYMBOL]))
+ if (measure->chandata_head[PHY_CHANDATA_TYPE_NRJ_SYMBOL])
{
- ssta->rxce.stable_ROBO_nb++;
- }
- else
- {
- ssta->rxce.unstable_ROBO_nb++;
+ if (bitloading_mpdu_noise_stability (measure->chandata_head[PHY_CHANDATA_TYPE_NRJ_SYMBOL]))
+ {
+ ssta->rxce.stable_ROBO_nb++;
+ }
+ else
+ {
+ ssta->rxce.unstable_ROBO_nb++;
+ }
}
return ret;
}
@@ -126,6 +132,7 @@ bitloading_dynamic_step (sta_t *sta, mpdu_measure_t *measure)
ret.new_tmi = TONEMAP_INDEX_NULL;
ret.old_tmi = TONEMAP_INDEX_NULL;
if (!sta->rxce.tm_in_build) sta->rxce.tm_in_build = tonemap_alloc ();
+ sta->rxce.measurement_computed_nb++;
return ret;
}