summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-03-21 09:17:03 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-03-21 09:17:03 -0600
commitbdddd8c0bd7a21828e2cef0fa4910bcf2146a3a5 (patch)
tree52e69475ae521c8f75be926349183f8199aeaa59
parent0066f06f3535b9376851143dfc5a39368a8d294e (diff)
Olimex STM32 P207: Rename files for better conformance to naming conventions
-rw-r--r--nuttx/configs/olimex-stm32-p207/src/Makefile38
-rw-r--r--nuttx/configs/olimex-stm32-p207/src/olimex-stm32-p207.h2
-rw-r--r--nuttx/configs/olimex-stm32-p207/src/stm32_adc.c (renamed from nuttx/configs/olimex-stm32-p207/src/up_adc.c)7
-rw-r--r--nuttx/configs/olimex-stm32-p207/src/stm32_autoleds.c (renamed from nuttx/configs/olimex-stm32-p207/src/up_autoleds.c)2
-rw-r--r--nuttx/configs/olimex-stm32-p207/src/stm32_boot.c (renamed from nuttx/configs/olimex-stm32-p207/src/up_boot.c)4
-rw-r--r--nuttx/configs/olimex-stm32-p207/src/stm32_buttons.c (renamed from nuttx/configs/olimex-stm32-p207/src/up_buttons.c)2
-rw-r--r--nuttx/configs/olimex-stm32-p207/src/stm32_can.c (renamed from nuttx/configs/olimex-stm32-p207/src/up_can.c)3
-rw-r--r--nuttx/configs/olimex-stm32-p207/src/stm32_cxxinitialize.c (renamed from nuttx/configs/olimex-stm32-p207/src/up_cxxinitialize.c)5
-rw-r--r--nuttx/configs/olimex-stm32-p207/src/stm32_nsh.c (renamed from nuttx/configs/olimex-stm32-p207/src/up_nsh.c)5
-rw-r--r--nuttx/configs/olimex-stm32-p207/src/stm32_usb.c (renamed from nuttx/configs/olimex-stm32-p207/src/up_usb.c)3
-rw-r--r--nuttx/configs/olimex-stm32-p207/src/stm32_userleds.c (renamed from nuttx/configs/olimex-stm32-p207/src/up_userleds.c)5
11 files changed, 35 insertions, 41 deletions
diff --git a/nuttx/configs/olimex-stm32-p207/src/Makefile b/nuttx/configs/olimex-stm32-p207/src/Makefile
index cf77da185c..fb40a97df7 100644
--- a/nuttx/configs/olimex-stm32-p207/src/Makefile
+++ b/nuttx/configs/olimex-stm32-p207/src/Makefile
@@ -35,51 +35,51 @@
-include $(TOPDIR)/Make.defs
-CFLAGS += -I$(TOPDIR)/sched
+CFLAGS += -I$(TOPDIR)/sched
-ASRCS =
-AOBJS = $(ASRCS:.S=$(OBJEXT))
+ASRCS =
+AOBJS = $(ASRCS:.S=$(OBJEXT))
-CSRCS = up_boot.c up_cxxinitialize.c
+CSRCS = stm32_boot.c stm32_cxxinitialize.c
ifeq ($(CONFIG_ARCH_LEDS),y)
-CSRCS += up_autoleds.c
+CSRCS += stm32_autoleds.c
else
-CSRCS += up_userleds.c
+CSRCS += stm32_userleds.c
endif
ifeq ($(CONFIG_ARCH_BUTTONS),y)
-CSRCS += up_buttons.c
+CSRCS += stm32_buttons.c
endif
ifeq ($(CONFIG_STM32_OTGFS),y)
-CSRCS += up_usb.c
+CSRCS += stm32_usb.c
endif
ifeq ($(CONFIG_NSH_LIBRARY),y)
-CSRCS += up_nsh.c
+CSRCS += stm32_nsh.c
endif
ifeq ($(CONFIG_ADC),y)
-CSRCS += up_adc.c
+CSRCS += stm32_adc.c
endif
ifeq ($(CONFIG_CAN),y)
-CSRCS += up_can.c
+CSRCS += stm32_can.c
endif
-COBJS = $(CSRCS:.c=$(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 ($(WINTOOL),y)
- CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
- -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
- -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
+ CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
+ -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
+ -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
else
- CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
+ CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
endif
all: libboard$(LIBEXT)
diff --git a/nuttx/configs/olimex-stm32-p207/src/olimex-stm32-p207.h b/nuttx/configs/olimex-stm32-p207/src/olimex-stm32-p207.h
index 4769fed3f8..09aeacd1df 100644
--- a/nuttx/configs/olimex-stm32-p207/src/olimex-stm32-p207.h
+++ b/nuttx/configs/olimex-stm32-p207/src/olimex-stm32-p207.h
@@ -45,7 +45,7 @@
#include <stdint.h>
/******************************************************************************
- * Definitions
+ * Pre-processor Definitions
******************************************************************************/
/* Olimex-STM32-P207 GPIOs ****************************************************/
diff --git a/nuttx/configs/olimex-stm32-p207/src/up_adc.c b/nuttx/configs/olimex-stm32-p207/src/stm32_adc.c
index 3bde8bea6b..0665c44c65 100644
--- a/nuttx/configs/olimex-stm32-p207/src/up_adc.c
+++ b/nuttx/configs/olimex-stm32-p207/src/stm32_adc.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/olimex-stm32-p207/src/up_adc.c
- * arch/arm/src/board/up_adc.c
+ * configs/olimex-stm32-p207/src/stm32_adc.c
*
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +50,7 @@
#ifdef CONFIG_ADC
/************************************************************************************
- * Definitions
+ * Pre-processor Definitions
************************************************************************************/
/* Configuration ********************************************************************/
@@ -174,4 +173,4 @@ int stm32_adc_initialize(void)
}
#endif /* CONFIG_STM32_ADC1 || CONFIG_STM32_ADC2 || CONFIG_STM32_ADC3 */
-#endif /* CONFIG_ADC */ \ No newline at end of file
+#endif /* CONFIG_ADC */
diff --git a/nuttx/configs/olimex-stm32-p207/src/up_autoleds.c b/nuttx/configs/olimex-stm32-p207/src/stm32_autoleds.c
index 5c9faa67a4..8f4a5f7dc2 100644
--- a/nuttx/configs/olimex-stm32-p207/src/up_autoleds.c
+++ b/nuttx/configs/olimex-stm32-p207/src/stm32_autoleds.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * configs/olimex-stm32-p207/src/up_autoleds.c
+ * configs/olimex-stm32-p207/src/stm32_autoleds.c
*
* Copyright (C) 2011-2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/olimex-stm32-p207/src/up_boot.c b/nuttx/configs/olimex-stm32-p207/src/stm32_boot.c
index 13e98a48aa..447c85c310 100644
--- a/nuttx/configs/olimex-stm32-p207/src/up_boot.c
+++ b/nuttx/configs/olimex-stm32-p207/src/stm32_boot.c
@@ -1,5 +1,5 @@
/************************************************************************************
- * configs/olimex-stm32-p207/src/up_boot.c
+ * configs/olimex-stm32-p207/src/stm32_boot.c
*
* Copyright (C) 2009, 2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
#include "olimex-stm32-p207.h"
/************************************************************************************
- * Definitions
+ * Pre-processor Definitions
************************************************************************************/
/************************************************************************************
diff --git a/nuttx/configs/olimex-stm32-p207/src/up_buttons.c b/nuttx/configs/olimex-stm32-p207/src/stm32_buttons.c
index ce47a9a812..943765b5e1 100644
--- a/nuttx/configs/olimex-stm32-p207/src/up_buttons.c
+++ b/nuttx/configs/olimex-stm32-p207/src/stm32_buttons.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * configs/olimex-stm32-p207/src/board_buttons.c
+ * configs/olimex-stm32-p207/src/stm32_buttons.c
*
* Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/olimex-stm32-p207/src/up_can.c b/nuttx/configs/olimex-stm32-p207/src/stm32_can.c
index 8b2ca6d18d..57f4f110dd 100644
--- a/nuttx/configs/olimex-stm32-p207/src/up_can.c
+++ b/nuttx/configs/olimex-stm32-p207/src/stm32_can.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/olimex-stm32-p207/src/up_can.c
- * arch/arm/src/board/up_can.c
+ * configs/olimex-stm32-p207/src/stm32_can.c
*
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/olimex-stm32-p207/src/up_cxxinitialize.c b/nuttx/configs/olimex-stm32-p207/src/stm32_cxxinitialize.c
index 3291cdcdbc..6148ef15c9 100644
--- a/nuttx/configs/olimex-stm32-p207/src/up_cxxinitialize.c
+++ b/nuttx/configs/olimex-stm32-p207/src/stm32_cxxinitialize.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/olimex-stm32-p207/src/up_cxxinitialize.c
- * arch/arm/src/board/up_cxxinitialize.c
+ * configs/olimex-stm32-p207/src/stm32_cxxinitialize.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +49,7 @@
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
/************************************************************************************
- * Definitions
+ * Pre-processor Definitions
************************************************************************************/
/* Debug ****************************************************************************/
/* Non-standard debug that may be enabled just for testing the static constructors */
diff --git a/nuttx/configs/olimex-stm32-p207/src/up_nsh.c b/nuttx/configs/olimex-stm32-p207/src/stm32_nsh.c
index 824ece45be..83bf35d4d7 100644
--- a/nuttx/configs/olimex-stm32-p207/src/up_nsh.c
+++ b/nuttx/configs/olimex-stm32-p207/src/stm32_nsh.c
@@ -1,6 +1,5 @@
/****************************************************************************
- * config/olimex-stm32-p207/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/olimex-stm32-p207/src/stm32_nsh.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -57,7 +56,7 @@
#include "olimex-stm32-p207.h"
/****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
diff --git a/nuttx/configs/olimex-stm32-p207/src/up_usb.c b/nuttx/configs/olimex-stm32-p207/src/stm32_usb.c
index 025575d89c..990b009da2 100644
--- a/nuttx/configs/olimex-stm32-p207/src/up_usb.c
+++ b/nuttx/configs/olimex-stm32-p207/src/stm32_usb.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/olimex-stm32-p207/src/up_usbdev.c
- * arch/arm/src/board/up_usbdev.c
+ * configs/olimex-stm32-p207/src/stm32_usb.c
*
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/olimex-stm32-p207/src/up_userleds.c b/nuttx/configs/olimex-stm32-p207/src/stm32_userleds.c
index 518a1e1f73..54c0be9b70 100644
--- a/nuttx/configs/olimex-stm32-p207/src/up_userleds.c
+++ b/nuttx/configs/olimex-stm32-p207/src/stm32_userleds.c
@@ -1,6 +1,5 @@
/****************************************************************************
- * configs/olimex-stm32-p207/src/up_leds.c
- * arch/arm/src/board/up_leds.c
+ * configs/olimex-stm32-p207/src/stm32_userleds.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +49,7 @@
#ifndef CONFIG_ARCH_LEDS
/****************************************************************************
- * Definitions
+ * Pre-processor Definitions
****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG