Shenzhou: Rename files for better conformance to naming conventions

22 files changed, 61 insertions, 75 deletions

diff --git a/nuttx/configs/shenzhou/src/Makefile b/nuttx/configs/shenzhou/src/Makefile
index 888e470d7..75f839b27 100644
--- a/nuttx/configs/shenzhou/src/Makefile
+++ b/nuttx/configs/shenzhou/src/Makefile
@@ -35,87 +35,87 @@
 
 -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_mmcsd.c up_chipid.c
+CSRCS = stm32_boot.c stm32_spi.c stm32_mmcsd.c stm32_chipid.c
 
 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_ARCH_RELAYS),y)
-CSRCS		+=  up_relays.c
+CSRCS +=  stm32_relays.c
 endif
 
 ifeq ($(CONFIG_STM32_OTGFS),y)
-CSRCS		+= up_usb.c
+CSRCS += stm32_usb.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += stm32_nsh.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_CAN),y)
-CSRCS		+= up_can.c
+CSRCS += stm32_can.c
 endif
 
 ifeq ($(CONFIG_ADC),y)
-CSRCS		+= up_adc.c
+CSRCS += stm32_adc.c
 endif
 
 ifeq ($(CONFIG_WATCHDOG),y)
-CSRCS		+= up_watchdog.c
+CSRCS += stm32_watchdog.c
 endif
 
 # NOTE: SSD1289 is not supported on the board
 
 ifeq ($(CONFIG_LCD_SSD1289),y)
-CSRCS		+= up_ssd1289.c
+CSRCS += stm32_ssd1289.c
 else
-CSRCS		+= up_ili93xx.c
+CSRCS += stm32_ili93xx.c
 endif
 
 ifeq ($(CONFIG_INPUT_ADS7843E),y)
-CSRCS		+= up_touchscreen.c
+CSRCS += stm32_touchscreen.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/nuttx/configs/shenzhou/src/shenzhou-internal.h b/nuttx/configs/shenzhou/src/shenzhou-internal.h
index 35b6a27eb..9c76eaa85 100644
--- a/nuttx/configs/shenzhou/src/shenzhou-internal.h
+++ b/nuttx/configs/shenzhou/src/shenzhou-internal.h
@@ -1,6 +1,5 @@
 /****************************************************************************************************
  * configs/shenzhou/src/shenzhou-internal.h
- * arch/arm/src/board/shenzhou-internal.n
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -46,7 +45,7 @@
 #include <stdint.h>
 
 /****************************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************************************/
 /* Configuration ************************************************************************************/
 /* How many SPI modules does this chip support? */
diff --git a/nuttx/configs/shenzhou/src/up_adc.c b/nuttx/configs/shenzhou/src/stm32_adc.c
index e62289ca6..ee806a993 100644
--- a/nuttx/configs/shenzhou/src/up_adc.c
+++ b/nuttx/configs/shenzhou/src/stm32_adc.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/shenzhou/src/up_adc.c
- * arch/arm/src/board/up_adc.c
+ * configs/shenzhou/src/stm32_adc.c
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -55,7 +54,7 @@
 #ifdef CONFIG_ADC
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* Configuration ********************************************************************/
 /* Up to 3 ADC interfaces are supported */
diff --git a/nuttx/configs/shenzhou/src/up_autoleds.c b/nuttx/configs/shenzhou/src/stm32_autoleds.c
index b0093ed73..06b92ea37 100644
--- a/nuttx/configs/shenzhou/src/up_autoleds.c
+++ b/nuttx/configs/shenzhou/src/stm32_autoleds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/shenzhou/src/up_autoleds.c
+ * configs/shenzhou/src/stm32_autoleds.c
  *
  *   Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/shenzhou/src/up_boot.c b/nuttx/configs/shenzhou/src/stm32_boot.c
index 0a1fa7180..6e922949c 100644
--- a/nuttx/configs/shenzhou/src/up_boot.c
+++ b/nuttx/configs/shenzhou/src/stm32_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/shenzhou/src/up_boot.c
+ * configs/shenzhou/src/stm32_boot.c
  *
  *   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/shenzhou/src/up_buttons.c b/nuttx/configs/shenzhou/src/stm32_buttons.c
index 6bdae91e3..b4632d8c6 100644
--- a/nuttx/configs/shenzhou/src/up_buttons.c
+++ b/nuttx/configs/shenzhou/src/stm32_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/shenzhou/src/board_buttons.c
+ * configs/shenzhou/src/stm32_buttons.c
  *
  *   Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/shenzhou/src/up_can.c b/nuttx/configs/shenzhou/src/stm32_can.c
index 6b09be7ca..0c888f7c8 100644
--- a/nuttx/configs/shenzhou/src/up_can.c
+++ b/nuttx/configs/shenzhou/src/stm32_can.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/shenzhou/src/up_can.c
+ * configs/shenzhou/src/stm32_can.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/shenzhou/src/up_chipid.c b/nuttx/configs/shenzhou/src/stm32_chipid.c
index e2978e54a..07d597f04 100644
--- a/nuttx/configs/shenzhou/src/up_chipid.c
+++ b/nuttx/configs/shenzhou/src/stm32_chipid.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/shenzhou/src/up_chipid.c
- * arch/arm/src/board/up_chipid.c
+ * configs/shenzhou/src/stm32_chipid.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -47,7 +46,7 @@
 #include "up_arch.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/nuttx/configs/shenzhou/src/up_composite.c b/nuttx/configs/shenzhou/src/stm32_composite.c
index 53f6c46ec..97fe9fca7 100644
--- a/nuttx/configs/shenzhou/src/up_composite.c
+++ b/nuttx/configs/shenzhou/src/stm32_composite.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/shenzhou/src/up_composite.c
+ * configs/shenzhou/src/stm32_composite.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -46,7 +46,7 @@
 #include "shenzhou-internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 /* Device minor number */
diff --git a/nuttx/configs/shenzhou/src/up_cxxinitialize.c b/nuttx/configs/shenzhou/src/stm32_cxxinitialize.c
index 406827dbf..3eeab04e5 100644
--- a/nuttx/configs/shenzhou/src/up_cxxinitialize.c
+++ b/nuttx/configs/shenzhou/src/stm32_cxxinitialize.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/shenzhou/src/up_cxxinitialize.c
- * arch/arm/src/board/up_cxxinitialize.c
+ * configs/shenzhou/src/stm32_cxxinitialize.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -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/nuttx/configs/shenzhou/src/up_ili93xx.c b/nuttx/configs/shenzhou/src/stm32_ili93xx.c
index 84395b6b7..3da0df253 100644
--- a/nuttx/configs/shenzhou/src/up_ili93xx.c
+++ b/nuttx/configs/shenzhou/src/stm32_ili93xx.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/shenzhou/src/up_ili93xx.c
- * arch/arm/src/board/up_ili93xx.c
+ * configs/shenzhou/src/stm32_ili93xx.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/shenzhou/src/up_mmcsd.c b/nuttx/configs/shenzhou/src/stm32_mmcsd.c
index a4416af56..043951e7f 100644
--- a/nuttx/configs/shenzhou/src/up_mmcsd.c
+++ b/nuttx/configs/shenzhou/src/stm32_mmcsd.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/shenzhou/src/up_mmcsd.c
- * arch/arm/src/board/up_mmcsd.c
+ * config/shenzhou/src/stm32_mmcsd.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +47,7 @@
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 /* SPI1 connects to the SD CARD (and to the SPI FLASH) */
diff --git a/nuttx/configs/shenzhou/src/up_nsh.c b/nuttx/configs/shenzhou/src/stm32_nsh.c
index 2e8726f51..aebe00461 100644
--- a/nuttx/configs/shenzhou/src/up_nsh.c
+++ b/nuttx/configs/shenzhou/src/stm32_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/shenzhou/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/shenzhou/src/stm32_nsh.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,7 +48,7 @@
 #include "shenzhou-internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 
diff --git a/nuttx/configs/shenzhou/src/up_relays.c b/nuttx/configs/shenzhou/src/stm32_relays.c
index 6916ee455..72c4793d2 100644
--- a/nuttx/configs/shenzhou/src/up_relays.c
+++ b/nuttx/configs/shenzhou/src/stm32_relays.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/shenzhou/src/up_relays.c
+ * configs/shenzhou/src/stm32_relays.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/shenzhou/src/up_spi.c b/nuttx/configs/shenzhou/src/stm32_spi.c
index 2a633cebd..2031d4d21 100644
--- a/nuttx/configs/shenzhou/src/up_spi.c
+++ b/nuttx/configs/shenzhou/src/stm32_spi.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/shenzhou/src/up_spi.c
- * arch/arm/src/board/up_spi.c
+ * configs/shenzhou/src/stm32_spi.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -55,7 +54,7 @@
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI3)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* Enables debug output from this file (needs CONFIG_DEBUG too) */
diff --git a/nuttx/configs/shenzhou/src/up_ssd1289.c b/nuttx/configs/shenzhou/src/stm32_ssd1289.c
index ed30bebd3..1558201e1 100644
--- a/nuttx/configs/shenzhou/src/up_ssd1289.c
+++ b/nuttx/configs/shenzhou/src/stm32_ssd1289.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/shenzhou/src/up_ssd1289.c
- * arch/arm/src/board/up_ssd1289.c
+ * configs/shenzhou/src/stm32_ssd1289.c
  *
  * This logic supports the connection of an SSD1289-based LCD to the Shenzhou IV
  * board.
diff --git a/nuttx/configs/shenzhou/src/up_touchscreen.c b/nuttx/configs/shenzhou/src/stm32_touchscreen.c
index 832b48515..5128733ef 100644
--- a/nuttx/configs/shenzhou/src/up_touchscreen.c
+++ b/nuttx/configs/shenzhou/src/stm32_touchscreen.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/shenzhou/src/up_touchscreen.c
- * arch/arm/src/board/up_touchscreen.c
+ * configs/shenzhou/src/stm32_touchscreen.c
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -55,7 +54,7 @@
 #include "shenzhou-internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 
diff --git a/nuttx/configs/shenzhou/src/up_usb.c b/nuttx/configs/shenzhou/src/stm32_usb.c
index c9ae8e4b9..ef7e86451 100644
--- a/nuttx/configs/shenzhou/src/up_usb.c
+++ b/nuttx/configs/shenzhou/src/stm32_usb.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/shenzhou/src/up_usbdev.c
- * arch/arm/src/board/up_boot.c
+ * configs/shenzhou/src/stm32_usb.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/shenzhou/src/up_usbmsc.c b/nuttx/configs/shenzhou/src/stm32_usbmsc.c
index fe6b4fbc1..6f4ea9caf 100644
--- a/nuttx/configs/shenzhou/src/up_usbmsc.c
+++ b/nuttx/configs/shenzhou/src/stm32_usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/shenzhou/src/up_usbmsc.c
+ * configs/shenzhou/src/stm32_usbmsc.c
  *
  *   Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
 #include "stm32.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
 
diff --git a/nuttx/configs/shenzhou/src/up_userleds.c b/nuttx/configs/shenzhou/src/stm32_userleds.c
index 0fc83fd1e..f537462d7 100644
--- a/nuttx/configs/shenzhou/src/up_userleds.c
+++ b/nuttx/configs/shenzhou/src/stm32_userleds.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/shenzhou/src/up_userleds.c
- * arch/arm/src/board/up_userleds.c
+ * configs/shenzhou/src/stm32_userleds.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -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/nuttx/configs/shenzhou/src/up_w25.c b/nuttx/configs/shenzhou/src/stm32_w25.c
index 6dcfe093a..1ffbf5c11 100644
--- a/nuttx/configs/shenzhou/src/up_w25.c
+++ b/nuttx/configs/shenzhou/src/stm32_w25.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/shenzhou/src/up_w25.c
- * arch/arm/src/board/up_w25.c
+ * config/shenzhou/src/stm32_w25.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -56,7 +55,7 @@
 #include "shenzhou-internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/
diff --git a/nuttx/configs/shenzhou/src/up_watchdog.c b/nuttx/configs/shenzhou/src/stm32_watchdog.c
index a4be02371..8c689f0a9 100644
--- a/nuttx/configs/shenzhou/src/up_watchdog.c
+++ b/nuttx/configs/shenzhou/src/stm32_watchdog.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/shenzhou/src/up_watchdog.c
- * arch/arm/src/board/up_watchdog.c
+ * configs/shenzhou/src/stm32_watchdog.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +50,7 @@
 #ifdef CONFIG_WATCHDOG
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* Configuration *******************************************************************/
 /* Wathdog hardware should be enabled */