diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-31 14:10:53 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-31 14:10:53 -0600 |
| commit | b4d44f121eb9231557b765100399a915557b93db (patch) | |
| tree | 6f0a7aa3f0907b1759a008d69ed96737aab373b4 /nuttx/configs/moteino-mega | |
| parent | 600af3670d87ea96153b924f48bcfa77d596d407 (diff) | |
| download | px4-nuttx-b4d44f121eb9231557b765100399a915557b93db.tar.gz px4-nuttx-b4d44f121eb9231557b765100399a915557b93db.tar.bz2 px4-nuttx-b4d44f121eb9231557b765100399a915557b93db.zip | |
Review/modifications for change of last merge
Diffstat (limited to 'nuttx/configs/moteino-mega')
| -rw-r--r-- | nuttx/configs/moteino-mega/include/board.h | 3 | ||||
| -rw-r--r-- | nuttx/configs/moteino-mega/src/moteino_mega_internal.h | 7 | ||||
| -rw-r--r-- | nuttx/configs/moteino-mega/src/up_boot.c | 4 | ||||
| -rw-r--r-- | nuttx/configs/moteino-mega/src/up_leds.c | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/nuttx/configs/moteino-mega/include/board.h b/nuttx/configs/moteino-mega/include/board.h index 2d73363b5..2fc1b3894 100644 --- a/nuttx/configs/moteino-mega/include/board.h +++ b/nuttx/configs/moteino-mega/include/board.h @@ -83,7 +83,8 @@ #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif diff --git a/nuttx/configs/moteino-mega/src/moteino_mega_internal.h b/nuttx/configs/moteino-mega/src/moteino_mega_internal.h index 078242e33..d69722838 100644 --- a/nuttx/configs/moteino-mega/src/moteino_mega_internal.h +++ b/nuttx/configs/moteino-mega/src/moteino_mega_internal.h @@ -63,7 +63,8 @@ #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -77,7 +78,7 @@ extern "C" { ************************************************************************************/ #if defined(CONFIG_AVR_SPI1) || defined(CONFIG_AVR_SPI2) -EXTERN void weak_function atmega_spiinitialize(void); +void weak_function atmega_spiinitialize(void); #endif /************************************************************************************ @@ -89,7 +90,7 @@ EXTERN void weak_function atmega_spiinitialize(void); ************************************************************************************/ #ifdef CONFIG_ARCH_LEDS -EXTERN void atmega_ledinit(void); +void atmega_ledinit(void); #endif #undef EXTERN diff --git a/nuttx/configs/moteino-mega/src/up_boot.c b/nuttx/configs/moteino-mega/src/up_boot.c index 80233bb89..f845939f5 100644 --- a/nuttx/configs/moteino-mega/src/up_boot.c +++ b/nuttx/configs/moteino-mega/src/up_boot.c @@ -50,7 +50,7 @@ #include "moteino_mega_internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ @@ -66,7 +66,7 @@ * * Description: * All ATMega architectures must provide the following entry point. This entry - * point is called early in the intitialization -- after all memory has been + * point is called early in the initialization -- after all memory has been * configured and mapped but before any devices have been initialized. * ************************************************************************************/ diff --git a/nuttx/configs/moteino-mega/src/up_leds.c b/nuttx/configs/moteino-mega/src/up_leds.c index bc436aa5b..68ffaa48a 100644 --- a/nuttx/configs/moteino-mega/src/up_leds.c +++ b/nuttx/configs/moteino-mega/src/up_leds.c @@ -52,7 +52,7 @@ #ifdef CONFIG_ARCH_LEDS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG |