From cc4151ef18c6ffe175ed8eb21a66a362103e8d19 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 09:48:31 -0600 Subject: [PATCH] Fire STM32v2: Rename files for better conformance to naming conventions --- configs/fire-stm32v2/src/Makefile | 46 +++++++++---------- configs/fire-stm32v2/src/fire-internal.h | 2 +- .../src/{up_autoleds.c => stm32_autoleds.c} | 2 +- .../src/{up_boot.c => stm32_boot.c} | 2 +- .../src/{up_buttons.c => stm32_buttons.c} | 2 +- .../src/{up_composite.c => stm32_composite.c} | 4 +- ..._cxxinitialize.c => stm32_cxxinitialize.c} | 5 +- .../src/{up_enc28j60.c => stm32_enc28j60.c} | 4 +- .../src/{up_mmcsd.c => stm32_mmcsd.c} | 5 +- .../src/{up_nsh.c => stm32_nsh.c} | 5 +- .../src/{up_selectlcd.c => stm32_selectlcd.c} | 3 +- .../src/{up_spi.c => stm32_spi.c} | 5 +- .../src/{up_usbdev.c => stm32_usbdev.c} | 5 +- .../src/{up_usbmsc.c => stm32_usbmsc.c} | 4 +- .../src/{up_userleds.c => stm32_userleds.c} | 5 +- .../src/{up_w25.c => stm32_w25.c} | 5 +- .../src/{up_watchdog.c => stm32_watchdog.c} | 5 +- 17 files changed, 50 insertions(+), 59 deletions(-) rename configs/fire-stm32v2/src/{up_autoleds.c => stm32_autoleds.c} (99%) rename configs/fire-stm32v2/src/{up_boot.c => stm32_boot.c} (98%) rename configs/fire-stm32v2/src/{up_buttons.c => stm32_buttons.c} (99%) rename configs/fire-stm32v2/src/{up_composite.c => stm32_composite.c} (97%) rename configs/fire-stm32v2/src/{up_cxxinitialize.c => stm32_cxxinitialize.c} (98%) rename configs/fire-stm32v2/src/{up_enc28j60.c => stm32_enc28j60.c} (99%) rename configs/fire-stm32v2/src/{up_mmcsd.c => stm32_mmcsd.c} (97%) rename configs/fire-stm32v2/src/{up_nsh.c => stm32_nsh.c} (98%) rename configs/fire-stm32v2/src/{up_selectlcd.c => stm32_selectlcd.c} (98%) rename configs/fire-stm32v2/src/{up_spi.c => stm32_spi.c} (98%) rename configs/fire-stm32v2/src/{up_usbdev.c => stm32_usbdev.c} (98%) rename configs/fire-stm32v2/src/{up_usbmsc.c => stm32_usbmsc.c} (97%) rename configs/fire-stm32v2/src/{up_userleds.c => stm32_userleds.c} (98%) rename configs/fire-stm32v2/src/{up_w25.c => stm32_w25.c} (97%) rename configs/fire-stm32v2/src/{up_watchdog.c => stm32_watchdog.c} (98%) diff --git a/configs/fire-stm32v2/src/Makefile b/configs/fire-stm32v2/src/Makefile index 76cc2384c5..7f5eaf7d61 100644 --- a/configs/fire-stm32v2/src/Makefile +++ b/configs/fire-stm32v2/src/Makefile @@ -35,67 +35,67 @@ -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_spi.c up_usbdev.c up_mmcsd.c +CSRCS = stm32_boot.c stm32_spi.c stm32_usbdev.c stm32_mmcsd.c ifeq ($(CONFIG_STM32_FSMC),y) -CSRCS += up_lcd.c up_selectlcd.c +CSRCS += up_lcd.c stm32_selectlcd.c endif ifeq ($(CONFIG_HAVE_CXX),y) -CSRCS += up_cxxinitialize.c +CSRCS += stm32_cxxinitialize.c endif 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_NSH_ARCHINIT),y) -CSRCS += up_nsh.c +CSRCS += stm32_nsh.c endif ifeq ($(CONFIG_ENC28J60),y) -CSRCS += up_enc28j60.c +CSRCS += stm32_enc28j60.c endif ifeq ($(CONFIG_MTD_W25),y) -CSRCS += up_w25.c +CSRCS += stm32_w25.c endif ifeq ($(CONFIG_USBMSC),y) -CSRCS += up_usbmsc.c +CSRCS += stm32_usbmsc.c endif ifeq ($(CONFIG_USBDEV_COMPOSITE),y) -CSRCS += up_composite.c +CSRCS += stm32_composite.c endif ifeq ($(CONFIG_WATCHDOG),y) -CSRCS += up_watchdog.c +CSRCS += stm32_watchdog.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/configs/fire-stm32v2/src/fire-internal.h b/configs/fire-stm32v2/src/fire-internal.h index 7ab78a08fe..33e0fe8b6b 100644 --- a/configs/fire-stm32v2/src/fire-internal.h +++ b/configs/fire-stm32v2/src/fire-internal.h @@ -46,7 +46,7 @@ #include /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* How many SPI modules does this chip support? Most support 2 SPI modules (others diff --git a/configs/fire-stm32v2/src/up_autoleds.c b/configs/fire-stm32v2/src/stm32_autoleds.c similarity index 99% rename from configs/fire-stm32v2/src/up_autoleds.c rename to configs/fire-stm32v2/src/stm32_autoleds.c index 270412526a..5991730979 100644 --- a/configs/fire-stm32v2/src/up_autoleds.c +++ b/configs/fire-stm32v2/src/stm32_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/fire-stm32v2/src/up_autoleds.c + * configs/fire-stm32v2/src/stm32_autoleds.c * * Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/fire-stm32v2/src/up_boot.c b/configs/fire-stm32v2/src/stm32_boot.c similarity index 98% rename from configs/fire-stm32v2/src/up_boot.c rename to configs/fire-stm32v2/src/stm32_boot.c index 503f9629bd..6c490eec33 100644 --- a/configs/fire-stm32v2/src/up_boot.c +++ b/configs/fire-stm32v2/src/stm32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/fire-stm32v2/src/up_boot.c + * configs/fire-stm32v2/src/stm32_boot.c * * Copyright (C) 2009, 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/fire-stm32v2/src/up_buttons.c b/configs/fire-stm32v2/src/stm32_buttons.c similarity index 99% rename from configs/fire-stm32v2/src/up_buttons.c rename to configs/fire-stm32v2/src/stm32_buttons.c index e63149465f..de6bca27b0 100644 --- a/configs/fire-stm32v2/src/up_buttons.c +++ b/configs/fire-stm32v2/src/stm32_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/fire-stm32v2/src/board_buttons.c + * configs/fire-stm32v2/src/stm32_buttons.c * * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/fire-stm32v2/src/up_composite.c b/configs/fire-stm32v2/src/stm32_composite.c similarity index 97% rename from configs/fire-stm32v2/src/up_composite.c rename to configs/fire-stm32v2/src/stm32_composite.c index 812035aad9..6d4455b917 100644 --- a/configs/fire-stm32v2/src/up_composite.c +++ b/configs/fire-stm32v2/src/stm32_composite.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/fire-stm32v2/src/up_composite.c + * configs/fire-stm32v2/src/stm32_composite.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -46,7 +46,7 @@ #include "fire-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ /* Device minor number */ diff --git a/configs/fire-stm32v2/src/up_cxxinitialize.c b/configs/fire-stm32v2/src/stm32_cxxinitialize.c similarity index 98% rename from configs/fire-stm32v2/src/up_cxxinitialize.c rename to configs/fire-stm32v2/src/stm32_cxxinitialize.c index d4afdd20b6..0c191d3f75 100644 --- a/configs/fire-stm32v2/src/up_cxxinitialize.c +++ b/configs/fire-stm32v2/src/stm32_cxxinitialize.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/fire-stm32v2/src/up_cxxinitialize.c - * arch/arm/src/board/up_cxxinitialize.c + * configs/fire-stm32v2/src/stm32_cxxinitialize.c * * Copyright (C) 2012 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/fire-stm32v2/src/up_enc28j60.c b/configs/fire-stm32v2/src/stm32_enc28j60.c similarity index 99% rename from configs/fire-stm32v2/src/up_enc28j60.c rename to configs/fire-stm32v2/src/stm32_enc28j60.c index 7033b2fcf0..484cb13569 100644 --- a/configs/fire-stm32v2/src/up_enc28j60.c +++ b/configs/fire-stm32v2/src/stm32_enc28j60.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/fire-stm32v2/src/up_enc28j60.c + * configs/fire-stm32v2/src/stm32_enc28j60.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -68,7 +68,7 @@ #ifdef CONFIG_ENC28J60 /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ /* ENC28J60 diff --git a/configs/fire-stm32v2/src/up_mmcsd.c b/configs/fire-stm32v2/src/stm32_mmcsd.c similarity index 97% rename from configs/fire-stm32v2/src/up_mmcsd.c rename to configs/fire-stm32v2/src/stm32_mmcsd.c index 45bed9b6a7..3e90ac25a9 100644 --- a/configs/fire-stm32v2/src/up_mmcsd.c +++ b/configs/fire-stm32v2/src/stm32_mmcsd.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/fire-stm32v2/src/up_mmcsd.c - * arch/arm/src/board/up_mmcsd.c + * config/fire-stm32v2/src/stm32_mmcsd.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -51,7 +50,7 @@ #include "fire-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/fire-stm32v2/src/up_nsh.c b/configs/fire-stm32v2/src/stm32_nsh.c similarity index 98% rename from configs/fire-stm32v2/src/up_nsh.c rename to configs/fire-stm32v2/src/stm32_nsh.c index 7d10445a16..a7f79b9d6b 100644 --- a/configs/fire-stm32v2/src/up_nsh.c +++ b/configs/fire-stm32v2/src/stm32_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/fire-stm32v2/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/fire-stm32v2/src/stm32_nsh.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +48,7 @@ #include "fire-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/fire-stm32v2/src/up_selectlcd.c b/configs/fire-stm32v2/src/stm32_selectlcd.c similarity index 98% rename from configs/fire-stm32v2/src/up_selectlcd.c rename to configs/fire-stm32v2/src/stm32_selectlcd.c index 060d755211..273dedf28b 100644 --- a/configs/fire-stm32v2/src/up_selectlcd.c +++ b/configs/fire-stm32v2/src/stm32_selectlcd.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/fire-stm32v2/src/up_selectlcd.c - * arch/arm/src/board/up_selectlcd.c + * configs/fire-stm32v2/src/stm32_selectlcd.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/fire-stm32v2/src/up_spi.c b/configs/fire-stm32v2/src/stm32_spi.c similarity index 98% rename from configs/fire-stm32v2/src/up_spi.c rename to configs/fire-stm32v2/src/stm32_spi.c index 494fe0f980..c6a0661ae3 100644 --- a/configs/fire-stm32v2/src/up_spi.c +++ b/configs/fire-stm32v2/src/stm32_spi.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/fire-stm32v2/src/up_spi.c - * arch/arm/src/board/up_spi.c + * configs/fire-stm32v2/src/stm32_spi.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +54,7 @@ #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Enables debug output from this file (needs CONFIG_DEBUG too) */ diff --git a/configs/fire-stm32v2/src/up_usbdev.c b/configs/fire-stm32v2/src/stm32_usbdev.c similarity index 98% rename from configs/fire-stm32v2/src/up_usbdev.c rename to configs/fire-stm32v2/src/stm32_usbdev.c index b1ca36cb7c..306f26f2a2 100644 --- a/configs/fire-stm32v2/src/up_usbdev.c +++ b/configs/fire-stm32v2/src/stm32_usbdev.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/fire-stm32v2/src/up_usbdev.c - * arch/arm/src/board/up_boot.c + * configs/fire-stm32v2/src/stm32_usbdev.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -53,7 +52,7 @@ #include "fire-internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/fire-stm32v2/src/up_usbmsc.c b/configs/fire-stm32v2/src/stm32_usbmsc.c similarity index 97% rename from configs/fire-stm32v2/src/up_usbmsc.c rename to configs/fire-stm32v2/src/stm32_usbmsc.c index 1bb0059153..efb84bc0ce 100644 --- a/configs/fire-stm32v2/src/up_usbmsc.c +++ b/configs/fire-stm32v2/src/stm32_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/fire-stm32v2/src/up_usbmsc.c + * configs/fire-stm32v2/src/stm32_usbmsc.c * * Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,7 +48,7 @@ #include "stm32.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/fire-stm32v2/src/up_userleds.c b/configs/fire-stm32v2/src/stm32_userleds.c similarity index 98% rename from configs/fire-stm32v2/src/up_userleds.c rename to configs/fire-stm32v2/src/stm32_userleds.c index 7f75be3d69..ef41e50629 100644 --- a/configs/fire-stm32v2/src/up_userleds.c +++ b/configs/fire-stm32v2/src/stm32_userleds.c @@ -1,6 +1,5 @@ /**************************************************************************** - * configs/fire-stm32v2/src/up_userleds.c - * arch/arm/src/board/up_userleds.c + * configs/fire-stm32v2/src/stm32_userleds.c * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +54,7 @@ #ifndef CONFIG_ARCH_LEDS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG diff --git a/configs/fire-stm32v2/src/up_w25.c b/configs/fire-stm32v2/src/stm32_w25.c similarity index 97% rename from configs/fire-stm32v2/src/up_w25.c rename to configs/fire-stm32v2/src/stm32_w25.c index bfd27cd1f3..33d0c46aa3 100644 --- a/configs/fire-stm32v2/src/up_w25.c +++ b/configs/fire-stm32v2/src/stm32_w25.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/fire-stm32v2/src/up_w25.c - * arch/arm/src/board/up_w25.c + * config/fire-stm32v2/src/stm32_w25.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -56,7 +55,7 @@ #include "fire-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/fire-stm32v2/src/up_watchdog.c b/configs/fire-stm32v2/src/stm32_watchdog.c similarity index 98% rename from configs/fire-stm32v2/src/up_watchdog.c rename to configs/fire-stm32v2/src/stm32_watchdog.c index 5b11ebc170..ce1e3ec16c 100644 --- a/configs/fire-stm32v2/src/up_watchdog.c +++ b/configs/fire-stm32v2/src/stm32_watchdog.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/fire-stm32v2/src/up_watchdog.c - * arch/arm/src/board/up_watchdog.c + * configs/fire-stm32v2/src/stm32_watchdog.c * * Copyright (C) 2012 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 */