From d989ecf865df7417522ae23b94b0224b19903085 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 21 Mar 2015 14:18:32 -0600
Subject: [PATCH] EA3152: Rename files for better conformance to naming
 conventions

---
 configs/ea3152/src/Makefile                   | 38 +++++++++----------
 configs/ea3152/src/ea3152_internal.h          | 12 +++---
 .../ea3152/src/{up_boot.c => lpc31_boot.c}    |  2 +-
 .../src/{up_buttons.c => lpc31_buttons.c}     |  2 +-
 .../src/{up_clkinit.c => lpc31_clkinit.c}     |  6 +--
 .../src/{up_fillpage.c => lpc31_fillpage.c}   |  7 ++--
 .../ea3152/src/{up_leds.c => lpc31_leds.c}    |  4 +-
 configs/ea3152/src/{up_mem.c => lpc31_mem.c}  |  3 +-
 configs/ea3152/src/{up_nsh.c => lpc31_nsh.c}  |  3 +-
 configs/ea3152/src/{up_spi.c => lpc31_spi.c}  |  6 +--
 .../src/{up_usbmsc.c => lpc31_usbmsc.c}       |  4 +-
 11 files changed, 39 insertions(+), 48 deletions(-)
 rename configs/ea3152/src/{up_boot.c => lpc31_boot.c} (99%)
 rename configs/ea3152/src/{up_buttons.c => lpc31_buttons.c} (98%)
 rename configs/ea3152/src/{up_clkinit.c => lpc31_clkinit.c} (99%)
 rename configs/ea3152/src/{up_fillpage.c => lpc31_fillpage.c} (99%)
 rename configs/ea3152/src/{up_leds.c => lpc31_leds.c} (98%)
 rename configs/ea3152/src/{up_mem.c => lpc31_mem.c} (99%)
 rename configs/ea3152/src/{up_nsh.c => lpc31_nsh.c} (98%)
 rename configs/ea3152/src/{up_spi.c => lpc31_spi.c} (98%)
 rename configs/ea3152/src/{up_usbmsc.c => lpc31_usbmsc.c} (98%)

diff --git a/configs/ea3152/src/Makefile b/configs/ea3152/src/Makefile
index b5d743e2d8..01afcb5e72 100644
--- a/configs/ea3152/src/Makefile
+++ b/configs/ea3152/src/Makefile
@@ -35,45 +35,45 @@
 
 -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_clkinit.c
+CSRCS = lpc31_boot.c lpc31_clkinit.c
 ifeq ($(CONFIG_ARCH_BUTTONS),y)
-CSRCS		+= up_buttons.c
+CSRCS += lpc31_buttons.c
 endif
 ifeq ($(CONFIG_LPC31_EXTDRAM),y)
-CSRCS		+= up_mem.c
+CSRCS += lpc31_mem.c
 endif
 ifeq ($(CONFIG_ARCH_LEDS),y)
-CSRCS		+= up_leds.c
+CSRCS += lpc31_leds.c
 endif
 ifeq ($(CONFIG_LPC31_SPI),y)
-CSRCS		+= up_spi.c
+CSRCS += lpc31_spi.c
 endif
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += lpc31_nsh.c
 endif
 ifeq ($(CONFIG_PAGING),y)
-CSRCS		+= up_fillpage.c
+CSRCS += lpc31_fillpage.c
 endif
 ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbmsc.c
+CSRCS += lpc31_usbmsc.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)/arm}"
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/arm}"
 else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm
+  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm
 endif
 
 all: libboard$(LIBEXT)
diff --git a/configs/ea3152/src/ea3152_internal.h b/configs/ea3152/src/ea3152_internal.h
index f55bbd173b..b9e0eecb38 100644
--- a/configs/ea3152/src/ea3152_internal.h
+++ b/configs/ea3152/src/ea3152_internal.h
@@ -1,6 +1,5 @@
 /************************************************************************************
  * configs/ea3152/src/ea3152_internal.h
- * arch/arm/src/board/ea3152_internal.n
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +47,7 @@
 #include "lpc31_ioconfig.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* EA3152L GPIOs ********************************************************************/
@@ -87,7 +86,7 @@
  ************************************************************************************/
 
 #ifdef CONFIG_LPC31_EXTDRAM
-extern void lpc31_meminitialize(void);
+void lpc31_meminitialize(void);
 #endif
 
 /************************************************************************************
@@ -98,7 +97,7 @@ extern void lpc31_meminitialize(void);
  *
  ************************************************************************************/
 
-extern void weak_function lpc31_spiinitialize(void);
+void weak_function lpc31_spiinitialize(void);
 
 /************************************************************************************
  * Name: lpc31_usbinitialize
@@ -108,7 +107,7 @@ extern void weak_function lpc31_spiinitialize(void);
  *
  ************************************************************************************/
 
-extern void weak_function lpc31_usbinitialize(void);
+void weak_function lpc31_usbinitialize(void);
 
 /************************************************************************************
  * Name: lpc31_pginitialize
@@ -119,9 +118,8 @@ extern void weak_function lpc31_usbinitialize(void);
  ************************************************************************************/
 
 #ifdef CONFIG_PAGING
-extern void weak_function lpc31_pginitialize(void);
+void weak_function lpc31_pginitialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_EA3152_SRC_EA3152_INTERNAL_H */
-
diff --git a/configs/ea3152/src/up_boot.c b/configs/ea3152/src/lpc31_boot.c
similarity index 99%
rename from configs/ea3152/src/up_boot.c
rename to configs/ea3152/src/lpc31_boot.c
index 4b289aec36..6d845062fb 100644
--- a/configs/ea3152/src/up_boot.c
+++ b/configs/ea3152/src/lpc31_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/ea3152/src/up_boot.c
+ * configs/ea3152/src/lpc31_boot.c
  *
  *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ea3152/src/up_buttons.c b/configs/ea3152/src/lpc31_buttons.c
similarity index 98%
rename from configs/ea3152/src/up_buttons.c
rename to configs/ea3152/src/lpc31_buttons.c
index 970ae548e4..a1069e0fc7 100644
--- a/configs/ea3152/src/up_buttons.c
+++ b/configs/ea3152/src/lpc31_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ea3152/src/up_leds.c
+ * configs/ea3152/src/lpc31_buttons.c
  *
  *   Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ea3152/src/up_clkinit.c b/configs/ea3152/src/lpc31_clkinit.c
similarity index 99%
rename from configs/ea3152/src/up_clkinit.c
rename to configs/ea3152/src/lpc31_clkinit.c
index 53c76dbc38..200ddf3b1b 100644
--- a/configs/ea3152/src/up_clkinit.c
+++ b/configs/ea3152/src/lpc31_clkinit.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/ea3152/src/up_clkinit.c
- * arch/arm/src/board/up_clkinit.c
+ * configs/ea3152/src/lpc31_clkinit.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +47,7 @@
 #include "lpc31_cgudrvr.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Sub-domain Clock Bitsets *************************************************/
@@ -429,7 +428,6 @@ const struct lpc31_clkinit_s g_boardclks =
 #endif
 };
 
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
diff --git a/configs/ea3152/src/up_fillpage.c b/configs/ea3152/src/lpc31_fillpage.c
similarity index 99%
rename from configs/ea3152/src/up_fillpage.c
rename to configs/ea3152/src/lpc31_fillpage.c
index 151d77533b..6ac24b688b 100644
--- a/configs/ea3152/src/up_fillpage.c
+++ b/configs/ea3152/src/lpc31_fillpage.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/ea3152/src/up_fillpage.c
- * arch/arm/src/board/up_fillpage.c
+ * configs/ea3152/src/lpc31_fillpage.c
  *
  *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -70,7 +69,7 @@
 #endif
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/
@@ -391,7 +390,7 @@ static inline void lpc31_initsrc(void)
  *
  * Assumptions:
  *   - This function is called from the normal tasking context (but
- *     interrupts siabled).  The implementation must take whatever actions
+ *     interrupts disabled).  The implementation must take whatever actions
  *     are necessary to assure that the operation is safe within this context.
  *   - Upon return, the caller will sleep waiting for the page fill callback
  *     to occur.  The callback function will perform the wakeup.
diff --git a/configs/ea3152/src/up_leds.c b/configs/ea3152/src/lpc31_leds.c
similarity index 98%
rename from configs/ea3152/src/up_leds.c
rename to configs/ea3152/src/lpc31_leds.c
index 2f5232437d..cdc1d55131 100644
--- a/configs/ea3152/src/up_leds.c
+++ b/configs/ea3152/src/lpc31_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ea3152/src/up_leds.c
+ * configs/ea3152/src/lpc31_leds.c
  *
  *   Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +52,7 @@
 #include "lpc31_internal.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
diff --git a/configs/ea3152/src/up_mem.c b/configs/ea3152/src/lpc31_mem.c
similarity index 99%
rename from configs/ea3152/src/up_mem.c
rename to configs/ea3152/src/lpc31_mem.c
index 234a4a9fc7..841e178171 100644
--- a/configs/ea3152/src/up_mem.c
+++ b/configs/ea3152/src/lpc31_mem.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/ea3152/src/up_mem.c
- * arch/arm/src/board/up_mem.c
+ * configs/ea3152/src/lpc31_mem.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ea3152/src/up_nsh.c b/configs/ea3152/src/lpc31_nsh.c
similarity index 98%
rename from configs/ea3152/src/up_nsh.c
rename to configs/ea3152/src/lpc31_nsh.c
index 8e0815860a..4d3ccd5d88 100644
--- a/configs/ea3152/src/up_nsh.c
+++ b/configs/ea3152/src/lpc31_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/ea3152/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/ea3152/src/lpc31_nsh.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ea3152/src/up_spi.c b/configs/ea3152/src/lpc31_spi.c
similarity index 98%
rename from configs/ea3152/src/up_spi.c
rename to configs/ea3152/src/lpc31_spi.c
index d26a683d30..7c7d563b01 100644
--- a/configs/ea3152/src/up_spi.c
+++ b/configs/ea3152/src/lpc31_spi.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/ea3152/src/up_spi.c
- * arch/arm/src/board/up_spi.c
+ * configs/ea3152/src/lpc31_spi.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -57,7 +56,7 @@
        * in arch/arm/src/lpc31xx */
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* Enables debug output from this file (needs CONFIG_DEBUG too) */
@@ -139,4 +138,3 @@ uint8_t lpc31_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
 #endif /* 0 */
 #endif /* CONFIG_LPC31_SPI  */
-
diff --git a/configs/ea3152/src/up_usbmsc.c b/configs/ea3152/src/lpc31_usbmsc.c
similarity index 98%
rename from configs/ea3152/src/up_usbmsc.c
rename to configs/ea3152/src/lpc31_usbmsc.c
index cec8dc63bc..81c058f1b6 100644
--- a/configs/ea3152/src/up_usbmsc.c
+++ b/configs/ea3152/src/lpc31_usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/ea3152/src/up_usbmsc.c
+ * configs/ea3152/src/lpc31_usbmsc.c
  *
  *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +52,7 @@
 #include <nuttx/fs/ramdisk.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/