summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-02-25 08:12:31 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-02-25 08:12:31 -0600
commit189bbe608173983aa2ceade3eed9b0ce98ea3d47 (patch)
tree69eb01d69237dd2bcbcc2eaccdc26aad0da2b429
parentc02ffa0fc14a71a0512434f2abc8792402ac78f2 (diff)
downloadnuttx-189bbe608173983aa2ceade3eed9b0ce98ea3d47.tar.gz
nuttx-189bbe608173983aa2ceade3eed9b0ce98ea3d47.tar.bz2
nuttx-189bbe608173983aa2ceade3eed9b0ce98ea3d47.zip
SAM4CM free-running time: Change overflow type from uint16 to uint32. From Max Neklyudov.
-rw-r--r--nuttx/arch/arm/src/sam34/sam4cm_freerun.c2
-rw-r--r--nuttx/arch/arm/src/sam34/sam4cm_freerun.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/sam34/sam4cm_freerun.c b/nuttx/arch/arm/src/sam34/sam4cm_freerun.c
index 386417109..1deb4c371 100644
--- a/nuttx/arch/arm/src/sam34/sam4cm_freerun.c
+++ b/nuttx/arch/arm/src/sam34/sam4cm_freerun.c
@@ -85,7 +85,7 @@
static void sam_freerun_handler(TC_HANDLE tch, void *arg, uint32_t sr)
{
struct sam_freerun_s *freerun = (struct sam_freerun_s *)arg;
- DEBUGASSERT(freerun && freerun->overflow < UINT16_MAX);
+ DEBUGASSERT(freerun && freerun->overflow < UINT32_MAX);
freerun->overflow++;
}
diff --git a/nuttx/arch/arm/src/sam34/sam4cm_freerun.h b/nuttx/arch/arm/src/sam34/sam4cm_freerun.h
index 052f9ef6f..da4d56a84 100644
--- a/nuttx/arch/arm/src/sam34/sam4cm_freerun.h
+++ b/nuttx/arch/arm/src/sam34/sam4cm_freerun.h
@@ -63,7 +63,7 @@ struct sam_freerun_s
{
uint8_t chan; /* The timer/counter in use */
bool running; /* True: the timer is running */
- uint16_t overflow; /* Timer counter overflow */
+ uint32_t overflow; /* Timer counter overflow */
TC_HANDLE tch; /* Handle returned by sam_tc_initialize() */
};