summaryrefslogtreecommitdiff
path: root/cesar/bsu/test/utest
diff options
context:
space:
mode:
authorNélio Laranjeiro2011-12-05 16:32:01 +0100
committerThierry Carré2012-05-10 17:02:54 +0200
commit0cc3ff2bad636a45886bc07efcba9e31d5b10677 (patch)
tree7478a48330ac68cf1e991f89d39bbad8d8c3a8d6 /cesar/bsu/test/utest
parent14fe211e81903d8dd5f8709d977bca901c9d681e (diff)
cesar: replace BSU_BEACON_NM and CP_NET_NM by MAC_NM
Diffstat (limited to 'cesar/bsu/test/utest')
-rw-r--r--cesar/bsu/test/utest/src/bsut.c10
-rw-r--r--cesar/bsu/test/utest/src/tests.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/cesar/bsu/test/utest/src/bsut.c b/cesar/bsu/test/utest/src/bsut.c
index 2dda881d86..ad4fd34c8f 100644
--- a/cesar/bsu/test/utest/src/bsut.c
+++ b/cesar/bsu/test/utest/src/bsut.c
@@ -470,9 +470,9 @@ test_case_bsu_timer_event_cco_ucco (test_t test, bsu_test_t *t,
beacon.beacon_period_start_date =
bsu_aclf_beacon_period_start_date_next (t->bsu->aclf);
bsu_update (t->bsu, &beacon, type);
- t->bsu->sta_avln->beacon.vf.nm = BSU_BEACON_NM_UNCOORDINATED;
+ t->bsu->sta_avln->beacon.vf.nm = MAC_NM_UNCOORDINATED;
t->bsu->sta_avln->beacon.bmis.bpsto.present = false;
- cmp_avln.beacon.vf.nm = BSU_BEACON_NM_UNCOORDINATED;
+ cmp_avln.beacon.vf.nm = MAC_NM_UNCOORDINATED;
bsu_timer_event_process (t->bsu);
test_fail_unless (t->ul.beacon != INVALID_PTR);
test_fail_unless (t->ul.beacon->next == NULL);
@@ -534,7 +534,7 @@ test_case_bsu_timer_event (test_t test)
bsu_test_avln_create (&t, &cmp_avln);
cmp_avln.beacon.vf.nm =
t.bsu->sta_avln->beacon.vf.nm =
- BSU_BEACON_NM_UNCOORDINATED;
+ MAC_NM_UNCOORDINATED;
for (j = 0; j < 10; j++)
{
t.bsu->sta_avln->beacon.beacon_period_start_date =
@@ -688,7 +688,7 @@ test_case_bsu_persistent_schedules_update__cscma_cscd_permanent (
test_within (test);
bsu_test_init (&t);
memset (&t.bsu->sta_avln->beacon, 0, sizeof (bsu_beacon_t));
- t.bsu->sta_avln->beacon.vf.nm = BSU_BEACON_NM_CSMA_ONLY;
+ t.bsu->sta_avln->beacon.vf.nm = MAC_NM_CSMA_ONLY;
bsu_test_create_beacon (&t, &beacon);
beacon.bmis.ps.nb = ps_nb;
beacon.bmis.ps.ps[0].cscd = HPAV_SCHEDULE_PERMAMENT_VALUE;
@@ -716,7 +716,7 @@ test_case_bsu_persistent_schedules_update__cscma_cscd_non_permanent (
test_within (test);
bsu_test_init (&t);
memset (&t.bsu->sta_avln->beacon, 0, sizeof (bsu_beacon_t));
- t.bsu->sta_avln->beacon.vf.nm = BSU_BEACON_NM_CSMA_ONLY;
+ t.bsu->sta_avln->beacon.vf.nm = MAC_NM_CSMA_ONLY;
bsu_test_create_beacon (&t, &beacon);
beacon.bmis.ps.nb = ps_nb;
bsu_update__persistent_schedules (t.bsu, &beacon);
diff --git a/cesar/bsu/test/utest/src/tests.c b/cesar/bsu/test/utest/src/tests.c
index 87a454d3ab..7f4dfe7e55 100644
--- a/cesar/bsu/test/utest/src/tests.c
+++ b/cesar/bsu/test/utest/src/tests.c
@@ -163,7 +163,7 @@ bsu_test_create_beacon (bsu_test_t *ctx, bsu_beacon_t *beacon)
beacon->vf.aclsss = true;
beacon->vf.hoip = false;
beacon->vf.rtsbf = false;
- beacon->vf.nm = BSU_BEACON_NM_CSMA_ONLY;
+ beacon->vf.nm = MAC_NM_CSMA_ONLY;
beacon->vf.ccocap = 0;
/* Regions. */
beacon->bmis.region.nb = 2;