diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2015-03-21 13:41:49 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2015-03-21 13:41:49 -0600 |
commit | 81490cd87ecfc9fa58dea14729578813f2640e25 (patch) | |
tree | 2361eecd3b405636763614b76b5b5fb1a2abdf36 /nuttx/configs | |
parent | 4ded1c956370d30eb04d161fda08ead212e673ca (diff) | |
download | px4-nuttx-81490cd87ecfc9fa58dea14729578813f2640e25.tar.gz px4-nuttx-81490cd87ecfc9fa58dea14729578813f2640e25.tar.bz2 px4-nuttx-81490cd87ecfc9fa58dea14729578813f2640e25.zip |
Teensy: Rename files for better conformance to naming conventions
Diffstat (limited to 'nuttx/configs')
-rw-r--r-- | nuttx/configs/teensy/src/Makefile | 40 | ||||
-rw-r--r-- | nuttx/configs/teensy/src/at90usb_boot.c (renamed from nuttx/configs/teensy/src/up_boot.c) | 4 | ||||
-rw-r--r-- | nuttx/configs/teensy/src/at90usb_leds.c (renamed from nuttx/configs/teensy/src/up_leds.c) | 2 | ||||
-rw-r--r-- | nuttx/configs/teensy/src/at90usb_spi.c (renamed from nuttx/configs/teensy/src/up_spi.c) | 5 | ||||
-rw-r--r-- | nuttx/configs/teensy/src/at90usb_usbmsc.c (renamed from nuttx/configs/teensy/src/up_usbmsc.c) | 5 | ||||
-rw-r--r-- | nuttx/configs/teensy/src/teensy_internal.h | 9 |
6 files changed, 32 insertions, 33 deletions
diff --git a/nuttx/configs/teensy/src/Makefile b/nuttx/configs/teensy/src/Makefile index 329ab0120..df52808ec 100644 --- a/nuttx/configs/teensy/src/Makefile +++ b/nuttx/configs/teensy/src/Makefile @@ -35,43 +35,43 @@ -include $(TOPDIR)/Make.defs -ASRCS = -CSRCS = up_boot.c +ASRCS = +CSRCS = at90usb_boot.c ifeq ($(CONFIG_ARCH_LEDS),y) -CSRCS += up_leds.c +CSRCS += at90usb_leds.c endif ifeq ($(CONFIG_USBMSC),y) -CSRCS += up_usbmsc.c +CSRCS += at90usb_usbmsc.c endif ifeq ($(CONFIG_AVR_SPI),y) -CSRCS += up_spi.c +CSRCS += at90usb_spi.c endif -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) -ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src +ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y) -ARCH_SUBDIR = avr32 +ARCH_SUBDIR = avr32 endif ifeq ($(CONFIG_ARCH_FAMILY_AVR),y) -ARCH_SUBDIR = avr +ARCH_SUBDIR = avr endif ifeq ($(WINTOOL),y) - CFLAGS += -I "${shell cygpath -w $(TOPDIR)/sched}" - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}" + CFLAGS += -I "${shell cygpath -w $(TOPDIR)/sched}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}" else - CFLAGS += -I "$(TOPDIR)/sched" - CFLAGS += -I "$(ARCH_SRCDIR)/chip" - CFLAGS += -I "$(ARCH_SRCDIR)/common" - CFLAGS += -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)" + CFLAGS += -I "$(TOPDIR)/sched" + CFLAGS += -I "$(ARCH_SRCDIR)/chip" + CFLAGS += -I "$(ARCH_SRCDIR)/common" + CFLAGS += -I "$(ARCH_SRCDIR)/$(ARCH_SUBDIR)" endif all: libboard$(LIBEXT) diff --git a/nuttx/configs/teensy/src/up_boot.c b/nuttx/configs/teensy/src/at90usb_boot.c index 8764949c9..0495ddea6 100644 --- a/nuttx/configs/teensy/src/up_boot.c +++ b/nuttx/configs/teensy/src/at90usb_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/teensy/src/up_boot.c + * configs/teensy/src/at90usb_boot.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -50,7 +50,7 @@ #include "teensy_internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/nuttx/configs/teensy/src/up_leds.c b/nuttx/configs/teensy/src/at90usb_leds.c index c81389395..5d3762e35 100644 --- a/nuttx/configs/teensy/src/up_leds.c +++ b/nuttx/configs/teensy/src/at90usb_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/teensy/src/up_leds.c + * configs/teensy/src/at90usb_leds.c * * Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/configs/teensy/src/up_spi.c b/nuttx/configs/teensy/src/at90usb_spi.c index 57a94c1ab..f3cc85ed8 100644 --- a/nuttx/configs/teensy/src/up_spi.c +++ b/nuttx/configs/teensy/src/at90usb_spi.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/teensy/src/up_spi.c - * arch/arm/src/board/up_spi.c + * configs/teensy/src/at90usb_spi.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -56,7 +55,7 @@ #ifdef CONFIG_AVR_SPI /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Teensy SPI Connection * diff --git a/nuttx/configs/teensy/src/up_usbmsc.c b/nuttx/configs/teensy/src/at90usb_usbmsc.c index c467d4324..47acbfd2e 100644 --- a/nuttx/configs/teensy/src/up_usbmsc.c +++ b/nuttx/configs/teensy/src/at90usb_usbmsc.c @@ -1,6 +1,5 @@ /**************************************************************************** - * configs/teensy/src/up_usbmsc.c - * arch/arm/src/board/up_usbmsc.c + * configs/teensy/src/at90usb_usbmsc.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -53,7 +52,7 @@ #include "teensy_internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/nuttx/configs/teensy/src/teensy_internal.h b/nuttx/configs/teensy/src/teensy_internal.h index f253b590f..bbe6a3aad 100644 --- a/nuttx/configs/teensy/src/teensy_internal.h +++ b/nuttx/configs/teensy/src/teensy_internal.h @@ -43,7 +43,7 @@ #include <nuttx/config.h> /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ @@ -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" { ************************************************************************************/ #ifdef CONFIG_AVR_SPI -EXTERN void weak_function at90usb_spiinitialize(void); +void weak_function at90usb_spiinitialize(void); #endif /************************************************************************************ @@ -89,7 +90,7 @@ EXTERN void weak_function at90usb_spiinitialize(void); ************************************************************************************/ #ifdef CONFIG_ARCH_LEDS -EXTERN void at90usb_ledinit(void); +void at90usb_ledinit(void); #endif #undef EXTERN |