From 949e9720fb4a09999538661cef19fc56bb776873 Mon Sep 17 00:00:00 2001 From: NĂ©lio Laranjeiro Date: Tue, 15 Mar 2011 11:46:37 +0100 Subject: cesar: add bsu context to all bsu function calls, closes #2400 --- cesar/bsu/test/utest/src/bsut.c | 74 ++++++++++++++++++------------------ cesar/bsu/test/utest/src/schedules.c | 20 +++++----- cesar/bsu/test/utest/src/tests.c | 4 +- 3 files changed, 49 insertions(+), 49 deletions(-) (limited to 'cesar/bsu/test/utest') diff --git a/cesar/bsu/test/utest/src/bsut.c b/cesar/bsu/test/utest/src/bsut.c index 7703348f95..b25a9cbd60 100644 --- a/cesar/bsu/test/utest/src/bsut.c +++ b/cesar/bsu/test/utest/src/bsut.c @@ -38,7 +38,7 @@ test_case_bsu_process (test_t test) { bsu_test_t t; bsu_test_init (&t); - bsu_activate (true); + bsu_activate (t.bsu, true); test_case_begin (test, "BSU process"); test_begin (test, "Process function on neighbour beacon") { @@ -104,7 +104,7 @@ test_case_bsu_process (test_t test) == 2); blk_release (bprocessed); /* Our AVLN. */ - bsu_track_avln ( + bsu_track_avln (t.bsu, beacon_neighbour.vf.nid, 0x4, beacon_neighbour.vf.stei, beacon_neighbour.bmis.mac_address.mac_address); t.bsu->sta_avln->sync.init = false; @@ -159,7 +159,7 @@ test_case_bsu_process (test_t test) bsu_beacon_t *bbeacon = bsu_beacon_process (t.bsu, b, &brx); blk_release (bbeacon); /* Change MAC config TEI for the test. */ - bsu_track_avln (beacon.vf.nid, brx.snid, t.mac_config.tei, + bsu_track_avln (t.bsu, beacon.vf.nid, brx.snid, t.mac_config.tei, beacon.bmis.mac_address.mac_address); t.mac_config.tei = beacon.bmis.discover.tei; memset (&t.sar, 0, sizeof (bsu_test_sar_t)); @@ -191,7 +191,7 @@ test_case_bsu_process (test_t test) bsu_ntb_init (&t.bsu->poweron.sync); for (i = 0; i < COUNT (type); i++) { - bsu_update (&beacon, type[i]); + bsu_update (t.bsu, &beacon, type[i]); pb_beacon_t *b; pbproc_tx_beacon_params_t btx; pbproc_rx_beacon_params_t brx; @@ -222,10 +222,10 @@ test_case_bsu_process (test_t test) test_fail_unless (avln != t.bsu->sta_avln); blk_release_desc ((blk_t*) b); blk_release (bprocessed); - bsu_track_avln (beacon.vf.nid, brx.snid, 1, + bsu_track_avln (t.bsu, beacon.vf.nid, brx.snid, 1, beacon.bmis.mac_address.mac_address); test_fail_unless (avln == t.bsu->sta_avln); - bsu_avln_remove (beacon.vf.nid, brx.snid, + bsu_avln_remove (t.bsu, beacon.vf.nid, brx.snid, beacon.bmis.mac_address.mac_address); test_fail_unless (&t.bsu->poweron == t.bsu->sta_avln); } @@ -275,7 +275,7 @@ test_case_bsu_process_sta_is_cco (test_t test) { bsu_beacon_t beacon; bsu_test_create_beacon (&t, &beacon); - bsu_update (&beacon, BSU_UPDATE_STA_TYPE_CCO); + bsu_update (t.bsu, &beacon, BSU_UPDATE_STA_TYPE_CCO); pb_beacon_t *b; pbproc_tx_beacon_params_t btx; pbproc_rx_beacon_params_t brx; @@ -325,7 +325,7 @@ test_case_bsu_update (test_t test) bsu_test_t t; bsu_beacon_t beacon; bsu_test_init (&t); - bsu_activate (true); + bsu_activate (t.bsu, true); test_case_begin (test, "BSU Update"); test_begin (test, "update BSU in time") { @@ -333,13 +333,13 @@ test_case_bsu_update (test_t test) beacon.beacon_period_start_date = bsu_aclf_beacon_period_start_date_next (t.bsu->aclf); t.bsu->is_sta = false; - bsu_update (&beacon, true /* is station. */); + bsu_update (t.bsu, &beacon, true /* is station. */); test_fail_unless (memcmp (&t.bsu->sta_avln->beacon, &beacon, sizeof (bsu_beacon_t)) == 0); test_fail_unless (t.bsu->is_sta == true); /* Change station situation. */ t.bsu->is_sta = true; - bsu_update (&beacon, false /* is CCo. */); + bsu_update (t.bsu, &beacon, false /* is CCo. */); test_fail_unless (memcmp (&t.bsu->sta_avln->beacon, &beacon, sizeof (bsu_beacon_t)) == 0); test_fail_unless (t.bsu->is_sta == false); @@ -351,7 +351,7 @@ test_case_bsu_update (test_t test) t.bsu->is_sta = false; t.bsu->sta_avln->beacon.bmis.ps.ps[0].pscd--; t.bsu->sta_avln->beacon.bmis.ps.ps[1].pscd--; - bsu_update (&beacon, true /* is station. */); + bsu_update (t.bsu, &beacon, true /* is station. */); test_fail_unless (memcmp (&t.bsu->sta_avln->beacon, &beacon, sizeof (bsu_beacon_t)) != 0); test_fail_unless (t.bsu->is_sta == true); @@ -361,7 +361,7 @@ test_case_bsu_update (test_t test) { test_case_bsu_update_init (&t, &beacon); t.bsu->sta_avln->beacon.bmis.ps.nb = 1; - bsu_update (&beacon, true /* is station. */); + bsu_update (t.bsu, &beacon, true /* is station. */); /* Only the second schedules should be touched by the function. */ t.bsu->sta_avln->beacon.bmis.ps.ps[1].pscd++; test_fail_unless (t.bsu->sta_avln->beacon.bmis.ps.nb @@ -385,7 +385,7 @@ test_case_bsu_update (test_t test) t.bsu->sta_avln->beacon.bmis.bpsto.present = false; t.bsu->sta_avln->beacon.bmis.nps.ns = 0; t.bsu->sta_avln->beacon.bmis.region.nb = 0; - bsu_update (&beacon, true /* is station. */); + bsu_update (t.bsu, &beacon, true /* is station. */); test_fail_unless (t.bsu->sta_avln->beacon.bmis.mac_address.present == true); test_fail_unless (t.bsu->sta_avln->beacon.bmis.discover.present == true); @@ -407,7 +407,7 @@ test_case_bsu_update (test_t test) t.bsu->sta_avln->beacon.bmis.change_hm.present = false; t.bsu->sta_avln->beacon.bmis.change_snid.present = false; t.bsu->sta_avln->beacon.bmis.mac_address.present = false; - bsu_update (&beacon, true /* is station. */); + bsu_update (t.bsu, &beacon, true /* is station. */); test_fail_unless (t.bsu->sta_avln->beacon.bmis.eks.present == true); test_fail_unless (t.bsu->sta_avln->beacon.bmis.handover.present == true); test_fail_unless (t.bsu->sta_avln->beacon.bmis.relocation.present == true); @@ -433,7 +433,7 @@ test_case_bsu_timer_event_cco_ucco (test_t test, bsu_test_t *t, MAC_LID_DISCOVER; bsu_avln_t cmp_avln; bsu_test_init (t); - bsu_activate (true); + bsu_activate (t->bsu, true); bsu_test_avln_create (t, &cmp_avln); u32 now = phy_date (); for (i = 0; i < BSU_ACLF_BPSD_NB; i++) @@ -443,7 +443,7 @@ test_case_bsu_timer_event_cco_ucco (test_t test, bsu_test_t *t, bsu_test_upper_layer_beacon_received_init (t); beacon.beacon_period_start_date = bsu_aclf_beacon_period_start_date_next (t->bsu->aclf); - bsu_update (&beacon, type); + bsu_update (t->bsu, &beacon, type); t->bsu->sta_avln->beacon.vf.nm = BSU_BEACON_NM_UNCOORDINATED; t->bsu->sta_avln->beacon.bmis.bpsto.present = false; cmp_avln.beacon.vf.nm = BSU_BEACON_NM_UNCOORDINATED; @@ -498,12 +498,12 @@ test_case_bsu_timer_event (test_t test) bsu_test_t t; bsu_avln_t cmp_avln; bsu_test_init (&t); - bsu_activate (true); + bsu_activate (t.bsu, true); t.bsu->aclf->pwl_sync.trig_present = false; t.phy->phy_date = 0; bsu_beacon_t beacon; bsu_test_create_beacon (&t, &beacon); - bsu_update (&beacon, BSU_UPDATE_STA_TYPE_STA); + bsu_update (t.bsu, &beacon, BSU_UPDATE_STA_TYPE_STA); bsu_test_avln_create (&t, t.bsu->sta_avln); bsu_test_avln_create (&t, &cmp_avln); cmp_avln.beacon.vf.nm = @@ -540,7 +540,7 @@ test_case_bsu_timer_event (test_t test) uint i; bsu_avln_t cmp_avln; bsu_test_init (&t); - bsu_activate (true); + bsu_activate (t.bsu, true); bsu_test_avln_create (&t, &cmp_avln); u32 now = phy_date (); for (i = 0; i < BSU_ACLF_BPSD_NB; i++) @@ -595,9 +595,9 @@ test_case_bsu_activate (test_t test) uint i; bsu_beacon_t beacon; bsu_test_create_beacon (&t, &beacon); - bsu_update (&beacon, BSU_UPDATE_STA_TYPE_CCO); - bsu_power_on (0); - bsu_activate (true); + bsu_update (t.bsu, &beacon, BSU_UPDATE_STA_TYPE_CCO); + bsu_power_on (t.bsu, 0); + bsu_activate (t.bsu, true); test_fail_unless (t.bsu->activate == true); bsu_aclf_beacon_period_start_date (t.bsu->aclf, bpsd, COUNT(bpsd)); for (i = 0; i < COUNT (bpsd) - 1; i++) @@ -605,12 +605,12 @@ test_case_bsu_activate (test_t test) test_fail_unless (t.ca.nb_beacon_periods == 3); for (i = 0; i < t.ca.nb_beacon_periods; i++) test_fail_unless (t.ca.beacon_periods[i].start_date == bpsd[i]); - bsu_activate (false); + bsu_activate (t.bsu, false); test_fail_unless (t.bsu->activate == false); test_fail_unless (t.bsu->sta_avln == &t.bsu->poweron); /* Reactivate the BSU. */ bsu_aclf_beacon_period_start_date (t.bsu->aclf, bpsd, COUNT (bpsd)); - bsu_activate (true); + bsu_activate (t.bsu, true); for (i = 0; i < t.ca.nb_beacon_periods; i++) test_fail_unless (t.ca.beacon_periods[i].start_date != bpsd[i]); /* Verify that new bpsd start date are for now. */ @@ -632,8 +632,8 @@ test_case_bsu_power_on (test_t test) { bsu_beacon_t beacon; bsu_test_create_beacon (&t, &beacon); - bsu_update (&beacon, BSU_UPDATE_STA_TYPE_STA); - bsu_power_on (0xa); + bsu_update (t.bsu, &beacon, BSU_UPDATE_STA_TYPE_STA); + bsu_power_on (t.bsu, 0xa); test_fail_unless (t.bsu->sta_avln == &t.bsu->poweron); test_fail_unless ( memcmp (&t.bsu->sta_avln->beacon.bmis.ps, @@ -746,14 +746,14 @@ test_case_bsu_nek_index (test_t test) test_begin (test, "Current index") { bsu_test_avln_create (&t, t.bsu->sta_avln); - test_fail_unless (bsu_nek_index_current () == + test_fail_unless (bsu_nek_index_current (t.bsu) == t.bsu->nek_switch); - test_fail_unless (bsu_nek_index_next () == + test_fail_unless (bsu_nek_index_next (t.bsu) == !t.bsu->nek_switch); t.bsu->nek_switch = 1; - test_fail_unless (bsu_nek_index_current () == + test_fail_unless (bsu_nek_index_current (t.bsu) == t.bsu->nek_switch); - test_fail_unless (bsu_nek_index_next () == + test_fail_unless (bsu_nek_index_next (t.bsu) == !t.bsu->nek_switch); } test_end; @@ -776,21 +776,21 @@ test_case_bsu_discover_update (test_t test) test_fail_unless (memcmp (&beacon.bmis.discover_info, &t.bsu->sta_avln->beacon.bmis.discover_info, sizeof (bsu_beacon_bmi_discover_info_t)) != 0); - bsu_update_discover_info (&beacon.bmis.discover_info); + bsu_update_discover_info (t.bsu, &beacon.bmis.discover_info); test_fail_unless (memcmp (&beacon.bmis.discover_info, &t.bsu->discover_info, sizeof (bsu_beacon_bmi_discover_info_t)) == 0); /* change update flag. */ bitstream_direct_write (&beacon.bmis.discover_info.info_data, 0, 1, 1); - bsu_update_discover_info (&beacon.bmis.discover_info); + bsu_update_discover_info (t.bsu, &beacon.bmis.discover_info); test_fail_unless ( memcmp (&beacon.bmis.discover_info, &t.bsu->discover_info, sizeof (bsu_beacon_bmi_discover_info_t)) == 0); /* change update flag. */ bitstream_direct_write (&beacon.bmis.discover_info.info_data, 0, 0, 1); - bsu_update_discover_info (&beacon.bmis.discover_info); + bsu_update_discover_info (t.bsu, &beacon.bmis.discover_info); test_fail_unless ( memcmp (&beacon.bmis.discover_info, &t.bsu->sta_avln->beacon.bmis.discover_info, @@ -800,7 +800,7 @@ test_case_bsu_discover_update (test_t test) &t.bsu->discover_info.info_data, 0, 1) == true); /* Simulate BSU reset the flag after sending a discover beacon. */ t.bsu->discover_info = beacon.bmis.discover_info; - bsu_update_discover_info (&beacon.bmis.discover_info); + bsu_update_discover_info (t.bsu, &beacon.bmis.discover_info); test_fail_unless ( memcmp (&beacon.bmis.discover_info, &t.bsu->discover_info, sizeof (bsu_beacon_bmi_discover_info_t)) == 0); @@ -874,15 +874,15 @@ test_case_bsu_avln_remove (test_t t) ctx.bsu->sta_avln = &ctx.bsu->avlns[1]; /* Reinitialise the sync information wrote by bsu_test_init. */ bsu_ntb_init (&ctx.bsu->poweron.sync); - bsu_avln_remove (1, 1, 1); + bsu_avln_remove (ctx.bsu, 1, 1, 1); test_fail_unless (ctx.bsu->sta_avln == &ctx.bsu->poweron); /* sta_avln is the first one. */ ctx.bsu->sta_avln = &ctx.bsu->avlns[0]; - bsu_avln_remove (2, 2, 2); + bsu_avln_remove (ctx.bsu, 2, 2, 2); test_fail_unless (ctx.bsu->sta_avln == &ctx.bsu->avlns[0]); /* sta_avln is the 4th one. */ ctx.bsu->sta_avln = &ctx.bsu->avlns[4]; - bsu_avln_remove (3, 3, 3); + bsu_avln_remove (ctx.bsu, 3, 3, 3); test_fail_unless (ctx.bsu->sta_avln == &ctx.bsu->avlns[3]); bsu_test_uninit (&ctx); } diff --git a/cesar/bsu/test/utest/src/schedules.c b/cesar/bsu/test/utest/src/schedules.c index 275e3ec229..f31b7f5290 100644 --- a/cesar/bsu/test/utest/src/schedules.c +++ b/cesar/bsu/test/utest/src/schedules.c @@ -162,7 +162,7 @@ test_case_bsu_schedules_countdowns (test_t t) pbproc_tx_beacon_params_t bparams; pbproc_rx_beacon_params_t bparamsrx; bsu_test_init (&ctx); - bsu_activate (true); + bsu_activate (ctx.bsu, true); ctx.mac_config.tei = 0xA; bsu_test_create_beacon (&ctx, &beacon); pb_beacon_t *pbbeacon = bsu_beacon_write ( @@ -173,7 +173,7 @@ test_case_bsu_schedules_countdowns (test_t t) blk_release (ctx.ul.beacon); bsu_test_upper_layer_beacon_received_init (&ctx); /* Continue the test. */ - bsu_track_avln (beacon.vf.nid, 0x0, ctx.mac_config.tei, + bsu_track_avln (ctx.bsu, beacon.vf.nid, 0x0, ctx.mac_config.tei, beacon.bmis.mac_address.mac_address); ctx.bsu->track_new = false; ctx.phy->use_phy_clock = false; @@ -301,7 +301,7 @@ test_case_ca_schedules_intellon (test_t test) bprocessed = bsu_beacon_process (t.bsu, pbbeacon, &brx); blk_release (bprocessed); /* Control plane request to track this AVLN. */ - bsu_track_avln (beacon.vf.nid, brx.snid, 0, + bsu_track_avln (t.bsu, beacon.vf.nid, brx.snid, 0, beacon.bmis.mac_address.mac_address); t.bsu->track_new = false; t.bsu->is_sta = BSU_UPDATE_STA_TYPE_STA; @@ -427,7 +427,7 @@ test_case_track_new (test_t t) ctx.bsu->activate = true; ctx.bsu->is_sta = BSU_UPDATE_STA_TYPE_STA; bsu_avln_t *avln = test_case_track_new_beacon (t, &ctx, &beacon); - bsu_track_avln (beacon.vf.nid, 0x1, 0x1, + bsu_track_avln (ctx.bsu, beacon.vf.nid, 0x1, 0x1, beacon.bmis.mac_address.mac_address); test_fail_unless (ctx.bsu->track_new); test_fail_unless (ctx.bsu->nid_track == beacon.vf.nid); @@ -472,7 +472,7 @@ test_case_track_new (test_t t) ctx.bsu->is_sta = BSU_UPDATE_STA_TYPE_STA; bsu_avln_t *avln = test_case_track_new_beacon (t, &ctx, &beacon); bsu_timer_event_process (ctx.bsu); - bsu_track_avln (beacon.vf.nid, 0x1, 0x1, + bsu_track_avln (ctx.bsu, beacon.vf.nid, 0x1, 0x1, beacon.bmis.mac_address.mac_address); test_fail_unless (ctx.bsu->track_new); test_fail_unless (ctx.bsu->nid_track == beacon.vf.nid); @@ -516,7 +516,7 @@ test_case_track_new (test_t t) ctx.bsu->is_sta = BSU_UPDATE_STA_TYPE_STA; bsu_avln_t *avln = test_case_track_new_beacon (t, &ctx, &beacon); bsu_timer_event_process (ctx.bsu); - bsu_track_avln (beacon.vf.nid, 0x1, 0x1, + bsu_track_avln (ctx.bsu, beacon.vf.nid, 0x1, 0x1, beacon.bmis.mac_address.mac_address); test_fail_unless (ctx.bsu->track_new); bsu_timer_event_process (ctx.bsu); @@ -566,7 +566,7 @@ test_case_track_new (test_t t) * synchronisation info are not NULL. * BSU un-track AVLN should change the tracking info to null and * set track_new flag. */ - bsu_untrack_avln (); + bsu_untrack_avln (ctx.bsu); test_fail_unless (ctx.bsu->sta_avln == &ctx.bsu->poweron); test_fail_unless (ctx.bsu->nid_track == 0); test_fail_unless (ctx.bsu->snid_track == 0); @@ -577,7 +577,7 @@ test_case_track_new (test_t t) /* Update the BSU. */ bsu_beacon_t beacon; bsu_test_create_beacon (&ctx, &beacon); - bsu_update (&beacon, BSU_UPDATE_STA_TYPE_CCO); + bsu_update (ctx.bsu, &beacon, BSU_UPDATE_STA_TYPE_CCO); test_fail_unless (ctx.bsu->is_sta == BSU_UPDATE_STA_TYPE_CCO); /* Wait timer event. */ bsu_timer_event_process (ctx.bsu); @@ -600,7 +600,7 @@ test_case_track_new (test_t t) ctx.bsu->poweron.sync.ntb_offset_tck = 0; ctx.bsu->poweron.sync.fe = 0.0; /* Create the previous AVLN. */ - bsu_track_avln (1, 1, 1, mac_track); + bsu_track_avln (ctx.bsu, 1, 1, 1, mac_track); /* Create a central beacon of the same NID, SNID but from a different * CCo. */ bsu_beacon_t beacon; @@ -657,7 +657,7 @@ test_case_track_new (test_t t) /* Process the beacon without mac address tracking. */ ctx.bsu->cco_mac_address_track = 0; /* remove the AVLN create just above. */ - bsu_avln_remove (1, 1, MAC_ZERO); + bsu_avln_remove (ctx.bsu, 1, 1, MAC_ZERO); bsu_test_reset_phy (ctx.phy); pbbeacon = bsu_beacon_write ( &beacon, BSU_BEACON_TYPE_CENTRAL, &ctx.mac_config, &tx_params); diff --git a/cesar/bsu/test/utest/src/tests.c b/cesar/bsu/test/utest/src/tests.c index 8600486649..87a454d3ab 100644 --- a/cesar/bsu/test/utest/src/tests.c +++ b/cesar/bsu/test/utest/src/tests.c @@ -80,8 +80,8 @@ bsu_test_init (bsu_test_t *ctx) bsu_test_upper_layer_beacon_received_init (ctx); bsu_beacon_t beacon; bsu_test_create_beacon (ctx, &beacon); - bsu_update (&beacon, BSU_UPDATE_STA_TYPE_CCO); - bsu_power_on (0); + bsu_update (ctx->bsu, &beacon, BSU_UPDATE_STA_TYPE_CCO); + bsu_power_on (ctx->bsu, 0); bsu_aclf_acl_frequency_detection (aclf); aclf->pwl_sync.trig_present = false; ctx->phy->phy_date = 0; -- cgit v1.2.3