summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/bitloading/test
diff options
context:
space:
mode:
authorNicolas Schodet2013-04-18 17:05:14 +0200
committerNicolas Schodet2013-04-25 10:29:02 +0200
commit874067680dd852594a703b96bdc154e21730a5f3 (patch)
treef8adc51428414a4730fd4dd2d19c36270b369dd2 /cesar/ce/rx/bitloading/test
parentbfa7e63c0c950e1d50b6bcf8fdd510930d9c53cc (diff)
cesar/ce, cesar/mac/common: add group interval nb in mac tonemap configuration
Diffstat (limited to 'cesar/ce/rx/bitloading/test')
-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
5 files changed, 28 insertions, 17 deletions
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;