diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-30 17:00:15 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-30 17:00:15 -0600 |
| commit | 38e156745d164c33298c128ea71a7adfef3ee469 (patch) | |
| tree | dad39f4e00d26aaee4b5156affdb43f18ff66cf4 | |
| parent | 34a6a7d56ad7c1c0cb09505c3b9c91d405900360 (diff) | |
| download | nuttx-38e156745d164c33298c128ea71a7adfef3ee469.tar.gz nuttx-38e156745d164c33298c128ea71a7adfef3ee469.tar.bz2 nuttx-38e156745d164c33298c128ea71a7adfef3ee469.zip | |
Mostly cosmetic
| -rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_ethernet.h | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/nuttx/arch/arm/src/tiva/tiva_ethernet.h b/nuttx/arch/arm/src/tiva/tiva_ethernet.h index b4a89932e..660f46300 100644 --- a/nuttx/arch/arm/src/tiva/tiva_ethernet.h +++ b/nuttx/arch/arm/src/tiva/tiva_ethernet.h @@ -1,4 +1,4 @@ -/************************************************************************************ +/**************************************************************************** * arch/arm/src/tiva/tiva_ethernet.h * * Copyright (C) 2009-2010, 2013-2014 Gregory Nutt. All rights reserved. @@ -31,42 +31,44 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************************************/ + ****************************************************************************/ #ifndef __ARCH_ARM_SRC_TIVA_TIVA_ETHERNET_H #define __ARCH_ARM_SRC_TIVA_TIVA_ETHERNET_H -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include <nuttx/config.h> #include "chip.h" -#if TIVA_NETHCONTROLLERS > 1 - -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Public Types - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Inline Functions - ************************************************************************************/ + ****************************************************************************/ #ifndef __ASSEMBLY__ -/************************************************************************************ +/**************************************************************************** * Public Data - ************************************************************************************/ + ****************************************************************************/ +#undef EXTERN #if defined(__cplusplus) +#define EXTERN extern "C" extern "C" { +#else +#define EXTERN extern #endif /**************************************************************************** @@ -77,10 +79,10 @@ extern "C" * Function: tiva_ethinitialize * * Description: - * Initialize the Ethernet driver for one interface. If the Stellaris chip - * supports multiple Ethernet controllers, then bould specific logic + * Initialize the Ethernet driver for one interface. If the Tiva/Stellaris + * chip supports multiple Ethernet controllers, then board specific logic * must implement up_netinitialize() and call this function to initialize - * the desiresed interfaces. + * the desired interfaces. * * Parameters: * None @@ -92,12 +94,14 @@ extern "C" * ****************************************************************************/ +#if TIVA_NETHCONTROLLERS > 1 int tiva_ethinitialize(int intf); +#endif +#undef EXTERN #if defined(__cplusplus) } #endif #endif /* __ASSEMBLY__ */ -#endif /* TIVA_NETHCONTROLLERS > 1 */ #endif /* __ARCH_ARM_SRC_TIVA_TIVA_ETHERNET_H */ |