summaryrefslogtreecommitdiff
path: root/mac/ca/src
diff options
context:
space:
mode:
authorschodet2008-02-28 13:39:25 +0000
committerschodet2008-02-28 13:39:25 +0000
commit79d0f8b7cd6ac5a1119f017cc6c37ad45dbe5fad (patch)
treea39ca843702bc0e02aba2c4a92a41c10c833f238 /mac/ca/src
parent0aa1e3e4e802c15d54c997d222b9ffacf86b7c81 (diff)
* mac/common, mac/ca:
- added NEK related defines. - added NEK switch support in CA. - updated tests and CP. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1497 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'mac/ca/src')
-rw-r--r--mac/ca/src/access.c2
-rw-r--r--mac/ca/src/alloc.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/mac/ca/src/access.c b/mac/ca/src/access.c
index 1af804d079..a312f047f1 100644
--- a/mac/ca/src/access.c
+++ b/mac/ca/src/access.c
@@ -47,6 +47,7 @@ ca_access_activate (ca_t *ctx, u32 date, uint anticipation_tck)
/* Return current allocation parameters. */
ctx->current_allocation_param.coexistence_mode = sched->coexistence_mode;
ctx->current_allocation_param.hybrid = hybrid;
+ ctx->current_allocation_param.nek_switch = sched->nek_switch;
return &ctx->current_allocation_param;
}
@@ -365,6 +366,7 @@ ca_access_aifs (ca_t *ctx)
ctx->current_allocation_param.hybrid = CA_ALLOC_IS_HYBRID (
sched->coexistence_mode,
sched->allocations[ctx->current_allocation_index].glid);
+ ctx->current_allocation_param.nek_switch = sched->nek_switch;
return &ctx->current_allocation_param;
}
diff --git a/mac/ca/src/alloc.c b/mac/ca/src/alloc.c
index f270c4b32f..0206100a57 100644
--- a/mac/ca/src/alloc.c
+++ b/mac/ca/src/alloc.c
@@ -121,6 +121,7 @@ ca_alloc_update_beacon_periods (ca_t *ctx,
ca_schedule_t *sched =
&ctx->schedules[beacon_periods[j].schedule_index];
dbg_assert (sched->coexistence_mode < MAC_COEXISTENCE_NB
+ && sched->nek_switch < 2
&& sched->allocations_nb > 0
&& sched->allocations[0].end_offset_tck > 0);
}