From a1c887c7ed948e29d40de1f3de9f959f29739aa7 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 09:42:09 -0600 Subject: [PATCH] Hymini STM32F4: Rename files for better conformance to naming conventions --- configs/hymini-stm32v/src/Makefile | 36 +++++++++---------- .../src/hymini_stm32v-internal.h | 3 +- .../src/{up_boot.c => stm32_boot.c} | 2 +- .../src/{up_buttons.c => stm32_buttons.c} | 2 +- .../src/{up_leds.c => stm32_leds.c} | 4 +-- .../src/{up_nsh.c => stm32_nsh.c} | 5 ++- .../src/{up_r61505u.c => stm32_r61505u.c} | 3 +- .../src/{up_spi.c => stm32_spi.c} | 5 ++- .../src/{up_ssd1289.c => stm32_ssd1289.c} | 3 +- .../hymini-stm32v/src/{up_ts.c => stm32_ts.c} | 15 ++++++-- .../src/{up_usbdev.c => stm32_usbdev.c} | 5 ++- .../src/{up_usbmsc.c => stm32_usbmsc.c} | 4 +-- .../src/{up_watchdog.c => stm32_watchdog.c} | 5 ++- 13 files changed, 48 insertions(+), 44 deletions(-) rename configs/hymini-stm32v/src/{up_boot.c => stm32_boot.c} (98%) rename configs/hymini-stm32v/src/{up_buttons.c => stm32_buttons.c} (99%) rename configs/hymini-stm32v/src/{up_leds.c => stm32_leds.c} (99%) rename configs/hymini-stm32v/src/{up_nsh.c => stm32_nsh.c} (98%) rename configs/hymini-stm32v/src/{up_r61505u.c => stm32_r61505u.c} (99%) rename configs/hymini-stm32v/src/{up_spi.c => stm32_spi.c} (98%) rename configs/hymini-stm32v/src/{up_ssd1289.c => stm32_ssd1289.c} (99%) rename configs/hymini-stm32v/src/{up_ts.c => stm32_ts.c} (90%) rename configs/hymini-stm32v/src/{up_usbdev.c => stm32_usbdev.c} (98%) rename configs/hymini-stm32v/src/{up_usbmsc.c => stm32_usbmsc.c} (98%) rename configs/hymini-stm32v/src/{up_watchdog.c => stm32_watchdog.c} (98%) diff --git a/configs/hymini-stm32v/src/Makefile b/configs/hymini-stm32v/src/Makefile index cae6fbbe82..6f4216cf8a 100644 --- a/configs/hymini-stm32v/src/Makefile +++ b/configs/hymini-stm32v/src/Makefile @@ -36,49 +36,49 @@ -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_leds.c up_buttons.c up_spi.c up_usbdev.c +CSRCS = stm32_boot.c stm32_leds.c stm32_buttons.c stm32_spi.c stm32_usbdev.c ifeq ($(CONFIG_LCD_SSD1289),y) -CSRCS += up_ssd1289.c +CSRCS += stm32_ssd1289.c else ifeq ($(CONFIG_LCD_R61505U),y) -CSRCS += up_r61505u.c +CSRCS += stm32_r61505u.c endif endif ifeq ($(CONFIG_NSH_ARCHINIT),y) -CSRCS += up_nsh.c +CSRCS += stm32_nsh.c endif ifeq ($(CONFIG_INPUT),y) -CSRCS += up_ts.c +CSRCS += stm32_ts.c endif ifeq ($(CONFIG_USBMSC),y) -CSRCS += up_usbmsc.c +CSRCS += stm32_usbmsc.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/hymini-stm32v/src/hymini_stm32v-internal.h b/configs/hymini-stm32v/src/hymini_stm32v-internal.h index 15eedec499..ece3a50133 100644 --- a/configs/hymini-stm32v/src/hymini_stm32v-internal.h +++ b/configs/hymini-stm32v/src/hymini_stm32v-internal.h @@ -1,6 +1,5 @@ /************************************************************************************ * configs/hymini-stm32v/src/hymini_stm32v-internal.h - * arch/arm/src/board/hymini_stm32v-internal.h * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,7 +46,7 @@ #include /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* How many SPI modules does this chip support? The LM3S6918 supports 2 SPI diff --git a/configs/hymini-stm32v/src/up_boot.c b/configs/hymini-stm32v/src/stm32_boot.c similarity index 98% rename from configs/hymini-stm32v/src/up_boot.c rename to configs/hymini-stm32v/src/stm32_boot.c index 6a4376ef4e..0df3ffef71 100644 --- a/configs/hymini-stm32v/src/up_boot.c +++ b/configs/hymini-stm32v/src/stm32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/hymini-stm32v/src/up_boot.c + * configs/hymini-stm32v/src/stm32_boot.c * * Copyright (C) 2009, 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/hymini-stm32v/src/up_buttons.c b/configs/hymini-stm32v/src/stm32_buttons.c similarity index 99% rename from configs/hymini-stm32v/src/up_buttons.c rename to configs/hymini-stm32v/src/stm32_buttons.c index 096715dfa7..287b95a70c 100644 --- a/configs/hymini-stm32v/src/up_buttons.c +++ b/configs/hymini-stm32v/src/stm32_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/hymini-stm32v/src/board_buttons.c + * configs/hymini-stm32v/src/stm32_buttons.c * * Copyright (C) 2009, 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/hymini-stm32v/src/up_leds.c b/configs/hymini-stm32v/src/stm32_leds.c similarity index 99% rename from configs/hymini-stm32v/src/up_leds.c rename to configs/hymini-stm32v/src/stm32_leds.c index 1023a1f508..49dbdf8de8 100644 --- a/configs/hymini-stm32v/src/up_leds.c +++ b/configs/hymini-stm32v/src/stm32_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/hymini-stm32v/src/up_leds.c + * configs/hymini-stm32v/src/stm32_leds.c * * Copyright (C) 2009, 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -54,7 +54,7 @@ #include "hymini_stm32v-internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG diff --git a/configs/hymini-stm32v/src/up_nsh.c b/configs/hymini-stm32v/src/stm32_nsh.c similarity index 98% rename from configs/hymini-stm32v/src/up_nsh.c rename to configs/hymini-stm32v/src/stm32_nsh.c index 7c29bc2c0a..8c903dbfc8 100644 --- a/configs/hymini-stm32v/src/up_nsh.c +++ b/configs/hymini-stm32v/src/stm32_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/hymini-stm32v/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/hymini-stm32v/src/stm32_nsh.c * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -59,7 +58,7 @@ #include "hymini_stm32v-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/hymini-stm32v/src/up_r61505u.c b/configs/hymini-stm32v/src/stm32_r61505u.c similarity index 99% rename from configs/hymini-stm32v/src/up_r61505u.c rename to configs/hymini-stm32v/src/stm32_r61505u.c index af05382a52..b722e18cf2 100755 --- a/configs/hymini-stm32v/src/up_r61505u.c +++ b/configs/hymini-stm32v/src/stm32_r61505u.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/hymini-stm32v/src/up_r61505u.c - * arch/arm/src/board/up_r61505u.c + * configs/hymini-stm32v/src/stm32_r61505u.c * * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/configs/hymini-stm32v/src/up_spi.c b/configs/hymini-stm32v/src/stm32_spi.c similarity index 98% rename from configs/hymini-stm32v/src/up_spi.c rename to configs/hymini-stm32v/src/stm32_spi.c index 8e21b96cf0..d1ab85d87e 100644 --- a/configs/hymini-stm32v/src/up_spi.c +++ b/configs/hymini-stm32v/src/stm32_spi.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/hymini-stm32v/src/up_spi.c - * arch/arm/src/board/up_spi.c + * configs/hymini-stm32v/src/stm32_spi.c * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -56,7 +55,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/hymini-stm32v/src/up_ssd1289.c b/configs/hymini-stm32v/src/stm32_ssd1289.c similarity index 99% rename from configs/hymini-stm32v/src/up_ssd1289.c rename to configs/hymini-stm32v/src/stm32_ssd1289.c index 998ee05e1f..942375edc5 100644 --- a/configs/hymini-stm32v/src/up_ssd1289.c +++ b/configs/hymini-stm32v/src/stm32_ssd1289.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/hymini-stm32v/src/ssd1289.c - * arch/arm/src/board/ssd1289.c + * configs/hymini-stm32v/src/stm32_ssd1289.c * * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/hymini-stm32v/src/up_ts.c b/configs/hymini-stm32v/src/stm32_ts.c similarity index 90% rename from configs/hymini-stm32v/src/up_ts.c rename to configs/hymini-stm32v/src/stm32_ts.c index bc105124a3..0c384048d1 100644 --- a/configs/hymini-stm32v/src/up_ts.c +++ b/configs/hymini-stm32v/src/stm32_ts.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/hymini-stm32v/src/up_ts.c - * arch/arm/src/board/up_ts.c + * configs/hymini-stm32v/src/stm32_ts.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -35,6 +34,10 @@ * ************************************************************************************/ +/************************************************************************************ + * Included Files + ************************************************************************************/ + #include #include #include @@ -48,10 +51,18 @@ #include #include +/************************************************************************************ + * Pre-processor Defintiions + ************************************************************************************/ + #if !defined(CONFIG_STM32_SPI1) # error CONFIG_STM32_SPI1 must be defined to use the ADS7843 on this board #endif +/************************************************************************************ + * Private Function Prototypes + ************************************************************************************/ + static int hymini_ts_irq_attach(FAR struct ads7843e_config_s *state, xcpt_t isr); static void hymini_ts_irq_enable(FAR struct ads7843e_config_s *state, bool enable); diff --git a/configs/hymini-stm32v/src/up_usbdev.c b/configs/hymini-stm32v/src/stm32_usbdev.c similarity index 98% rename from configs/hymini-stm32v/src/up_usbdev.c rename to configs/hymini-stm32v/src/stm32_usbdev.c index fad29f7d1b..aaf7bf7d44 100644 --- a/configs/hymini-stm32v/src/up_usbdev.c +++ b/configs/hymini-stm32v/src/stm32_usbdev.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/hymini-stm32v/src/up_usbdev.c - * arch/arm/src/board/up_boot.c + * configs/hymini-stm32v/src/stm32_usbdev.c * * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -53,7 +52,7 @@ #include "hymini_stm32v-internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/hymini-stm32v/src/up_usbmsc.c b/configs/hymini-stm32v/src/stm32_usbmsc.c similarity index 98% rename from configs/hymini-stm32v/src/up_usbmsc.c rename to configs/hymini-stm32v/src/stm32_usbmsc.c index c3f91cf13c..e0fa30ccb4 100644 --- a/configs/hymini-stm32v/src/up_usbmsc.c +++ b/configs/hymini-stm32v/src/stm32_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/hymini-stm32v/src/up_usbmsc.c + * configs/hymini-stm32v/src/stm32_usbmsc.c * * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +55,7 @@ #ifdef CONFIG_STM32_SDIO /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/hymini-stm32v/src/up_watchdog.c b/configs/hymini-stm32v/src/stm32_watchdog.c similarity index 98% rename from configs/hymini-stm32v/src/up_watchdog.c rename to configs/hymini-stm32v/src/stm32_watchdog.c index 638fae440b..386efd8d6a 100644 --- a/configs/hymini-stm32v/src/up_watchdog.c +++ b/configs/hymini-stm32v/src/stm32_watchdog.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/hymini-stm32v/src/up_watchdog.c - * arch/arm/src/board/up_watchdog.c + * configs/hymini-stm32v/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 */