diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-19 22:14:36 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-19 22:14:36 +0000 |
| commit | ccc7221d0cd7b18c5e2bcab40aa648135ff970d1 (patch) | |
| tree | 835ce65cca6afdab9948fcf6033b2d45201ebd62 | |
| parent | 220991ac89d601ad6d0d459b9052421a53ff7536 (diff) | |
| download | px4-nuttx-ccc7221d0cd7b18c5e2bcab40aa648135ff970d1.tar.gz px4-nuttx-ccc7221d0cd7b18c5e2bcab40aa648135ff970d1.tar.bz2 px4-nuttx-ccc7221d0cd7b18c5e2bcab40aa648135ff970d1.zip | |
NSH integration, fix serial interrupt handling
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1803 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/ChangeLog | 16 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 16 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lm3s/lm3s_serial.c | 3 | ||||
| -rw-r--r-- | nuttx/drivers/serial.c | 2 |
4 files changed, 21 insertions, 16 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index ef2584a48..5cf0ebc63 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -712,11 +712,13 @@ -R .note.gnu.build-id -R .comment" This has bin fixed in arch/arm/src/Makefile, but other architectures may have the same problem. Thanks to Dave Marples for verifying this. - * Added support for the MicroMint Eagle100 board. This board has a - Luminary LM3S6918 Cortex-M3. Added a configuration to build examples/ostest. - * Add configuration option to enable fast GPIO (vs. legacy, "slow" GPIO) for - LPC214x. - * Restructured the arch/arm directory structure to better suppor ARM and - Cortex-M3. - * pthread_create() must return a (non-negated) errno value on failure. + * configs/eagle100/ostest: Added support for the MicroMint Eagle100 board. + This board has a Luminary LM3S6918 Cortex-M3. Added a configuration to build + examples/ostest. + * arch/arm/src/lpc214x: Add configuration option to enable fast GPIO (vs. + legacy, "slow" GPIO) for LPC214x. + * arch/arm: Restructured the arch/arm directory structure to better suppor ARM + and Cortex-M3. + * sched/: pthread_create() must return a (non-negated) errno value on failure. + * configs/eagle100/nsh: Add a NuttShell (NSH) configuration for the Eagle-100 diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index f936a8df0..2e2bf262e 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -1421,13 +1421,15 @@ nuttx-0.4.6 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> -R .note.gnu.build-id -R .comment" This has bin fixed in arch/arm/src/Makefile, but other architectures may have the same problem. Thanks to Dave Marples for verifying this. - * Added support for the MicroMint Eagle100 board. This board has a - Luminary LM3S6918 Cortex-M3. Added a configuration to build examples/ostest. - * Add configuration option to enable fast GPIO (vs. legacy, "slow" GPIO) for - LPC214x. - * Restructured the arch/arm directory structure to better suppor ARM and - Cortex-M3. - * pthread_create() must return a (non-negated) errno value on failure. + * configs/eagle100/ostest: Added support for the MicroMint Eagle100 board. + This board has a Luminary LM3S6918 Cortex-M3. Added a configuration to build + examples/ostest. + * arch/arm/src/lpc214x: Add configuration option to enable fast GPIO (vs. + legacy, "slow" GPIO) for LPC214x. + * arch/arm: Restructured the arch/arm directory structure to better suppor ARM + and Cortex-M3. + * sched/: pthread_create() must return a (non-negated) errno value on failure. + * configs/eagle100/nsh: Add a NuttShell (NSH) configuration for the Eagle-100 pascal-0.1.3 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/arch/arm/src/lm3s/lm3s_serial.c b/nuttx/arch/arm/src/lm3s/lm3s_serial.c index b490e4ad4..7c4275d26 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_serial.c +++ b/nuttx/arch/arm/src/lm3s/lm3s_serial.c @@ -595,6 +595,7 @@ static int up_interrupt(int irq, void *context) * until we have been looping for a long time. */ + handled = TRUE; for (passes = 0; passes < 256 && handled; passes++) { handled = FALSE; @@ -616,7 +617,7 @@ static int up_interrupt(int irq, void *context) /* Handle outgoing, transmit bytes */ - if ((mis & UART_MIS_TXMIS) == 0) + if ((mis & UART_MIS_TXMIS) != 0) { /* Tx FIFO not full ... process outgoing bytes */ diff --git a/nuttx/drivers/serial.c b/nuttx/drivers/serial.c index ddc7338bc..2dc7d8151 100644 --- a/nuttx/drivers/serial.c +++ b/nuttx/drivers/serial.c @@ -1,7 +1,7 @@ /************************************************************************************ * drivers/serial.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without |