CloudCtrl: Rename files for better conformance to naming conventions

This commit is contained in:
Gregory Nutt
2015-03-21 09:54:40 -06:00
parent cc4151ef18
commit e98623b5cb
17 changed files with 50 additions and 60 deletions
+24 -24
View File
@@ -36,71 +36,71 @@
-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_spi.c up_chipid.c CSRCS = stm32_boot.c stm32_spi.c stm32_chipid.c
ifeq ($(CONFIG_HAVE_CXX),y) ifeq ($(CONFIG_HAVE_CXX),y)
CSRCS += up_cxxinitialize.c CSRCS += stm32_cxxinitialize.c
endif endif
ifeq ($(CONFIG_ARCH_LEDS),y) ifeq ($(CONFIG_ARCH_LEDS),y)
CSRCS += up_autoleds.c CSRCS += stm32_autoleds.c
else else
CSRCS += up_userleds.c CSRCS += stm32_userleds.c
endif endif
ifeq ($(CONFIG_ARCH_BUTTONS),y) ifeq ($(CONFIG_ARCH_BUTTONS),y)
CSRCS += up_buttons.c CSRCS += stm32_buttons.c
endif endif
ifeq ($(CONFIG_ARCH_RELAYS),y) ifeq ($(CONFIG_ARCH_RELAYS),y)
CSRCS += up_relays.c CSRCS += stm32_relays.c
endif endif
ifeq ($(CONFIG_STM32_OTGFS),y) ifeq ($(CONFIG_STM32_OTGFS),y)
CSRCS += up_usb.c CSRCS += stm32_usb.c
endif endif
ifeq ($(CONFIG_NSH_ARCHINIT),y) ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c CSRCS += stm32_nsh.c
endif endif
ifeq ($(CONFIG_MTD_W25),y) ifeq ($(CONFIG_MTD_W25),y)
CSRCS += up_w25.c CSRCS += stm32_w25.c
endif endif
ifeq ($(CONFIG_USBMSC),y) ifeq ($(CONFIG_USBMSC),y)
CSRCS += up_usbmsc.c CSRCS += stm32_usbmsc.c
endif endif
ifeq ($(CONFIG_ADC),y) ifeq ($(CONFIG_ADC),y)
CSRCS += up_adc.c CSRCS += stm32_adc.c
endif endif
ifeq ($(CONFIG_WATCHDOG),y) ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += up_watchdog.c CSRCS += stm32_watchdog.c
endif endif
ifeq ($(CONFIG_STM32_PHYINIT),y) ifeq ($(CONFIG_STM32_PHYINIT),y)
CSRCS += up_phyinit.c CSRCS += stm32_phyinit.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)
+1 -1
View File
@@ -47,7 +47,7 @@
#include <stdint.h> #include <stdint.h>
/**************************************************************************************************** /****************************************************************************************************
* Definitions * Pre-processor Definitions
****************************************************************************************************/ ****************************************************************************************************/
/* Configuration ************************************************************************************/ /* Configuration ************************************************************************************/
/* How many SPI modules does this chip support? */ /* How many SPI modules does this chip support? */
@@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/cloudctrl/src/up_adc.c * configs/cloudctrl/src/stm32_adc.c
* arch/arm/src/board/up_adc.c
* *
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@@ -56,7 +55,7 @@
#ifdef CONFIG_ADC #ifdef CONFIG_ADC
/************************************************************************************ /************************************************************************************
* Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* Configuration ********************************************************************/ /* Configuration ********************************************************************/
/* Up to 3 ADC interfaces are supported */ /* Up to 3 ADC interfaces are supported */
@@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* configs/cloudctrl/src/up_autoleds.c * configs/cloudctrl/src/stm32_autoleds.c
* *
* Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/cloudctrl/src/up_boot.c * configs/cloudctrl/src/stm32_boot.c
* *
* Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* configs/cloudctrl/src/board_buttons.c * configs/cloudctrl/src/stm32_buttons.c
* *
* Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/cloudctrl/src/up_chipid.c * configs/cloudctrl/src/stm32_chipid.c
* arch/arm/src/board/up_chipid.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>
@@ -48,7 +47,7 @@
#include "up_arch.h" #include "up_arch.h"
/************************************************************************************ /************************************************************************************
* Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
@@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/cloudctrl/src/up_cxxinitialize.c * configs/cloudctrl/src/stm32_cxxinitialize.c
* arch/arm/src/board/up_cxxinitialize.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 @@
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
/************************************************************************************ /************************************************************************************
* Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* Debug ****************************************************************************/ /* Debug ****************************************************************************/
/* Non-standard debug that may be enabled just for testing the static constructors */ /* Non-standard debug that may be enabled just for testing the static constructors */
@@ -1,6 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/cloudctrl/src/up_nsh.c * config/cloudctrl/src/stm32_nsh.c
* arch/arm/src/board/up_nsh.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>
@@ -50,7 +49,7 @@
#include "cloudctrl-internal.h" #include "cloudctrl-internal.h"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
@@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/cloudctrl/src/up_phyinit.c * configs/cloudctrl/src/stm32_phyinit.c
* arch/arm/src/board/up_phyinit.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>
@@ -47,7 +46,7 @@
#include "cloudctrl-internal.h" #include "cloudctrl-internal.h"
/************************************************************************************ /************************************************************************************
* Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
@@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* configs/cloudctrl/src/up_relays.c * configs/cloudctrl/src/stm32_relays.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>
@@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/cloudctrl/src/up_spi.c * configs/cloudctrl/src/stm32_spi.c
* arch/arm/src/board/up_spi.c
* *
* Copyright (C) 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2009 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_SPI3) #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI3)
/************************************************************************************ /************************************************************************************
* Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* Enables debug output from this file (needs CONFIG_DEBUG too) */ /* Enables debug output from this file (needs CONFIG_DEBUG too) */
@@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/cloudctrl/src/up_usbdev.c * configs/cloudctrl/src/stm32_usb.c
* arch/arm/src/board/up_boot.c
* *
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* configs/cloudctrl/src/up_usbmsc.c * configs/cloudctrl/src/stm32_usbmsc.c
* *
* Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,7 +49,7 @@
#include "stm32.h" #include "stm32.h"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
@@ -1,6 +1,5 @@
/**************************************************************************** /****************************************************************************
* configs/cloudctrl/src/up_userleds.c * configs/cloudctrl/src/stm32_userleds.c
* arch/arm/src/board/up_userleds.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>
@@ -56,7 +55,7 @@
#ifndef CONFIG_ARCH_LEDS #ifndef CONFIG_ARCH_LEDS
/**************************************************************************** /****************************************************************************
* 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
@@ -1,6 +1,5 @@
/**************************************************************************** /****************************************************************************
* config/cloudctrl/src/up_w25.c * config/cloudctrl/src/stm32_w25.c
* arch/arm/src/board/up_w25.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>
@@ -57,7 +56,7 @@
#include "cloudctrl-internal.h" #include "cloudctrl-internal.h"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
@@ -1,6 +1,5 @@
/************************************************************************************ /************************************************************************************
* configs/cloudctrl/src/up_watchdog.c * configs/cloudctrl/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>
@@ -52,7 +51,7 @@
#ifdef CONFIG_WATCHDOG #ifdef CONFIG_WATCHDOG
/************************************************************************************ /************************************************************************************
* Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* Configuration *******************************************************************/ /* Configuration *******************************************************************/
/* Wathdog hardware should be enabled */ /* Wathdog hardware should be enabled */