summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schodet2013-04-18 17:05:14 +0200
committerNicolas Schodet2013-04-25 10:29:02 +0200
commit874067680dd852594a703b96bdc154e21730a5f3 (patch)
treef8adc51428414a4730fd4dd2d19c36270b369dd2
parentbfa7e63c0c950e1d50b6bcf8fdd510930d9c53cc (diff)
cesar/ce, cesar/mac/common: add group interval nb in mac tonemap configuration
-rw-r--r--cesar/ce/rx/bitloading/src/intervals.c2
-rw-r--r--cesar/ce/rx/bitloading/test/intervals/inc/scenario_defs.h2
-rw-r--r--cesar/ce/rx/bitloading/test/intervals/src/scenario_intervals_events.c3
-rw-r--r--cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c6
-rw-r--r--cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c24
-rw-r--r--cesar/ce/rx/bitloading/test/src/test_intervals.c10
-rw-r--r--cesar/ce/tx/src/mme.c4
-rw-r--r--cesar/ce/tx/src/tx.c2
-rw-r--r--cesar/ce/tx/test/src/test_tm.c2
-rw-r--r--cesar/cp/msg/src/msg_vs.c7
-rw-r--r--cesar/mac/common/interval.h4
-rw-r--r--cesar/mac/common/src/interval.c4
-rw-r--r--cesar/mac/common/test/interval/src/test_interval.c9
-rw-r--r--cesar/mac/common/tonemap.h4
-rw-r--r--cesar/mac/pbproc/test/pbproc/inc/utils.h2
-rw-r--r--cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c2
-rw-r--r--cesar/mac/pbproc/test/pbproc/src/tx_data.c3
-rw-r--r--cesar/mac/pbproc/test/pbproc/src/utils.c3
18 files changed, 60 insertions, 33 deletions
diff --git a/cesar/ce/rx/bitloading/src/intervals.c b/cesar/ce/rx/bitloading/src/intervals.c
index edc09636f2..9a951dff09 100644
--- a/cesar/ce/rx/bitloading/src/intervals.c
+++ b/cesar/ce/rx/bitloading/src/intervals.c
@@ -150,7 +150,7 @@ ce_rx_bl_intervals_update_tmi (sta_t *sta, const bsu_aclf_bp_t bp_tck)
bp_atu + MAC_TCK_TO_ATU (HPAV_BEACON_BTO_MAX_TCK),
its->tmi[(total_ints - 1) % mac_interval_fsm_count_]);
dbg_assert (res == total_ints);
- mac_interval_commit_changes (sta->rx_tonemaps);
+ mac_interval_commit_changes (sta->rx_tonemaps, mac_interval_fsm_count_);
}
void
diff --git a/cesar/ce/rx/bitloading/test/intervals/inc/scenario_defs.h b/cesar/ce/rx/bitloading/test/intervals/inc/scenario_defs.h
index e8516c7f1e..f6e660ed44 100644
--- a/cesar/ce/rx/bitloading/test/intervals/inc/scenario_defs.h
+++ b/cesar/ce/rx/bitloading/test/intervals/inc/scenario_defs.h
@@ -111,7 +111,7 @@ __event (ce_rx_cp_send_mme_new_tone_map, ce_rx_t *ce_rx, sta_t *peer,
__event (ce_rx_cp_send_mme_refresh_tmi_list, ce_rx_t *ce_rx, sta_t *peer);
__event (tonemap_disable, tonemaps_t *tms, u8 tmi);
__event (mac_interval_clear, tonemaps_t *tms);
-__event (mac_interval_commit_changes, tonemaps_t *tms);
+__event (mac_interval_commit_changes, tonemaps_t *tms, u8 group_intervals_nb);
__event (mac_interval_append, tonemaps_t *tms, u16 end_offset_atu,
u8 tmi);
__event (ce_rx_bl_ber_pt_robo);
diff --git a/cesar/ce/rx/bitloading/test/intervals/src/scenario_intervals_events.c b/cesar/ce/rx/bitloading/test/intervals/src/scenario_intervals_events.c
index 7bfb358c64..251d130650 100644
--- a/cesar/ce/rx/bitloading/test/intervals/src/scenario_intervals_events.c
+++ b/cesar/ce/rx/bitloading/test/intervals/src/scenario_intervals_events.c
@@ -128,10 +128,11 @@ mac_interval_clear (tonemaps_t *tms)
}
void
-mac_interval_commit_changes (tonemaps_t *tms)
+mac_interval_commit_changes (tonemaps_t *tms, u8 group_intervals_nb)
{
scenario_event (mac_interval_commit_changes, params);
test_fail_unless (tms == params->tms);
+ test_fail_unless (group_intervals_nb == params->group_intervals_nb);
}
u8
diff --git a/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c b/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c
index 8a0ed2b7bb..f1904019da 100644
--- a/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c
+++ b/cesar/ce/rx/bitloading/test/intervals/src/test_fsm.c
@@ -109,7 +109,8 @@ test_ce_rx_bl_fsm_IDLE (test_t t)
mac_interval_append, .tms = &rx_tms, .tmi = DEFAULT_NEW_TMI);
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_commit_changes, .tms = &rx_tms);
+ mac_interval_commit_changes, .tms = &rx_tms,
+ .group_intervals_nb = mac_interval_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -195,7 +196,8 @@ test_ce_rx_bl_fsm_INITIAL (test_t t)
mac_interval_append, .tms = &rx_tms, .tmi = DEFAULT_NEW_TMI);
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_commit_changes, .tms = &rx_tms);
+ mac_interval_commit_changes, .tms = &rx_tms,
+ .group_intervals_nb = mac_interval_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
diff --git a/cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c b/cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c
index 65e006298e..d732a32fce 100644
--- a/cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c
+++ b/cesar/ce/rx/bitloading/test/intervals/src/test_intervals_fsm.c
@@ -112,7 +112,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi + 1);
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_commit_changes, .tms = &rx_tms);
+ mac_interval_commit_changes, .tms = &rx_tms,
+ .group_intervals_nb = mac_interval_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -158,7 +159,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_commit_changes, .tms = &rx_tms);
+ mac_interval_commit_changes, .tms = &rx_tms,
+ .group_intervals_nb = mac_interval_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -206,7 +208,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_commit_changes, .tms = &rx_tms);
+ mac_interval_commit_changes, .tms = &rx_tms,
+ .group_intervals_nb = mac_interval_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -376,7 +379,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_commit_changes, .tms = &rx_tms);
+ mac_interval_commit_changes, .tms = &rx_tms,
+ .group_intervals_nb = mac_interval_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -432,7 +436,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_commit_changes, .tms = &rx_tms);
+ mac_interval_commit_changes, .tms = &rx_tms,
+ .group_intervals_nb = mac_interval_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -489,7 +494,8 @@ test_ce_rx_bl_fsm_INTERVAL_TRACKING (test_t t)
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_commit_changes, .tms = &rx_tms);
+ mac_interval_commit_changes, .tms = &rx_tms,
+ .group_intervals_nb = mac_interval_fsm_count_);
/* - check MMe is sent */
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
@@ -594,7 +600,8 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND (test_t t)
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_commit_changes, .tms = &rx_tms);
+ mac_interval_commit_changes, .tms = &rx_tms,
+ .group_intervals_nb = mac_interval_fsm_count_);
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
ce_rx_cp_send_mme_new_tone_map,
@@ -715,7 +722,8 @@ test_ce_rx_bl_fsm_INTERVAL_SOUND_WAIT (test_t t)
mac_interval_append, .tms = &rx_tms, .tmi = tested_tmi);
}
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
- mac_interval_commit_changes, .tms = &rx_tms);
+ mac_interval_commit_changes, .tms = &rx_tms,
+ .group_intervals_nb = mac_interval_fsm_count_);
fsm_base[pos++] = (scenario_entry_t) SCENARIO_EVENT (
ce_rx_cp_send_mme_new_tone_map,
diff --git a/cesar/ce/rx/bitloading/test/src/test_intervals.c b/cesar/ce/rx/bitloading/test/src/test_intervals.c
index 5111517ead..0f80a1e5b6 100644
--- a/cesar/ce/rx/bitloading/test/src/test_intervals.c
+++ b/cesar/ce/rx/bitloading/test/src/test_intervals.c
@@ -186,7 +186,7 @@ test_suite_ce_rx_bl_intervals_measure_to_interval (test_t t)
end_offset_atu = ++int_nb * bp / 24;
int_nb = mac_interval_append (tms, end_offset_atu, 51);
} while (int_nb != 24);
- mac_interval_commit_changes (tms);
+ mac_interval_commit_changes (tms, 0);
int i = ce_rx_bl_intervals_measure_to_interval (tms, bp / 4, bp / 2);
test_fail_if (i != -1);
@@ -215,7 +215,7 @@ test_suite_ce_rx_bl_intervals_measure_to_interval (test_t t)
end_offset_atu = ++int_nb * bp / 24;
int_nb = mac_interval_append (tms, end_offset_atu, 51);
} while (int_nb != 24);
- mac_interval_commit_changes (tms);
+ mac_interval_commit_changes (tms, 0);
int a;
for (a = 0; a < 24; a++)
@@ -242,7 +242,7 @@ test_suite_ce_rx_bl_intervals_measure_to_interval (test_t t)
end_offset_atu = ++int_nb * bp / 24;
int_nb = mac_interval_append (tms, end_offset_atu, 51);
} while (int_nb != 24);
- mac_interval_commit_changes (tms);
+ mac_interval_commit_changes (tms, 0);
int i = ce_rx_bl_intervals_measure_to_interval (
tms,
@@ -263,7 +263,7 @@ test_suite_ce_rx_bl_intervals_measure_to_interval (test_t t)
end_offset_atu = ++int_nb * bp / 24;
int_nb = mac_interval_append (tms, end_offset_atu, 51);
} while (int_nb != 24);
- mac_interval_commit_changes (tms);
+ mac_interval_commit_changes (tms, 0);
int i = ce_rx_bl_intervals_measure_to_interval (
tms,
@@ -299,7 +299,7 @@ test_suite_ce_rx_bl_intervals_measure_to_event_master_test (
{
for (i = 1; i <= 24; i++)
mac_interval_append (tms, bp_atu * i / 24, i);
- mac_interval_commit_changes (tms);
+ mac_interval_commit_changes (tms, mac_interval_fsm_count_);
}
sta.rx_tonemaps = tms;
sta.intervals = NULL;
diff --git a/cesar/ce/tx/src/mme.c b/cesar/ce/tx/src/mme.c
index 510127bd7a..ddd764c485 100644
--- a/cesar/ce/tx/src/mme.c
+++ b/cesar/ce/tx/src/mme.c
@@ -656,7 +656,7 @@ ce_tx_cm_chan_est_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
/* Reset bitmap field for sound complete. */
sta_s_tx_tonemap->tm_sound_complete_bitmap = 0;
/* Update intervals list. */
- mac_interval_commit_changes (sta_s_tx_tonemap);
+ mac_interval_commit_changes (sta_s_tx_tonemap, 0);
/* Update valid list of tone map interval by
* removing unused tone map. This must be done
* after switching tone map intervals. */
@@ -846,7 +846,7 @@ ce_tx_cm_tm_update_ind_receive (cp_t *ctx, cp_mme_rx_t *mme)
/* Reset bitmap field for sound complete. */
sta_s_tx_tonemap->tm_sound_complete_bitmap = 0;
/* Update intervals list. */
- mac_interval_commit_changes (sta_s_tx_tonemap);
+ mac_interval_commit_changes (sta_s_tx_tonemap, 0);
/* Update valid list of tone map interval by
* removing unused tone map. This must be done
* after switching tone map intervals. */
diff --git a/cesar/ce/tx/src/tx.c b/cesar/ce/tx/src/tx.c
index ce87deccb0..d4884dbca1 100644
--- a/cesar/ce/tx/src/tx.c
+++ b/cesar/ce/tx/src/tx.c
@@ -136,7 +136,7 @@ ce_tx_clean_tonemaps (cp_t *ctx, tonemaps_t *tone_maps)
{
/* Reset interval. */
mac_interval_clear (tone_maps);
- mac_interval_commit_changes (tone_maps);
+ mac_interval_commit_changes (tone_maps, 0);
/* Go through each tone map. */
uint i;
diff --git a/cesar/ce/tx/test/src/test_tm.c b/cesar/ce/tx/test/src/test_tm.c
index 3ca82a4acb..07cdd3a185 100644
--- a/cesar/ce/tx/test/src/test_tm.c
+++ b/cesar/ce/tx/test/src/test_tm.c
@@ -68,7 +68,7 @@ ce_test_tm_clean (test_t t)
test_fail_if (mac_interval_append (tms, nb, nb) == 0);
nb++;
test_fail_if (mac_interval_append (tms, nb, nb) == 0);
- mac_interval_commit_changes (tms);
+ mac_interval_commit_changes (tms, 0);
/* Set version. */
tms->intervals->version = version;
diff --git a/cesar/cp/msg/src/msg_vs.c b/cesar/cp/msg/src/msg_vs.c
index 1c297476d6..3fbc61704d 100644
--- a/cesar/cp/msg/src/msg_vs.c
+++ b/cesar/cp/msg/src/msg_vs.c
@@ -702,6 +702,8 @@ cp_msg_vs_get_ce_stats_cnf_send (
dbg_assert (ti);
bitstream_write (&mme->bitstream, sta->rx_tonemaps->default_tmi, 8);
u8 intervals_nb = sta->rx_tonemaps->intervals->intervals_nb;
+ u8 group_intervals_nb =
+ sta->rx_tonemaps->intervals->group_intervals_nb;
bitstream_write (&mme->bitstream, intervals_nb, 8);
/* For each intervals. */
int i, m;
@@ -712,14 +714,13 @@ cp_msg_vs_get_ce_stats_cnf_send (
sta->rx_tonemaps->intervals->interval[i].end_offset_atu, 16);
if (sta->intervals)
bitstream_write (&mme->bitstream,
- (i % mac_interval_fsm_count_) + 1,
- 8);
+ (i % group_intervals_nb) + 1, 8);
else
bitstream_write (&mme->bitstream, 0, 8);
}
/* For each FSM. */
tonemap_t *tm;
- int fsm_count = (sta->intervals ? mac_interval_fsm_count_ + 1 : 1);
+ int fsm_count = (sta->intervals ? group_intervals_nb + 1 : 1);
for (i = 0; i < fsm_count; i++)
{
ce_rx_bitloading_t *bl;
diff --git a/cesar/mac/common/interval.h b/cesar/mac/common/interval.h
index ef9d560be3..b6d0659faa 100644
--- a/cesar/mac/common/interval.h
+++ b/cesar/mac/common/interval.h
@@ -50,9 +50,11 @@ mac_interval_append (tonemaps_t *tms, u16 end_offset_atu, u8 tmi);
/**
* Switch intervals list to the temporary intervals list.
* \param tms the tone maps structure.
+ * \param group_intervals_nb number of intervals per group, or 0 if no
+ * group.
* This function swap the pointers of intervals and intervals_temp.
*/
void
-mac_interval_commit_changes (tonemaps_t *tms);
+mac_interval_commit_changes (tonemaps_t *tms, u8 group_intervals_nb);
#endif /* mac_common_interval_h */
diff --git a/cesar/mac/common/src/interval.c b/cesar/mac/common/src/interval.c
index b09c5bf60f..d6662c7c7b 100644
--- a/cesar/mac/common/src/interval.c
+++ b/cesar/mac/common/src/interval.c
@@ -55,13 +55,15 @@ mac_interval_append (tonemaps_t *tms, u16 end_offset_atu, u8 tmi)
}
void
-mac_interval_commit_changes (tonemaps_t *tms)
+mac_interval_commit_changes (tonemaps_t *tms, u8 group_intervals_nb)
{
/* Check parameters. */
dbg_assert (tms);
dbg_assert (tms->intervals_temp);
dbg_assert (tms->intervals);
+ /* Fill extra parameters. */
+ tms->intervals_temp->group_intervals_nb = group_intervals_nb;
/* Update intervals version before switching intervals. */
tms->intervals_temp->version = tms->intervals->version + 1;
/* Atomic switch of intervals list. */
diff --git a/cesar/mac/common/test/interval/src/test_interval.c b/cesar/mac/common/test/interval/src/test_interval.c
index 2f27f03f02..62b3b64553 100644
--- a/cesar/mac/common/test/interval/src/test_interval.c
+++ b/cesar/mac/common/test/interval/src/test_interval.c
@@ -47,7 +47,7 @@ interval_usage_test (test_t t)
test_fail_if (tms->intervals_temp->intervals_nb != int_nb);
test_fail_if (tms->intervals->version != int_version);
/* Commit changes. */
- mac_interval_commit_changes (tms);
+ mac_interval_commit_changes (tms, j);
int_version++;
test_fail_if (tms->intervals->intervals_nb != int_nb);
test_fail_if (tms->intervals_temp->intervals_nb != 0);
@@ -58,6 +58,7 @@ interval_usage_test (test_t t)
!= i * 2 + 1);
}
test_fail_if (tms->intervals->version != int_version);
+ test_fail_if (tms->intervals->group_intervals_nb != j);
}
} test_end;
@@ -79,7 +80,7 @@ interval_usage_test (test_t t)
test_fail_if (tms->intervals_temp->intervals_nb != TONEMAP_INTERVAL_NB);
test_fail_if (tms->intervals->version != int_version);
/* Commit changes. */
- mac_interval_commit_changes (tms);
+ mac_interval_commit_changes (tms, 0);
int_version++;
test_fail_if (tms->intervals->version != int_version);
test_fail_if (tms->intervals->intervals_nb != TONEMAP_INTERVAL_NB);
@@ -89,6 +90,7 @@ interval_usage_test (test_t t)
test_fail_if (tms->intervals->interval[i].end_offset_atu
!= i * 2 + 1);
}
+ test_fail_if (tms->intervals->group_intervals_nb != 0);
} test_end;
test_begin (t, "add no interval")
@@ -101,11 +103,12 @@ interval_usage_test (test_t t)
test_fail_if (tms->intervals_temp->intervals_nb != 0);
test_fail_if (tms->intervals->version != int_version);
/* Commit changes. */
- mac_interval_commit_changes (tms);
+ mac_interval_commit_changes (tms, i);
int_version++;
test_fail_if (tms->intervals->intervals_nb != 0);
test_fail_if (tms->intervals_temp->intervals_nb != 0);
test_fail_if (tms->intervals->version != int_version);
+ test_fail_if (tms->intervals->group_intervals_nb != i);
}
} test_end;
diff --git a/cesar/mac/common/tonemap.h b/cesar/mac/common/tonemap.h
index d57d68a1d5..3fd4ebbd56 100644
--- a/cesar/mac/common/tonemap.h
+++ b/cesar/mac/common/tonemap.h
@@ -142,6 +142,10 @@ struct tonemap_intervals_t
* have the correct index in the table of intervals.
*/
u8 intervals_nb;
+ /**
+ * Number of interval in a group, or 0 if no group.
+ */
+ u8 group_intervals_nb;
/** Intervals. */
tonemap_interval_t interval[TONEMAP_INTERVAL_NB];
};
diff --git a/cesar/mac/pbproc/test/pbproc/inc/utils.h b/cesar/mac/pbproc/test/pbproc/inc/utils.h
index 2d68db0ad2..445529cea5 100644
--- a/cesar/mac/pbproc/test/pbproc/inc/utils.h
+++ b/cesar/mac/pbproc/test/pbproc/inc/utils.h
@@ -57,6 +57,7 @@ utils_sta_prepare_default_tonemap (test_pbproc_t *tp, bool tx, uint tei,
* \param tei STA TEI
* \param intervals list of intervals to prepare
* \param default_tmi new default TMI
+ * \param group_intervals_nb number of intervals in each interval group
* \return intervals version
*
* utils_sta_prepare_default_tonemap should have been called before.
@@ -64,6 +65,7 @@ utils_sta_prepare_default_tonemap (test_pbproc_t *tp, bool tx, uint tei,
uint
utils_sta_prepare_intervals (test_pbproc_t *tp, bool tx, uint tei,
const utils_interval_t *intervals,
+ uint group_intervals_nb,
uint default_tmi);
void
diff --git a/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c b/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
index 66bd56e790..a6670cdf63 100644
--- a/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
+++ b/cesar/mac/pbproc/test/pbproc/src/prep_mpdu.c
@@ -167,7 +167,7 @@ prep_mpdu_test_f (test_t t, test_pbproc_t *tp, u32 date,
if (params->intervals)
{
intervals_version = utils_sta_prepare_intervals (
- tp, true, dtei, params->intervals, PHY_MOD_ROBO);
+ tp, true, dtei, params->intervals, 0, PHY_MOD_ROBO);
interval = params->interval;
}
tonemap_sound_reason_code_t sound_reason_code =
diff --git a/cesar/mac/pbproc/test/pbproc/src/tx_data.c b/cesar/mac/pbproc/test/pbproc/src/tx_data.c
index 6f46ab5db4..51e29e70ec 100644
--- a/cesar/mac/pbproc/test/pbproc/src/tx_data.c
+++ b/cesar/mac/pbproc/test/pbproc/src/tx_data.c
@@ -389,7 +389,8 @@ tx_data_burst_test (test_t t, test_pbproc_t *tp, u32 date, uint mfs_seg_nb,
}
}
if (intervals)
- utils_sta_prepare_intervals (tp, true, dtei, intervals, PHY_MOD_ROBO);
+ utils_sta_prepare_intervals (tp, true, dtei, intervals, 0,
+ PHY_MOD_ROBO);
/* Ask for channel data to enable sound transmission. */
u32 chandata_conf[1] = { 0 };
pbproc_set_chandata_conf (
diff --git a/cesar/mac/pbproc/test/pbproc/src/utils.c b/cesar/mac/pbproc/test/pbproc/src/utils.c
index 505ada1fd3..6a6390aefb 100644
--- a/cesar/mac/pbproc/test/pbproc/src/utils.c
+++ b/cesar/mac/pbproc/test/pbproc/src/utils.c
@@ -170,6 +170,7 @@ utils_sta_prepare_default_tonemap (test_pbproc_t *tp, bool tx, uint tei,
uint
utils_sta_prepare_intervals (test_pbproc_t *tp, bool tx, uint tei,
const utils_interval_t *intervals,
+ uint group_intervals_nb,
uint default_tmi)
{
uint intervals_version;
@@ -200,7 +201,7 @@ utils_sta_prepare_intervals (test_pbproc_t *tp, bool tx, uint tei,
/* Do not fill tonemap, unused. */
}
}
- mac_interval_commit_changes (tms);
+ mac_interval_commit_changes (tms, group_intervals_nb);
tms->default_tmi = default_tmi;
intervals_version = tms->intervals->version;
blk_release (sta);