summaryrefslogtreecommitdiff
path: root/cesar/mac/ca/src
diff options
context:
space:
mode:
Diffstat (limited to 'cesar/mac/ca/src')
-rw-r--r--cesar/mac/ca/src/access.c20
-rw-r--r--cesar/mac/ca/src/alloc.c4
2 files changed, 12 insertions, 12 deletions
diff --git a/cesar/mac/ca/src/access.c b/cesar/mac/ca/src/access.c
index 07c22b6a4d..a813543cc9 100644
--- a/cesar/mac/ca/src/access.c
+++ b/cesar/mac/ca/src/access.c
@@ -28,7 +28,7 @@ const ca_alloc_param_t *
ca_access_activate (ca_t *ctx, u32 date, uint anticipation_tck)
{
dbg_assert (ctx && ctx->state == CA_STATE_IDLE);
- CA_TRACE (ACCESS_ACTIVATE, phy_date (ctx->phy), date);
+ CA_TRACE (ACCESS_ACTIVATE, phy_date (), date);
/* Change to ACTIVATED state. */
ctx->state = CA_STATE_ACTIVATED;
/* Find current allocation. */
@@ -55,7 +55,7 @@ void
ca_access_deactivate (ca_t *ctx)
{
dbg_assert (ctx && ctx->state != CA_STATE_IDLE);
- CA_TRACE (ACCESS_DEACTIVATE, phy_date (ctx->phy));
+ CA_TRACE (ACCESS_DEACTIVATE, phy_date ());
/* Cancel programmed timer. */
phy_access_timer_cancel (ctx->phy);
/* Release reference to old MFS. */
@@ -72,7 +72,7 @@ void ARCH_ILRAM
ca_access_hold (ca_t *ctx)
{
dbg_claim (ctx && ctx->state != CA_STATE_IDLE);
- CA_TRACE (ACCESS_HOLD, phy_date (ctx->phy));
+ CA_TRACE (ACCESS_HOLD, phy_date ());
/* Change to HOLD state. */
ctx->state = CA_STATE_HOLD;
/* Cancel programmed timer. */
@@ -144,7 +144,7 @@ ca_access_compute (ca_t *ctx, u32 start_date, uint length_tck,
u32 allocation_end_date;
uint glid;
dbg_claim (ctx && ctx->state != CA_STATE_IDLE);
- CA_TRACE (ACCESS_VCS_RESTART, phy_date (ctx->phy), start_date, length_tck,
+ CA_TRACE (ACCESS_VCS_RESTART, phy_date (), start_date, length_tck,
anticipation_tck, eifs, update);
/* Release reference to old MFS. */
if (ctx->access_param.mfs)
@@ -210,7 +210,7 @@ ca_access_compute (ca_t *ctx, u32 start_date, uint length_tck,
ca_access_goto_aifs (ctx);
}
/* Make sure date is in the future. */
- u32 update_date = phy_date (ctx->phy);
+ u32 update_date = phy_date ();
if (update
&& ctx->access_param.mfs
&& less_mod2p32 (ctx->access_param.access_date - anticipation_tck,
@@ -314,7 +314,7 @@ void ARCH_ILRAM
ca_access_program (ca_t *ctx, u32 date, uint anticipation_tck)
{
dbg_claim (ctx && ctx->state != CA_STATE_IDLE);
- CA_TRACE (ACCESS_PROGRAM, phy_date (ctx->phy), date, anticipation_tck);
+ CA_TRACE (ACCESS_PROGRAM, phy_date (), date, anticipation_tck);
/* Release reference to old MFS. */
if (ctx->access_param.mfs)
{
@@ -332,7 +332,7 @@ void
ca_access_grant (ca_t *ctx, mfs_tx_t *mfs, u32 date, uint duration_tck)
{
dbg_assert (ctx && ctx->state != CA_STATE_IDLE);
- CA_TRACE (ACCESS_GRANT, phy_date (ctx->phy), mfs, date, duration_tck);
+ CA_TRACE (ACCESS_GRANT, phy_date (), mfs, date, duration_tck);
/* Release reference to old MFS. */
if (ctx->access_param.mfs)
{
@@ -366,7 +366,7 @@ void
ca_access_defer (ca_t *ctx, u32 date, uint anticipation_tck)
{
dbg_assert (ctx && ctx->state != CA_STATE_IDLE);
- CA_TRACE (ACCESS_DEFER, phy_date (ctx->phy), date, anticipation_tck);
+ CA_TRACE (ACCESS_DEFER, phy_date (), date, anticipation_tck);
/* Release reference to old MFS. */
if (ctx->access_param.mfs)
{
@@ -390,7 +390,7 @@ ca_access_aifs (ca_t *ctx)
dbg_claim (ctx && ctx->state != CA_STATE_IDLE);
dbg_assert (ctx->current_beacon_period != ctx->beacon_periods_tail);
dbg_claim (ctx->access_param.mfs == NULL);
- CA_TRACE (ACCESS_AIFS, phy_date (ctx->phy));
+ CA_TRACE (ACCESS_AIFS, phy_date ());
/* Go on with the next allocation, first get current one. */
uint bp_i = ctx->current_beacon_period;
ca_beacon_period_t *bp = &ctx->beacon_periods[bp_i];
@@ -434,7 +434,7 @@ void
ca_access_update (ca_t *ctx)
{
dbg_assert (ctx);
- u32 date = phy_date (ctx->phy);
+ u32 date = phy_date ();
if (ctx->state >= CA_STATE_ACTIVATED
/* Is there time to reprogram? */
&& less_mod2p32 (date, ctx->access_param.access_date
diff --git a/cesar/mac/ca/src/alloc.c b/cesar/mac/ca/src/alloc.c
index cc6f9ff4d1..368db7c9ce 100644
--- a/cesar/mac/ca/src/alloc.c
+++ b/cesar/mac/ca/src/alloc.c
@@ -127,7 +127,7 @@ ca_alloc_update_beacon_periods (ca_t *ctx,
dbg_assert (beacon_periods);
dbg_assert (beacon_periods_nb > 0
&& beacon_periods_nb < CA_BEACON_PERIOD_NB - 1);
- CA_TRACE (ALLOC_UPDATE_BEACON_PERIODS, phy_date (ctx->phy));
+ CA_TRACE (ALLOC_UPDATE_BEACON_PERIODS, phy_date ());
/* Eliminate expired beacon period from context. */
for (i = ctx->beacon_periods_head;
i != ctx->beacon_periods_tail
@@ -139,7 +139,7 @@ ca_alloc_update_beacon_periods (ca_t *ctx,
current_at_tail = ctx->current_beacon_period == ctx->beacon_periods_tail;
/* First beacon period provided should be the current one (actually, it
* might be the second one...). */
- now = phy_date (ctx->phy);
+ now = phy_date ();
dbg_assert (lesseq_mod2p32 (beacon_periods[0].start_date, now)
&& (beacon_periods_nb < 2
|| less_mod2p32 (now, beacon_periods[1].start_date)));