diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-11 03:50:52 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-11 03:50:52 +0000 |
| commit | 4a62de545bf87610c2415218e144ddef4dd0e75c (patch) | |
| tree | 6c5b47ab79d40800d497f8a470aad5aa569ff9d6 /nuttx/arch/arm/src/lpc214x | |
| parent | 24af177eb1a3e7036f8a3ee5342970ddeb151124 (diff) | |
| download | px4-nuttx-4a62de545bf87610c2415218e144ddef4dd0e75c.tar.gz px4-nuttx-4a62de545bf87610c2415218e144ddef4dd0e75c.tar.bz2 px4-nuttx-4a62de545bf87610c2415218e144ddef4dd0e75c.zip | |
Add logic so that a RAM log can be used in place of a console device
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4380 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/lpc214x')
| -rw-r--r-- | nuttx/arch/arm/src/lpc214x/lpc214x_head.S | 6 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc214x/lpc214x_serial.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_head.S b/nuttx/arch/arm/src/lpc214x/lpc214x_head.S index 72d026aaa..678481154 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_head.S +++ b/nuttx/arch/arm/src/lpc214x/lpc214x_head.S @@ -1,8 +1,8 @@ /***************************************************************************** * arch/arm/src/lpc214x/lpc214x_head.S * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -582,7 +582,7 @@ __start: /* Perform early serial initialization */ mov fp, #0 -#ifdef CONFIG_USE_EARLYSERIALINIT +#ifdef USE_EARLYSERIALINIT bl up_earlyserialinit #endif diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c b/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c index 13a69716b..a838e3143 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c +++ b/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c @@ -1,8 +1,8 @@ /**************************************************************************** * arch/arm/src/lpc214x/lpc214x_serial.c * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -60,7 +60,7 @@ #include "lpc214x_pinsel.h" #include "lpc214x_uart.h" -#ifdef CONFIG_USE_SERIALDRIVER +#ifdef USE_SERIALDRIVER /**************************************************************************** * Definitions @@ -816,7 +816,7 @@ int up_putc(int ch) return ch; } -#else /* CONFIG_USE_SERIALDRIVER */ +#else /* USE_SERIALDRIVER */ /**************************************************************************** * Name: up_putc @@ -841,4 +841,4 @@ int up_putc(int ch) return ch; } -#endif /* CONFIG_USE_SERIALDRIVER */ +#endif /* USE_SERIALDRIVER */ |