summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-03-21 14:18:32 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-03-21 14:18:32 -0600
commite1090a70881a57333c5863f1f67f39280236a0ea (patch)
tree8c6a5fed0acab21090566a431d96846d3a03d34d
parentde84763829814683d57589988535e6dee5d4b1bb (diff)
downloadpx4-nuttx-e1090a70881a57333c5863f1f67f39280236a0ea.tar.gz
px4-nuttx-e1090a70881a57333c5863f1f67f39280236a0ea.tar.bz2
px4-nuttx-e1090a70881a57333c5863f1f67f39280236a0ea.zip
EA3152: Rename files for better conformance to naming conventions
-rw-r--r--nuttx/configs/ea3152/src/Makefile38
-rw-r--r--nuttx/configs/ea3152/src/ea3152_internal.h12
-rw-r--r--nuttx/configs/ea3152/src/lpc31_boot.c (renamed from nuttx/configs/ea3152/src/up_boot.c)2
-rw-r--r--nuttx/configs/ea3152/src/lpc31_buttons.c (renamed from nuttx/configs/ea3152/src/up_buttons.c)2
-rw-r--r--nuttx/configs/ea3152/src/lpc31_clkinit.c (renamed from nuttx/configs/ea3152/src/up_clkinit.c)6
-rw-r--r--nuttx/configs/ea3152/src/lpc31_fillpage.c (renamed from nuttx/configs/ea3152/src/up_fillpage.c)7
-rw-r--r--nuttx/configs/ea3152/src/lpc31_leds.c (renamed from nuttx/configs/ea3152/src/up_leds.c)4
-rw-r--r--nuttx/configs/ea3152/src/lpc31_mem.c (renamed from nuttx/configs/ea3152/src/up_mem.c)3
-rw-r--r--nuttx/configs/ea3152/src/lpc31_nsh.c (renamed from nuttx/configs/ea3152/src/up_nsh.c)3
-rw-r--r--nuttx/configs/ea3152/src/lpc31_spi.c (renamed from nuttx/configs/ea3152/src/up_spi.c)6
-rw-r--r--nuttx/configs/ea3152/src/lpc31_usbmsc.c (renamed from nuttx/configs/ea3152/src/up_usbmsc.c)4
11 files changed, 39 insertions, 48 deletions
diff --git a/nuttx/configs/ea3152/src/Makefile b/nuttx/configs/ea3152/src/Makefile
index b5d743e2d..01afcb5e7 100644
--- a/nuttx/configs/ea3152/src/Makefile
+++ b/nuttx/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/nuttx/configs/ea3152/src/ea3152_internal.h b/nuttx/configs/ea3152/src/ea3152_internal.h
index f55bbd173..b9e0eecb3 100644
--- a/nuttx/configs/ea3152/src/ea3152_internal.h
+++ b/nuttx/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/nuttx/configs/ea3152/src/up_boot.c b/nuttx/configs/ea3152/src/lpc31_boot.c
index 4b289aec3..6d845062f 100644
--- a/nuttx/configs/ea3152/src/up_boot.c
+++ b/nuttx/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/nuttx/configs/ea3152/src/up_buttons.c b/nuttx/configs/ea3152/src/lpc31_buttons.c
index 970ae548e..a1069e0fc 100644
--- a/nuttx/configs/ea3152/src/up_buttons.c
+++ b/nuttx/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/nuttx/configs/ea3152/src/up_clkinit.c b/nuttx/configs/ea3152/src/lpc31_clkinit.c
index 53c76dbc3..200ddf3b1 100644
--- a/nuttx/configs/ea3152/src/up_clkinit.c
+++ b/nuttx/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/nuttx/configs/ea3152/src/up_fillpage.c b/nuttx/configs/ea3152/src/lpc31_fillpage.c
index 151d77533..6ac24b688 100644
--- a/nuttx/configs/ea3152/src/up_fillpage.c
+++ b/nuttx/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/nuttx/configs/ea3152/src/up_leds.c b/nuttx/configs/ea3152/src/lpc31_leds.c
index 2f5232437..cdc1d5513 100644
--- a/nuttx/configs/ea3152/src/up_leds.c
+++ b/nuttx/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/nuttx/configs/ea3152/src/up_mem.c b/nuttx/configs/ea3152/src/lpc31_mem.c
index 234a4a9fc..841e17817 100644
--- a/nuttx/configs/ea3152/src/up_mem.c
+++ b/nuttx/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/nuttx/configs/ea3152/src/up_nsh.c b/nuttx/configs/ea3152/src/lpc31_nsh.c
index 8e0815860..4d3ccd5d8 100644
--- a/nuttx/configs/ea3152/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/ea3152/src/up_spi.c b/nuttx/configs/ea3152/src/lpc31_spi.c
index d26a683d3..7c7d563b0 100644
--- a/nuttx/configs/ea3152/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/ea3152/src/up_usbmsc.c b/nuttx/configs/ea3152/src/lpc31_usbmsc.c
index cec8dc63b..81c058f1b 100644
--- a/nuttx/configs/ea3152/src/up_usbmsc.c
+++ b/nuttx/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 ************************************************************/