summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-03-21 09:35:04 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-03-21 09:35:04 -0600
commit4b84894bbcebf70b871a6d77465c179bd0bb6fd4 (patch)
treee9ded11b59d609a17bdb4aa7bdca9d52f5ea9397
parent1c1786422b96d2c924143f6053492cf765817bc5 (diff)
downloadpx4-nuttx-4b84894bbcebf70b871a6d77465c179bd0bb6fd4.tar.gz
px4-nuttx-4b84894bbcebf70b871a6d77465c179bd0bb6fd4.tar.bz2
px4-nuttx-4b84894bbcebf70b871a6d77465c179bd0bb6fd4.zip
Mikroe STM32F4: Rename files for better conformance to naming conventions
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/Makefile34
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/mikroe-stm32f4-internal.h3
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_boot.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_boot.c)5
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_clockconfig.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_clockconfig.c)4
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_cxxinitialize.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_cxxinitialize.c)5
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_extmem.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_extmem.c)3
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_idle.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_idle.c)2
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_mio283qt2.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_mio283qt2.c)3
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_mio283qt9a.c)2
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_nsh.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_nsh.c)5
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_pm.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_pm.c)3
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_pwm.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_pwm.c)5
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_qencoder.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_qencoder.c)5
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_spi.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_spi.c)5
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_touchscreen.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c)4
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_usb.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_usb.c)3
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_vs1053.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_vs1053.c)4
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/stm32_watchdog.c (renamed from nuttx/configs/mikroe-stm32f4/src/up_watchdog.c)5
18 files changed, 44 insertions, 56 deletions
diff --git a/nuttx/configs/mikroe-stm32f4/src/Makefile b/nuttx/configs/mikroe-stm32f4/src/Makefile
index 492f46c97..e8addfd49 100644
--- a/nuttx/configs/mikroe-stm32f4/src/Makefile
+++ b/nuttx/configs/mikroe-stm32f4/src/Makefile
@@ -44,62 +44,62 @@ CFLAGS += -I$(TOPDIR)/sched
ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
-CSRCS = up_boot.c up_spi.c
+CSRCS = stm32_boot.c stm32_spi.c
ifeq ($(CONFIG_HAVE_CXX),y)
-CSRCS += up_cxxinitialize.c
+CSRCS += stm32_cxxinitialize.c
endif
ifeq ($(CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG),y)
-CSRCS += up_clockconfig.c
+CSRCS += stm32_clockconfig.c
endif
ifeq ($(CONFIG_STM32_OTGFS),y)
-CSRCS += up_usb.c
+CSRCS += stm32_usb.c
endif
ifeq ($(CONFIG_PWM),y)
-CSRCS += up_pwm.c
+CSRCS += stm32_pwm.c
endif
ifeq ($(CONFIG_QENCODER),y)
-CSRCS += up_qencoder.c
+CSRCS += stm32_qencoder.c
endif
ifeq ($(CONFIG_WATCHDOG),y)
-CSRCS += up_watchdog.c
+CSRCS += stm32_watchdog.c
endif
ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += up_nsh.c
+CSRCS += stm32_nsh.c
endif
ifeq ($(CONFIG_ARCH_CUSTOM_PMINIT),y)
-CSRCS += up_pm.c
+CSRCS += stm32_pm.c
endif
ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
-CSRCS += up_idle.c
+CSRCS += stm32_idle.c
endif
ifeq ($(CONFIG_STM32_FSMC),y)
-CSRCS += up_extmem.c
+CSRCS += stm32_extmem.c
endif
ifeq ($(CONFIG_INPUT),y)
-CSRCS += up_touchscreen.c
+CSRCS += stm32_touchscreen.c
endif
ifeq ($(CONFIG_LCD_MIO283QT2),y)
-CSRCS += up_mio283qt2.c
+CSRCS += stm32_mio283qt2.c
endif
ifeq ($(CONFIG_LCD_MIO283QT9A),y)
-CSRCS += up_mio283qt9a.c
+CSRCS += stm32_mio283qt9a.c
endif
ifeq ($(CONFIG_VS1053),y)
-CSRCS += up_vs1053.c
+CSRCS += stm32_vs1053.c
endif
COBJS = $(CSRCS:.c=$(OBJEXT))
@@ -113,8 +113,8 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
else
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}"
+ -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
endif
diff --git a/nuttx/configs/mikroe-stm32f4/src/mikroe-stm32f4-internal.h b/nuttx/configs/mikroe-stm32f4/src/mikroe-stm32f4-internal.h
index 61bef1c4b..9bf2aa6e0 100644
--- a/nuttx/configs/mikroe-stm32f4/src/mikroe-stm32f4-internal.h
+++ b/nuttx/configs/mikroe-stm32f4/src/mikroe-stm32f4-internal.h
@@ -1,6 +1,5 @@
/****************************************************************************************************
* configs/mikroe-stm32f4/src/mikroe-stm32f4-internal.h
- * arch/arm/src/board/mikroe-stm32f4-internal.n
*
* Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -46,7 +45,7 @@
#include <stdint.h>
/****************************************************************************************************
- * Definitions
+ * Pre-processor Definitions
****************************************************************************************************/
/* Configuration ************************************************************************************/
/* How many SPI modules does this chip support? */
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_boot.c b/nuttx/configs/mikroe-stm32f4/src/stm32_boot.c
index 4d6138e24..6db4c79b3 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_boot.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_boot.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/mikroe_stm32f4/src/up_boot.c
- * arch/arm/src/board/up_boot.c
+ * configs/mikroe_stm32f4/src/stm32_boot.c
*
* Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +47,7 @@
#include "mikroe-stm32f4-internal.h"
/************************************************************************************
- * Definitions
+ * Pre-processor Definitions
************************************************************************************/
/************************************************************************************
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_clockconfig.c b/nuttx/configs/mikroe-stm32f4/src/stm32_clockconfig.c
index eb3f81999..25777a71d 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_clockconfig.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_clockconfig.c
@@ -1,5 +1,5 @@
/************************************************************************************
- * configs/mikroe_stm32f4/src/up_clockconfig.c
+ * configs/mikroe_stm32f4/src/stm32_clockconfig.c
*
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Ken Pettit <pettitkd@gmail.com>
@@ -47,7 +47,7 @@
#include "mikroe-stm32f4-internal.h"
/************************************************************************************
- * Definitions
+ * Pre-processor Definitions
************************************************************************************/
/************************************************************************************
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_cxxinitialize.c b/nuttx/configs/mikroe-stm32f4/src/stm32_cxxinitialize.c
index 45457fc38..4a1bd1356 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_cxxinitialize.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_cxxinitialize.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/mikroe_stm32f4/src/up_cxxinitialize.c
- * arch/arm/src/board/up_cxxinitialize.c
+ * configs/mikroe_stm32f4/src/stm32_cxxinitialize.c
*
* Copyright (C) 2012-2013 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/mikroe-stm32f4/src/up_extmem.c b/nuttx/configs/mikroe-stm32f4/src/stm32_extmem.c
index cdfa74fa3..285ad58f1 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_extmem.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_extmem.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/mikroe_stm32f4/src/up_extmem.c
- * arch/arm/src/board/up_extmem.c
+ * configs/mikroe_stm32f4/src/stm32_extmem.c
*
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_idle.c b/nuttx/configs/mikroe-stm32f4/src/stm32_idle.c
index 4adeff52f..8c8f6f34f 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_idle.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_idle.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * configs/mikroe_stm32f4/src/up_idle.c
+ * configs/mikroe_stm32f4/src/stm32_idle.c
*
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_mio283qt2.c b/nuttx/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
index c37c16b91..708a3d20e 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_mio283qt2.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
@@ -1,6 +1,5 @@
/**************************************************************************************
- * configs/mikroe-stm32f4/src/up_mio283qt2.c
- * arch/arm/src/board/up_mio283qt2.c
+ * configs/mikroe-stm32f4/src/stm32_mio283qt2.c
*
* Interface definition for the MI0283QT-2 LCD from Multi-Inno Technology Co., Ltd.
* This LCD is based on the Himax HX8347-D LCD controller.
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_mio283qt9a.c b/nuttx/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
index d7ec455d2..375d8aea3 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_mio283qt9a.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
@@ -1,5 +1,5 @@
/**************************************************************************************
- * configs/mikroe-stm32f4/src/up_mio283qt9a.c
+ * configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
*
* Interface definition for the MI0283QT-9A LCD from Multi-Inno Technology Co., Ltd.
* LCD is based on the Ilitek ILI9341 LCD controller.
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_nsh.c b/nuttx/configs/mikroe-stm32f4/src/stm32_nsh.c
index 0963ccf69..086ed7b0e 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_nsh.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_nsh.c
@@ -1,6 +1,5 @@
/****************************************************************************
- * config/mikroe_stm32f4/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/mikroe_stm32f4/src/stm32_nsh.c
*
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -77,7 +76,7 @@
#include "mikroe-stm32f4-internal.h"
/****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_pm.c b/nuttx/configs/mikroe-stm32f4/src/stm32_pm.c
index 17a040304..ecbfad02d 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_pm.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_pm.c
@@ -1,6 +1,5 @@
/****************************************************************************
- * configs/mikroe_stm32f4/src/up_pm.c
- * arch/arm/src/board/up_pm.c
+ * configs/mikroe_stm32f4/src/stm32_pm.c
*
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_pwm.c b/nuttx/configs/mikroe-stm32f4/src/stm32_pwm.c
index 27d493a41..0a6c5b4ec 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_pwm.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_pwm.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/mikroe_stm32f4/src/up_pwm.c
- * arch/arm/src/board/up_pwm.c
+ * configs/mikroe_stm32f4/src/stm32_pwm.c
*
* Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +51,7 @@
#include "mikroe-stm32f4-internal.h"
/************************************************************************************
- * Definitions
+ * Pre-processor Definitions
************************************************************************************/
/* Configuration *******************************************************************/
/* PWM
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_qencoder.c b/nuttx/configs/mikroe-stm32f4/src/stm32_qencoder.c
index 69b9f2af5..d14f0b363 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_qencoder.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_qencoder.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/mikroe_stm32f4/src/up_qencoder.c
- * arch/arm/src/board/up_qencoder.c
+ * configs/mikroe_stm32f4/src/stm32_qencoder.c
*
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +51,7 @@
#include "mikroe-stm32f4-internal.h"
/************************************************************************************
- * Definitions
+ * Pre-processor Definitions
************************************************************************************/
/* Configuration *******************************************************************/
/* Check if we have a timer configured for quadrature encoder -- assume YES. */
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_spi.c b/nuttx/configs/mikroe-stm32f4/src/stm32_spi.c
index bf20c001d..b6d8297e9 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_spi.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_spi.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/mikroe_stm32f4/src/up_spi.c
- * arch/arm/src/board/up_spi.c
+ * configs/mikroe_stm32f4/src/stm32_spi.c
*
* Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -61,7 +60,7 @@
#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
/************************************************************************************
- * Definitions
+ * Pre-processor Definitions
************************************************************************************/
/* Enables debug output from this file (needs CONFIG_DEBUG too) */
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c b/nuttx/configs/mikroe-stm32f4/src/stm32_touchscreen.c
index 30b65e6bb..210c11d19 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_touchscreen.c
@@ -1,5 +1,5 @@
/************************************************************************************
- * configs/mikroe-stm32f4/src/up_touchscreen.c
+ * configs/mikroe-stm32f4/src/stm32_touchscreen.c
*
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -66,7 +66,7 @@
#ifdef CONFIG_INPUT
/************************************************************************************
- * Definitions
+ * Pre-processor Definitions
************************************************************************************/
/* Configuration ********************************************************************/
/* Reference counting is partially implemented, but not needed in the current design.
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_usb.c b/nuttx/configs/mikroe-stm32f4/src/stm32_usb.c
index 31d0c6ec3..9cda4f0ec 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_usb.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_usb.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/mikroe_stm32f4/src/up_usbdev.c
- * arch/arm/src/board/up_boot.c
+ * configs/mikroe_stm32f4/src/stm32_usb.c
*
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_vs1053.c b/nuttx/configs/mikroe-stm32f4/src/stm32_vs1053.c
index 8fc43482b..c54bcfa49 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_vs1053.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_vs1053.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * configs/mikroe-stm32f4/src/up_vs1053.c
+ * configs/mikroe-stm32f4/src/stm32_vs1053.c
*
* Copyright (C) 2013 Ken Pettit. All rights reserved.
* Author: Ken Pettit <pettitkd@gmail.com>
@@ -56,7 +56,7 @@
#ifdef CONFIG_VS1053
/****************************************************************************
- * Definitions
+ * Pre-processor Definitions
****************************************************************************/
/* VS1053 is on SPI3 */
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_watchdog.c b/nuttx/configs/mikroe-stm32f4/src/stm32_watchdog.c
index 58037c53a..3d59646e2 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_watchdog.c
+++ b/nuttx/configs/mikroe-stm32f4/src/stm32_watchdog.c
@@ -1,6 +1,5 @@
/************************************************************************************
- * configs/mikroe_stm32f4/src/up_watchdog.c
- * arch/arm/src/board/up_watchdog.c
+ * configs/mikroe_stm32f4/src/stm32_watchdog.c
*
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +50,7 @@
#ifdef CONFIG_WATCHDOG
/************************************************************************************
- * Definitions
+ * Pre-processor Definitions
************************************************************************************/
/* Configuration *******************************************************************/
/* Wathdog hardware should be enabled */