summaryrefslogtreecommitdiff
path: root/cesar/mac/pbproc/src
diff options
context:
space:
mode:
authorschodet2010-04-19 13:18:51 +0000
committerschodet2010-04-19 13:18:51 +0000
commitb181dc1bc001f6163180c4786baed9a89ae31e61 (patch)
treeb39194b8755b6f98d04314512a9e9f8b9b156677 /cesar/mac/pbproc/src
parent505f4ad9eb1a4130b63ec6ab31496a2a295b2edb (diff)
cesar: remove context parameter from phy_date and phy_sysdate, refs #1415
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6931 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/mac/pbproc/src')
-rw-r--r--cesar/mac/pbproc/src/fsm.c10
-rw-r--r--cesar/mac/pbproc/src/fsm_top.c5
-rw-r--r--cesar/mac/pbproc/src/pbproc.c10
3 files changed, 12 insertions, 13 deletions
diff --git a/cesar/mac/pbproc/src/fsm.c b/cesar/mac/pbproc/src/fsm.c
index 86ab869309..cfec7fab2a 100644
--- a/cesar/mac/pbproc/src/fsm.c
+++ b/cesar/mac/pbproc/src/fsm.c
@@ -43,7 +43,7 @@ pbproc_fsm_handle_rx_fc_event (pbproc_t *ctx, u32 rx_date, const u32 *fc_av)
{
dbg_claim (ctx);
dbg_claim (ctx->fsm.current_state < PBPROC_FSM_STATE_NB);
- PBPROC_TRACE (FSM_RX_FC, phy_date (ctx->phy), rx_date,
+ PBPROC_TRACE (FSM_RX_FC, phy_date (), rx_date,
fc_av ? fc_av[0] : (u32) -1, fc_av ? fc_av[1] : (u32) -1,
fc_av ? fc_av[2] : (u32) -1, fc_av ? fc_av[3] : (u32) -1);
ctx->fsm.states[ctx->fsm.current_state].
@@ -62,7 +62,7 @@ pbproc_fsm_handle_access_event (pbproc_t *ctx)
{
dbg_claim (ctx);
dbg_claim (ctx->fsm.current_state < PBPROC_FSM_STATE_NB);
- PBPROC_TRACE (FSM_ACCESS, phy_date (ctx->phy));
+ PBPROC_TRACE (FSM_ACCESS, phy_date ());
ctx->fsm.states[ctx->fsm.current_state].access_cb (ctx);
if (ctx->fsm.schedule_deferred)
{
@@ -78,7 +78,7 @@ pbproc_fsm_handle_access_conf_event (pbproc_t *ctx)
{
dbg_claim (ctx);
dbg_claim (ctx->fsm.current_state < PBPROC_FSM_STATE_NB);
- PBPROC_TRACE (FSM_ACCESS_CONF, phy_date (ctx->phy));
+ PBPROC_TRACE (FSM_ACCESS_CONF, phy_date ());
ctx->fsm.states[ctx->fsm.current_state].access_conf_cb (ctx);
if (ctx->fsm.schedule_deferred)
{
@@ -94,7 +94,7 @@ pbproc_fsm_handle_pbdma_event (pbproc_t *ctx, u32 status_word)
{
dbg_claim (ctx);
dbg_claim (ctx->fsm.current_state < PBPROC_FSM_STATE_NB);
- PBPROC_TRACE (FSM_PBDMA, phy_date (ctx->phy), status_word);
+ PBPROC_TRACE (FSM_PBDMA, phy_date (), status_word);
ctx->pbdma_status = PHY_PBDMA_STATUS (status_word);
ctx->fsm.states[ctx->fsm.current_state].pbdma_cb (ctx);
if (ctx->fsm.schedule_deferred)
@@ -118,7 +118,7 @@ pbproc_fsm_handle_deferred (pbproc_t *ctx)
{
dbg_claim (ctx);
dbg_claim (ctx->fsm.deferred_cb);
- PBPROC_TRACE (FSM_DEFERRED, phy_date (ctx->phy));
+ PBPROC_TRACE (FSM_DEFERRED, phy_date ());
/* Call deferred callback. */
ctx->fsm.deferred_cb (ctx);
/* Signal idle task waiter. */
diff --git a/cesar/mac/pbproc/src/fsm_top.c b/cesar/mac/pbproc/src/fsm_top.c
index aa9281e68e..1a26d1be23 100644
--- a/cesar/mac/pbproc/src/fsm_top.c
+++ b/cesar/mac/pbproc/src/fsm_top.c
@@ -87,9 +87,8 @@ pbproc_ftop__idle__access (pbproc_t *ctx)
* delimiter is received, we should infer a collision. Do not
* use our backoff, the backoff procedure is not entered. */
ca_backoff_cancel (ctx->ca);
- ca_access_vcs_restart (ctx->ca, phy_date (ctx->phy),
- ctx->times.eifs_tck, PBPROC_ANTICIP_TCK,
- true);
+ ca_access_vcs_restart (ctx->ca, phy_date (), ctx->times.eifs_tck,
+ PBPROC_ANTICIP_TCK, true);
ctx->stats.prp_lost++;
dbg_claim (ctx->fsm.current_state == PBPROC_FSM_STATE_IDLE);
}
diff --git a/cesar/mac/pbproc/src/pbproc.c b/cesar/mac/pbproc/src/pbproc.c
index 41df3525c6..41666612c4 100644
--- a/cesar/mac/pbproc/src/pbproc.c
+++ b/cesar/mac/pbproc/src/pbproc.c
@@ -55,7 +55,7 @@ pbproc_deferred (pbproc_t *ctx)
/* Release PB. */
blk_release_desc_range (&head->blk, &tail->blk);
}
- current_date = phy_date (ctx->phy);
+ current_date = phy_date ();
budget_date = current_date + PBPROC_BUDGET_RX_BEACON_TCK;
while (!slist_empty (ctx->commit.rx_beacon_)
&& less_mod2p32 (current_date, budget_date))
@@ -71,7 +71,7 @@ pbproc_deferred (pbproc_t *ctx)
dbg_claim (ctx->rx_beacon_cb);
ctx->rx_beacon_cb (ctx->user_data, rx_beacon, params);
/* Watch watch. */
- current_date = phy_date (ctx->phy);
+ current_date = phy_date ();
}
budget_date = current_date + PBPROC_BUDGET_RX_TCK;
while (!slist_empty (ctx->commit.rx_)
@@ -86,7 +86,7 @@ pbproc_deferred (pbproc_t *ctx)
dbg_claim (ctx->rx_cb);
ctx->rx_cb (ctx->user_data, rx_desc);
/* Watch watch. */
- current_date = phy_date (ctx->phy);
+ current_date = phy_date ();
}
if (!slist_empty (ctx->commit.rx_beacon_)
|| !slist_empty (ctx->commit.rx_))
@@ -245,7 +245,7 @@ pbproc_deactivate_idle_task (pbproc_t *ctx)
void
pbproc_activate (pbproc_t *ctx, bool flag)
{
- PBPROC_TRACE (ACTIVATE, phy_date (ctx->phy), flag);
+ PBPROC_TRACE (ACTIVATE, phy_date (), flag);
ctx->activated = flag;
if (flag)
{
@@ -255,7 +255,7 @@ pbproc_activate (pbproc_t *ctx, bool flag)
ARCH_CPU_TO_DMA (ctx->config->tonemask_info.tonemask),
ctx->config->tonemask_info.carrier_nb);
/* Activate. */
- ctx->alloc = *ca_access_activate (ctx->ca, phy_date (ctx->phy),
+ ctx->alloc = *ca_access_activate (ctx->ca, phy_date (),
PBPROC_ANTICIP_TCK);
ctx->times = ctx->times_array[ctx->alloc.hybrid];
phy_rx_param (ctx->phy, PHY_FC_MODE (ctx->alloc.hybrid,