summaryrefslogtreecommitdiff
path: root/nuttx/drivers/net
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-04-13 21:44:24 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-04-13 21:44:24 +0000
commit7cbeae30b426e0912d1814c76e6223fb0842a9fc (patch)
treea18e5e084078df356178ec94987ed828ec669f22 /nuttx/drivers/net
parentea4461bfe4f667a624055c6a061aaef49e33cace (diff)
downloadpx4-nuttx-7cbeae30b426e0912d1814c76e6223fb0842a9fc.tar.gz
px4-nuttx-7cbeae30b426e0912d1814c76e6223fb0842a9fc.tar.bz2
px4-nuttx-7cbeae30b426e0912d1814c76e6223fb0842a9fc.zip
Macro clock_systimer replaces direct access to g_system_timer variable
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3500 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/net')
-rwxr-xr-xnuttx/drivers/net/enc28j60.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c
index 868e860dc..448decbf8 100755
--- a/nuttx/drivers/net/enc28j60.c
+++ b/nuttx/drivers/net/enc28j60.c
@@ -1,7 +1,7 @@
/****************************************************************************
* drivers/net/enc28j60.c
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* References:
@@ -658,7 +658,7 @@ static void enc_wrbreg(FAR struct enc_driver_s *priv, uint8_t ctrlreg,
static int enc_waitbreg(FAR struct enc_driver_s *priv, uint8_t ctrlreg,
uint8_t bits, uint8_t value)
{
- uint32_t start = g_system_timer;
+ uint32_t start = clock_systimer();
uint32_t elapsed;
uint8_t rddata;
@@ -669,7 +669,7 @@ static int enc_waitbreg(FAR struct enc_driver_s *priv, uint8_t ctrlreg,
/* Read the byte from the requested banked register */
rddata = enc_rdbreg(priv, ctrlreg);
- elapsed = g_system_timer - start;
+ elapsed = clock_systimer() - start;
}
while ((rddata & bits) != value || elapsed > ENC_POLLTIMEOUT);
return (rddata & bits) == value ? -ETIMEDOUT : OK;