From f65a4a4832b8468143612843f5d2f60596550c2d Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 7 Oct 2008 19:02:20 +0000 Subject: [PATCH] Fix timer error introduced recently git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@987 42af7a65-404d-4744-a932-0658087f49c3 --- ChangeLog | 1 + Documentation/NuttX.html | 1 + arch/arm/src/lpc214x/lpc214x_timerisr.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index db031c3744..d7fb240454 100644 --- a/ChangeLog +++ b/ChangeLog @@ -489,6 +489,7 @@ * Initial USB serial class device side driver check in (not well tested at initial checkin) * Add LPC214x USB serial configuration; Add examples/usbserial test (still a work in progress) * Added USB device side driver for the DM320 (untested at initial checkin) + * Fixed an error in a previous (post 0.3.15) check-in that broke the LPC214x system timer. diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 57e9e3dfbd..ac64d72044 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -1079,6 +1079,7 @@ nuttx-0.3.16 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * Initial USB serial class device side driver check in (not well tested at initial checkin) * Add LPC214x USB serial configuration; Add examples/usbserial test (still a work in progress) * Added USB device side driver for the DM320 (untested at initial checkin) + * Fixed an error in a previous (post 0.3.15) check-in that broke the LPC214x system timer. pascal-0.1.3 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/arch/arm/src/lpc214x/lpc214x_timerisr.c b/arch/arm/src/lpc214x/lpc214x_timerisr.c index 4a7bbb6c4f..1c6b9c69af 100644 --- a/arch/arm/src/lpc214x/lpc214x_timerisr.c +++ b/arch/arm/src/lpc214x/lpc214x_timerisr.c @@ -59,7 +59,7 @@ */ #define LPC214X_CCLKFREQ (LPC214X_FOSC*LPC214X_PLL_M) -#define LPC214X_PCLKFREQ (LPC214X_CCLKFREQ/LPC214X_APBDIV) +#define LPC214X_PCLKFREQ (LPC214X_CCLKFREQ/LPC214X_APB_DIV) #define tmr_getreg8(o) getreg8(LPC214X_TMR0_BASE+(o)) #define tmr_getreg16(o) getreg16(LPC214X_TMR0_BASE+(o))