diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-10-07 19:02:20 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-10-07 19:02:20 +0000 |
| commit | cc9d973911808c60d335cb941577fd29189e124d (patch) | |
| tree | f5435edcd511c16bd53c7988d5eb4ba59f14f2ec | |
| parent | 763535ae803cf1e4d625aea9736ad8bd650a7356 (diff) | |
| download | px4-nuttx-cc9d973911808c60d335cb941577fd29189e124d.tar.gz px4-nuttx-cc9d973911808c60d335cb941577fd29189e124d.tar.bz2 px4-nuttx-cc9d973911808c60d335cb941577fd29189e124d.zip | |
Fix timer error introduced recently
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@987 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/ChangeLog | 1 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 1 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index db031c374..d7fb24045 100644 --- a/nuttx/ChangeLog +++ b/nuttx/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/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 57e9e3dfb..ac64d7204 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/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/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c b/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c index 4a7bbb6c4..1c6b9c69a 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c +++ b/nuttx/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)) |