From 16496bb47f55b982aa420ec1184f06577d5cc0a5 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 09:35:04 -0600 Subject: [PATCH] Mikroe STM32F4: Rename files for better conformance to naming conventions --- configs/mikroe-stm32f4/src/Makefile | 34 +++++++++---------- .../src/mikroe-stm32f4-internal.h | 3 +- .../src/{up_boot.c => stm32_boot.c} | 5 ++- .../{up_clockconfig.c => stm32_clockconfig.c} | 4 +-- ..._cxxinitialize.c => stm32_cxxinitialize.c} | 5 ++- .../src/{up_extmem.c => stm32_extmem.c} | 3 +- .../src/{up_idle.c => stm32_idle.c} | 2 +- .../src/{up_mio283qt2.c => stm32_mio283qt2.c} | 3 +- .../{up_mio283qt9a.c => stm32_mio283qt9a.c} | 2 +- .../src/{up_nsh.c => stm32_nsh.c} | 5 ++- .../src/{up_pm.c => stm32_pm.c} | 3 +- .../src/{up_pwm.c => stm32_pwm.c} | 5 ++- .../src/{up_qencoder.c => stm32_qencoder.c} | 5 ++- .../src/{up_spi.c => stm32_spi.c} | 5 ++- .../{up_touchscreen.c => stm32_touchscreen.c} | 4 +-- .../src/{up_usb.c => stm32_usb.c} | 3 +- .../src/{up_vs1053.c => stm32_vs1053.c} | 4 +-- .../src/{up_watchdog.c => stm32_watchdog.c} | 5 ++- 18 files changed, 44 insertions(+), 56 deletions(-) rename configs/mikroe-stm32f4/src/{up_boot.c => stm32_boot.c} (97%) rename configs/mikroe-stm32f4/src/{up_clockconfig.c => stm32_clockconfig.c} (98%) rename configs/mikroe-stm32f4/src/{up_cxxinitialize.c => stm32_cxxinitialize.c} (98%) rename configs/mikroe-stm32f4/src/{up_extmem.c => stm32_extmem.c} (98%) rename configs/mikroe-stm32f4/src/{up_idle.c => stm32_idle.c} (99%) rename configs/mikroe-stm32f4/src/{up_mio283qt2.c => stm32_mio283qt2.c} (99%) rename configs/mikroe-stm32f4/src/{up_mio283qt9a.c => stm32_mio283qt9a.c} (99%) rename configs/mikroe-stm32f4/src/{up_nsh.c => stm32_nsh.c} (99%) rename configs/mikroe-stm32f4/src/{up_pm.c => stm32_pm.c} (98%) rename configs/mikroe-stm32f4/src/{up_pwm.c => stm32_pwm.c} (98%) rename configs/mikroe-stm32f4/src/{up_qencoder.c => stm32_qencoder.c} (98%) rename configs/mikroe-stm32f4/src/{up_spi.c => stm32_spi.c} (99%) rename configs/mikroe-stm32f4/src/{up_touchscreen.c => stm32_touchscreen.c} (99%) rename configs/mikroe-stm32f4/src/{up_usb.c => stm32_usb.c} (99%) rename configs/mikroe-stm32f4/src/{up_vs1053.c => stm32_vs1053.c} (98%) rename configs/mikroe-stm32f4/src/{up_watchdog.c => stm32_watchdog.c} (98%) diff --git a/configs/mikroe-stm32f4/src/Makefile b/configs/mikroe-stm32f4/src/Makefile index 492f46c97d..e8addfd49e 100644 --- a/configs/mikroe-stm32f4/src/Makefile +++ b/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/configs/mikroe-stm32f4/src/mikroe-stm32f4-internal.h b/configs/mikroe-stm32f4/src/mikroe-stm32f4-internal.h index 61bef1c4b0..9bf2aa6e0d 100644 --- a/configs/mikroe-stm32f4/src/mikroe-stm32f4-internal.h +++ b/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 @@ -46,7 +45,7 @@ #include /**************************************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************************************/ /* Configuration ************************************************************************************/ /* How many SPI modules does this chip support? */ diff --git a/configs/mikroe-stm32f4/src/up_boot.c b/configs/mikroe-stm32f4/src/stm32_boot.c similarity index 97% rename from configs/mikroe-stm32f4/src/up_boot.c rename to configs/mikroe-stm32f4/src/stm32_boot.c index 4d6138e246..6db4c79b3c 100644 --- a/configs/mikroe-stm32f4/src/up_boot.c +++ b/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 @@ -48,7 +47,7 @@ #include "mikroe-stm32f4-internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/mikroe-stm32f4/src/up_clockconfig.c b/configs/mikroe-stm32f4/src/stm32_clockconfig.c similarity index 98% rename from configs/mikroe-stm32f4/src/up_clockconfig.c rename to configs/mikroe-stm32f4/src/stm32_clockconfig.c index eb3f819991..25777a71de 100644 --- a/configs/mikroe-stm32f4/src/up_clockconfig.c +++ b/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 @@ -47,7 +47,7 @@ #include "mikroe-stm32f4-internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/mikroe-stm32f4/src/up_cxxinitialize.c b/configs/mikroe-stm32f4/src/stm32_cxxinitialize.c similarity index 98% rename from configs/mikroe-stm32f4/src/up_cxxinitialize.c rename to configs/mikroe-stm32f4/src/stm32_cxxinitialize.c index 45457fc38b..4a1bd1356a 100644 --- a/configs/mikroe-stm32f4/src/up_cxxinitialize.c +++ b/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 @@ -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/configs/mikroe-stm32f4/src/up_extmem.c b/configs/mikroe-stm32f4/src/stm32_extmem.c similarity index 98% rename from configs/mikroe-stm32f4/src/up_extmem.c rename to configs/mikroe-stm32f4/src/stm32_extmem.c index cdfa74fa3f..285ad58f12 100644 --- a/configs/mikroe-stm32f4/src/up_extmem.c +++ b/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 diff --git a/configs/mikroe-stm32f4/src/up_idle.c b/configs/mikroe-stm32f4/src/stm32_idle.c similarity index 99% rename from configs/mikroe-stm32f4/src/up_idle.c rename to configs/mikroe-stm32f4/src/stm32_idle.c index 4adeff52f0..8c8f6f34f0 100644 --- a/configs/mikroe-stm32f4/src/up_idle.c +++ b/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 diff --git a/configs/mikroe-stm32f4/src/up_mio283qt2.c b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c similarity index 99% rename from configs/mikroe-stm32f4/src/up_mio283qt2.c rename to configs/mikroe-stm32f4/src/stm32_mio283qt2.c index c37c16b91d..708a3d20eb 100644 --- a/configs/mikroe-stm32f4/src/up_mio283qt2.c +++ b/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/configs/mikroe-stm32f4/src/up_mio283qt9a.c b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c similarity index 99% rename from configs/mikroe-stm32f4/src/up_mio283qt9a.c rename to configs/mikroe-stm32f4/src/stm32_mio283qt9a.c index d7ec455d22..375d8aea39 100644 --- a/configs/mikroe-stm32f4/src/up_mio283qt9a.c +++ b/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/configs/mikroe-stm32f4/src/up_nsh.c b/configs/mikroe-stm32f4/src/stm32_nsh.c similarity index 99% rename from configs/mikroe-stm32f4/src/up_nsh.c rename to configs/mikroe-stm32f4/src/stm32_nsh.c index 0963ccf69a..086ed7b0e5 100644 --- a/configs/mikroe-stm32f4/src/up_nsh.c +++ b/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 @@ -77,7 +76,7 @@ #include "mikroe-stm32f4-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/mikroe-stm32f4/src/up_pm.c b/configs/mikroe-stm32f4/src/stm32_pm.c similarity index 98% rename from configs/mikroe-stm32f4/src/up_pm.c rename to configs/mikroe-stm32f4/src/stm32_pm.c index 17a040304a..ecbfad02d4 100644 --- a/configs/mikroe-stm32f4/src/up_pm.c +++ b/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 diff --git a/configs/mikroe-stm32f4/src/up_pwm.c b/configs/mikroe-stm32f4/src/stm32_pwm.c similarity index 98% rename from configs/mikroe-stm32f4/src/up_pwm.c rename to configs/mikroe-stm32f4/src/stm32_pwm.c index 27d493a41b..0a6c5b4ecb 100644 --- a/configs/mikroe-stm32f4/src/up_pwm.c +++ b/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 @@ -52,7 +51,7 @@ #include "mikroe-stm32f4-internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Configuration *******************************************************************/ /* PWM diff --git a/configs/mikroe-stm32f4/src/up_qencoder.c b/configs/mikroe-stm32f4/src/stm32_qencoder.c similarity index 98% rename from configs/mikroe-stm32f4/src/up_qencoder.c rename to configs/mikroe-stm32f4/src/stm32_qencoder.c index 69b9f2af5d..d14f0b3634 100644 --- a/configs/mikroe-stm32f4/src/up_qencoder.c +++ b/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 @@ -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/configs/mikroe-stm32f4/src/up_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c similarity index 99% rename from configs/mikroe-stm32f4/src/up_spi.c rename to configs/mikroe-stm32f4/src/stm32_spi.c index bf20c001d0..b6d8297e9f 100644 --- a/configs/mikroe-stm32f4/src/up_spi.c +++ b/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 @@ -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/configs/mikroe-stm32f4/src/up_touchscreen.c b/configs/mikroe-stm32f4/src/stm32_touchscreen.c similarity index 99% rename from configs/mikroe-stm32f4/src/up_touchscreen.c rename to configs/mikroe-stm32f4/src/stm32_touchscreen.c index 30b65e6bb5..210c11d193 100644 --- a/configs/mikroe-stm32f4/src/up_touchscreen.c +++ b/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 @@ -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/configs/mikroe-stm32f4/src/up_usb.c b/configs/mikroe-stm32f4/src/stm32_usb.c similarity index 99% rename from configs/mikroe-stm32f4/src/up_usb.c rename to configs/mikroe-stm32f4/src/stm32_usb.c index 31d0c6ec3c..9cda4f0ec2 100644 --- a/configs/mikroe-stm32f4/src/up_usb.c +++ b/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 diff --git a/configs/mikroe-stm32f4/src/up_vs1053.c b/configs/mikroe-stm32f4/src/stm32_vs1053.c similarity index 98% rename from configs/mikroe-stm32f4/src/up_vs1053.c rename to configs/mikroe-stm32f4/src/stm32_vs1053.c index 8fc43482b6..c54bcfa499 100644 --- a/configs/mikroe-stm32f4/src/up_vs1053.c +++ b/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 @@ -56,7 +56,7 @@ #ifdef CONFIG_VS1053 /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* VS1053 is on SPI3 */ diff --git a/configs/mikroe-stm32f4/src/up_watchdog.c b/configs/mikroe-stm32f4/src/stm32_watchdog.c similarity index 98% rename from configs/mikroe-stm32f4/src/up_watchdog.c rename to configs/mikroe-stm32f4/src/stm32_watchdog.c index 58037c53aa..3d59646e2e 100644 --- a/configs/mikroe-stm32f4/src/up_watchdog.c +++ b/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 @@ -51,7 +50,7 @@ #ifdef CONFIG_WATCHDOG /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Configuration *******************************************************************/ /* Wathdog hardware should be enabled */