Hymini STM32F4: Rename files for better conformance to naming conventions

This commit is contained in:
Gregory Nutt 2015-03-21 09:42:09 -06:00
parent d2c2203f38
commit a1c887c7ed
13 changed files with 48 additions and 44 deletions

View File

@ -36,49 +36,49 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
CFLAGS += -I$(TOPDIR)/sched CFLAGS += -I$(TOPDIR)/sched
ASRCS = ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT)) 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) ifeq ($(CONFIG_LCD_SSD1289),y)
CSRCS += up_ssd1289.c CSRCS += stm32_ssd1289.c
else else
ifeq ($(CONFIG_LCD_R61505U),y) ifeq ($(CONFIG_LCD_R61505U),y)
CSRCS += up_r61505u.c CSRCS += stm32_r61505u.c
endif endif
endif endif
ifeq ($(CONFIG_NSH_ARCHINIT),y) ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c CSRCS += stm32_nsh.c
endif endif
ifeq ($(CONFIG_INPUT),y) ifeq ($(CONFIG_INPUT),y)
CSRCS += up_ts.c CSRCS += stm32_ts.c
endif endif
ifeq ($(CONFIG_USBMSC),y) ifeq ($(CONFIG_USBMSC),y)
CSRCS += up_usbmsc.c CSRCS += stm32_usbmsc.c
endif endif
ifeq ($(CONFIG_WATCHDOG),y) ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += up_watchdog.c CSRCS += stm32_watchdog.c
endif endif
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \ CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \ -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}" -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
else 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 endif
all: libboard$(LIBEXT) all: libboard$(LIBEXT)

View File

@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/hymini-stm32v/src/hymini_stm32v-internal.h * 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. * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -47,7 +46,7 @@
#include <stdint.h> #include <stdint.h>
/************************************************************************************ /************************************************************************************
* Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* How many SPI modules does this chip support? The LM3S6918 supports 2 SPI /* How many SPI modules does this chip support? The LM3S6918 supports 2 SPI

View File

@ -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. * Copyright (C) 2009, 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -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. * Copyright (C) 2009, 2011, 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -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. * Copyright (C) 2009, 2011, 2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -54,7 +54,7 @@
#include "hymini_stm32v-internal.h" #include "hymini_stm32v-internal.h"
/**************************************************************************** /****************************************************************************
* Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG

View File

@ -1,6 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/hymini-stm32v/src/up_nsh.c * config/hymini-stm32v/src/stm32_nsh.c
* arch/arm/src/board/up_nsh.c
* *
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -59,7 +58,7 @@
#include "hymini_stm32v-internal.h" #include "hymini_stm32v-internal.h"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/

View File

@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/hymini-stm32v/src/up_r61505u.c * configs/hymini-stm32v/src/stm32_r61505u.c
* arch/arm/src/board/up_r61505u.c
* *
* Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org> * Authors: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/hymini-stm32v/src/up_spi.c * configs/hymini-stm32v/src/stm32_spi.c
* arch/arm/src/board/up_spi.c
* *
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -56,7 +55,7 @@
#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)
/************************************************************************************ /************************************************************************************
* Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* Enables debug output from this file (needs CONFIG_DEBUG too) */ /* Enables debug output from this file (needs CONFIG_DEBUG too) */

View File

@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/hymini-stm32v/src/ssd1289.c * configs/hymini-stm32v/src/stm32_ssd1289.c
* arch/arm/src/board/ssd1289.c
* *
* Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/hymini-stm32v/src/up_ts.c * configs/hymini-stm32v/src/stm32_ts.c
* arch/arm/src/board/up_ts.c
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -35,6 +34,10 @@
* *
************************************************************************************/ ************************************************************************************/
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
@ -48,10 +51,18 @@
#include <nuttx/input/touchscreen.h> #include <nuttx/input/touchscreen.h>
#include <nuttx/input/ads7843e.h> #include <nuttx/input/ads7843e.h>
/************************************************************************************
* Pre-processor Defintiions
************************************************************************************/
#if !defined(CONFIG_STM32_SPI1) #if !defined(CONFIG_STM32_SPI1)
# error CONFIG_STM32_SPI1 must be defined to use the ADS7843 on this board # error CONFIG_STM32_SPI1 must be defined to use the ADS7843 on this board
#endif #endif
/************************************************************************************
* Private Function Prototypes
************************************************************************************/
static int hymini_ts_irq_attach(FAR struct ads7843e_config_s *state, xcpt_t isr); 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, static void hymini_ts_irq_enable(FAR struct ads7843e_config_s *state,
bool enable); bool enable);

View File

@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/hymini-stm32v/src/up_usbdev.c * configs/hymini-stm32v/src/stm32_usbdev.c
* arch/arm/src/board/up_boot.c
* *
* Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -53,7 +52,7 @@
#include "hymini_stm32v-internal.h" #include "hymini_stm32v-internal.h"
/************************************************************************************ /************************************************************************************
* Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************

View File

@ -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. * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -55,7 +55,7 @@
#ifdef CONFIG_STM32_SDIO #ifdef CONFIG_STM32_SDIO
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/

View File

@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/hymini-stm32v/src/up_watchdog.c * configs/hymini-stm32v/src/stm32_watchdog.c
* arch/arm/src/board/up_watchdog.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -51,7 +50,7 @@
#ifdef CONFIG_WATCHDOG #ifdef CONFIG_WATCHDOG
/************************************************************************************ /************************************************************************************
* Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* Configuration *******************************************************************/ /* Configuration *******************************************************************/
/* Wathdog hardware should be enabled */ /* Wathdog hardware should be enabled */