summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authormercadie2010-05-17 09:42:16 +0000
committermercadie2010-05-17 09:42:16 +0000
commit1543c6c9a6d5c834e89d8b01d1a73dd1955f3750 (patch)
tree9a18b3c02a25df45a3cc552bda9cfc9af3149044 /cesar
parent5fbd16974c2617b42aef6333ecea9fede549f581 (diff)
cesar/{bsu, cp/beacon}: modify phy_date use after merge with git-svn
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@7041 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar')
-rw-r--r--cesar/bsu/aclf/src/aclf.c6
-rw-r--r--cesar/bsu/ntb/src/ntb.c2
-rw-r--r--cesar/cp/beacon/src/beacon.c4
-rw-r--r--cesar/cp/beacon/test/src/phy_stub.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/cesar/bsu/aclf/src/aclf.c b/cesar/bsu/aclf/src/aclf.c
index 2655cde640..dde54fa946 100644
--- a/cesar/bsu/aclf/src/aclf.c
+++ b/cesar/bsu/aclf/src/aclf.c
@@ -81,10 +81,10 @@ bsu_aclf_acl_frequency_detection (bsu_aclf_t *ctx)
dbg_assert (ctx->phy);
/* Compute the date until the one it should wait the new zc. It waits a
* little bit more than a 50Hz zero cross. */
- wait_date = phy_date (ctx->phy) + BSU_ACLF_ZC_50HZ_TCK + 1000;
+ wait_date = phy_date () + BSU_ACLF_ZC_50HZ_TCK + 1000;
/* Wait actively on Zero Cross change for 250 000 ticks. */
for (newzc = ctx->date = phy_clock_get_zero_cross_captured_date (ctx->phy);
- less_mod2p32 (phy_date (ctx->phy), wait_date)
+ less_mod2p32 (phy_date (), wait_date)
&& newzc == ctx->date;
newzc = phy_clock_get_zero_cross_captured_date (ctx->phy))
;
@@ -137,7 +137,7 @@ bsu_aclf_ac_compute_beacon_period_start_date (bsu_aclf_t *ctx)
{
dbg_assert (ctx);
uint i;
- u32 now = phy_date (ctx->phy);
+ u32 now = phy_date ();
u32 bts;
int bto;
diff --git a/cesar/bsu/ntb/src/ntb.c b/cesar/bsu/ntb/src/ntb.c
index 7db51c2178..d84cb85cc4 100644
--- a/cesar/bsu/ntb/src/ntb.c
+++ b/cesar/bsu/ntb/src/ntb.c
@@ -70,7 +70,7 @@ bsu_ntb_offset (bsu_ntb_sync_t *ctx, phy_t *phy, double freq_error,
dbg_assert (ctx);
dbg_assert (phy);
/* Get the delay in system ticks. */
- delay_systck = phy_sysdate (phy) - preamble_stadate;
+ delay_systck = phy_sysdate () - preamble_stadate;
if (ctx->init)
{
offset = (s32) (bts - preamble_stadate)
diff --git a/cesar/cp/beacon/src/beacon.c b/cesar/cp/beacon/src/beacon.c
index 9877b53299..ce255cc672 100644
--- a/cesar/cp/beacon/src/beacon.c
+++ b/cesar/cp/beacon/src/beacon.c
@@ -458,7 +458,7 @@ cp_beacon_countdowns (cp_t *ctx)
dbg_assert (ctx);
// TODO DM: is this test really usefull?
- if (less_mod2p32 (ctx->beacon.countdown_limit_date, phy_date (ctx->phy)))
+ if (less_mod2p32 (ctx->beacon.countdown_limit_date, phy_date ()))
{
u32 intervals;
@@ -572,7 +572,7 @@ cp_beacon_init (cp_t *ctx)
// Initialise the mem_share_slot_id so that the next slot is 0.
ctx->beacon.shared_mem_slot_id = CP_SHARED_MEM_SLOT_NB - 1;
- ctx->beacon.last_countdown_date = phy_date (ctx->phy);
+ ctx->beacon.last_countdown_date = phy_date ();
ctx->beacon.countdown_limit_date = ctx->beacon.last_countdown_date;
/* Setup beacon indicator. */
diff --git a/cesar/cp/beacon/test/src/phy_stub.c b/cesar/cp/beacon/test/src/phy_stub.c
index b8c0fd7c7e..97baa8d937 100644
--- a/cesar/cp/beacon/test/src/phy_stub.c
+++ b/cesar/cp/beacon/test/src/phy_stub.c
@@ -23,7 +23,7 @@ phy_clock_get_zero_cross_captured_date (phy_t *phy)
}
u32
-phy_date (phy_t *ctx)
+phy_date ()
{
return BSU_ACLF_BP_60HZ_TCK+1;
}