summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cesar/bsu/beacon/beacon.h2
-rw-r--r--cesar/bsu/inc/context.h2
-rw-r--r--cesar/bsu/src/bsu.c8
-rw-r--r--cesar/bsu/test/utest/src/bsut.c10
-rw-r--r--cesar/bsu/test/utest/src/schedules.c8
-rw-r--r--cesar/bsu/test/utest/src/tests.c2
6 files changed, 16 insertions, 16 deletions
diff --git a/cesar/bsu/beacon/beacon.h b/cesar/bsu/beacon/beacon.h
index df0d038adf..7f739a9df2 100644
--- a/cesar/bsu/beacon/beacon.h
+++ b/cesar/bsu/beacon/beacon.h
@@ -164,8 +164,6 @@ struct bsu_beacon_avln_t
u8 tei;
/** Hybrid mode. */
mac_coexistence_mode_t hm;
- /** NEK switch. */
- uint nek_switch;
/** Schedule description. */
bsu_beacon_schedules_t schedules;
};
diff --git a/cesar/bsu/inc/context.h b/cesar/bsu/inc/context.h
index 1f9abb6480..dbf2cc805b 100644
--- a/cesar/bsu/inc/context.h
+++ b/cesar/bsu/inc/context.h
@@ -97,6 +97,8 @@ struct bsu_t
u32 beacon_nb_sent[BSU_BEACON_TYPE_NB];
/** Statistics received beacons. */
u32 beacon_nb_recv[BSU_BEACON_TYPE_NB];
+ /** NEK switch. */
+ uint nek_switch;
#if CONFIG_TRACE
/** Trace system. */
trace_buffer_t trace;
diff --git a/cesar/bsu/src/bsu.c b/cesar/bsu/src/bsu.c
index 25f8cc90d6..bcd13c7aa1 100644
--- a/cesar/bsu/src/bsu.c
+++ b/cesar/bsu/src/bsu.c
@@ -458,7 +458,7 @@ bsu_avln_countdown_beacon_entries_apply_changes (bsu_t *ctx, bsu_avln_t *avln)
{
avln->bs.schedules.eks.present = false;
if (avln->bs.schedules.eks.kbc == BSU_BEACON_EKS_KBC_NEK)
- avln->bs.nek_switch = !avln->bs.nek_switch;
+ ctx->nek_switch = !ctx->nek_switch;
}
}
@@ -944,7 +944,7 @@ bsu_power_on (u8 snid)
ctx->sta_avln->bs.tei = MAC_TEI_UNASSOCIATED;
ctx->sta_avln->bs.hm = ctx->beacon.vf.hm;
ctx->sta_avln->bs.snid = snid;
- ctx->sta_avln->bs.nek_switch = 0;
+ ctx->nek_switch = 0;
ctx->sta_avln->bs.schedules.ps = ctx->beacon.bmis.ps;
ctx->sta_avln->bs.schedules.nps = ctx->beacon.bmis.nps;
}
@@ -984,14 +984,14 @@ uint
bsu_nek_index_current (void)
{
bsu_t *ctx = &bsu_global;
- return ctx->sta_avln->bs.nek_switch;
+ return ctx->nek_switch;
}
uint
bsu_nek_index_next (void)
{
bsu_t *ctx = &bsu_global;
- return !ctx->sta_avln->bs.nek_switch;
+ return !ctx->nek_switch;
}
void
diff --git a/cesar/bsu/test/utest/src/bsut.c b/cesar/bsu/test/utest/src/bsut.c
index df61f673a4..669b3c32f4 100644
--- a/cesar/bsu/test/utest/src/bsut.c
+++ b/cesar/bsu/test/utest/src/bsut.c
@@ -667,14 +667,14 @@ test_case_bsu_nek_index (test_t test)
{
bsu_test_avln_create (&t, t.bsu->sta_avln);
test_fail_unless (bsu_nek_index_current () ==
- t.bsu->sta_avln->bs.nek_switch);
+ t.bsu->nek_switch);
test_fail_unless (bsu_nek_index_next () ==
- !t.bsu->sta_avln->bs.nek_switch);
- t.bsu->sta_avln->bs.nek_switch = 1;
+ !t.bsu->nek_switch);
+ t.bsu->nek_switch = 1;
test_fail_unless (bsu_nek_index_current () ==
- t.bsu->sta_avln->bs.nek_switch);
+ t.bsu->nek_switch);
test_fail_unless (bsu_nek_index_next () ==
- !t.bsu->sta_avln->bs.nek_switch);
+ !t.bsu->nek_switch);
}
test_end;
bsu_test_uninit (&t);
diff --git a/cesar/bsu/test/utest/src/schedules.c b/cesar/bsu/test/utest/src/schedules.c
index e9dff54852..0dd73d1cd0 100644
--- a/cesar/bsu/test/utest/src/schedules.c
+++ b/cesar/bsu/test/utest/src/schedules.c
@@ -129,16 +129,16 @@ test_case_bsu_schedules_countdowns_init (bsu_t *bsu, ca_schedule_t *cas)
bsu->sta_avln->bs.schedules.hm.present = true;
bsu->sta_avln->bs.schedules.hm.hmccd = 3;
bsu->sta_avln->bs.schedules.hm.newhm = 1;
- bsu->sta_avln->bs.nek_switch = 0;
+ bsu->nek_switch = 0;
cas[0].snid = bsu->sta_avln->bs.snid;
cas[0].coexistence_mode = bsu->sta_avln->bs.hm;
- cas[0].nek_switch = bsu->sta_avln->bs.nek_switch;
+ cas[0].nek_switch = bsu->nek_switch;
cas[1].snid = bsu->sta_avln->bs.snid;
cas[1].coexistence_mode = bsu->sta_avln->bs.hm;
- cas[1].nek_switch = bsu->sta_avln->bs.nek_switch;
+ cas[1].nek_switch = bsu->nek_switch;
cas[2].snid = bsu->sta_avln->bs.schedules.snid.new_snid;
cas[2].coexistence_mode = bsu->sta_avln->bs.schedules.hm.newhm;
- cas[2].nek_switch = !bsu->sta_avln->bs.nek_switch;
+ cas[2].nek_switch = !bsu->nek_switch;
}
void
diff --git a/cesar/bsu/test/utest/src/tests.c b/cesar/bsu/test/utest/src/tests.c
index cb2d9fe39a..84c228acf7 100644
--- a/cesar/bsu/test/utest/src/tests.c
+++ b/cesar/bsu/test/utest/src/tests.c
@@ -492,7 +492,7 @@ bsu_test_avln_create (bsu_test_t *ctx, bsu_avln_t *avln)
avln->bs.schedules.bpsto.present = true;
avln->bs.schedules.bpsto.bpsto = 0x45;
avln->bs.hm = MAC_COEXISTENCE_FULL_HYBRID_MODE;
- avln->bs.nek_switch = 0;
+ ctx->bsu->nek_switch = 0;
avln->bs.snid = 0;
bsu_test_schedules_persistent (ctx, &avln->bs.schedules.ps);
bsu_test_schedules_non_persistent (ctx, &avln->bs.schedules.nps);