Update lpc214x stuff

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@923 42af7a65-404d-4744-a932-0658087f49c3

10 files changed, 60 insertions, 63 deletions

diff --git a/nuttx/arch/arm/src/lpc214x/Make.defs b/nuttx/arch/arm/src/lpc214x/Make.defs
index 1211e3c12..40b0c4430 100644
--- a/nuttx/arch/arm/src/lpc214x/Make.defs
+++ b/nuttx/arch/arm/src/lpc214x/Make.defs
@@ -1,7 +1,7 @@
-############################################################################
+##############################################################################
 # lpc214x/Make.defs
 #
-#   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
 #    notice, this list of conditions and the following disclaimer in
 #    the documentation and/or other materials provided with the
 #    distribution.
-# 3. Neither the name Gregory Nutt nor the names of its contributors may be
+# 3. Neither the name NuttX nor the names of its contributors may be
 #    used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
@@ -31,7 +31,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-############################################################################
+##############################################################################
 
 HEAD_ASRC	= lpc214x_head.S
 
diff --git a/nuttx/arch/arm/src/lpc214x/chip.h b/nuttx/arch/arm/src/lpc214x/chip.h
index 56089cf1d..d237b39cc 100644
--- a/nuttx/arch/arm/src/lpc214x/chip.h
+++ b/nuttx/arch/arm/src/lpc214x/chip.h
@@ -1,7 +1,7 @@
 /****************************************************************************************************
- * lpc214x/chip.h
+ * arch/arm/src/lpc214x/chip.h
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_decodeirq.c b/nuttx/arch/arm/src/lpc214x/lpc214x_decodeirq.c
index 88fc06499..6ee78e68c 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_decodeirq.c
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_decodeirq.c
@@ -1,7 +1,7 @@
 /********************************************************************************
- * lpc214x/lpc214x_decodeirq.c
+ * arch/arm/src/lpc214x/lpc214x_decodeirq.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_head.S b/nuttx/arch/arm/src/lpc214x/lpc214x_head.S
index 8bae66ef2..15939a3ad 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_head.S
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_head.S
@@ -1,7 +1,7 @@
-/********************************************************************
- * lpc214x/lpc214x_head.S
+/*****************************************************************************
+ * arch/arm/src/lpc214x/lpc214x_head.S
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,19 +31,19 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ********************************************************************/
+ *****************************************************************************/
 
-/********************************************************************
+/*****************************************************************************
  * Included Files
- ********************************************************************/
+ *****************************************************************************/
 
 #include <nuttx/config.h>
 #include "up_internal.h"
 #include "up_arch.h"
 
-/********************************************************************
+/*****************************************************************************
  * Definitions
- ********************************************************************/
+ *****************************************************************************/
 
 /* This file holds the NuttX start logic that runs when the LPC2148
  * is reset.  This logic must be located at address 0x0000:0000 in
@@ -199,9 +199,9 @@
 #  define CONFIG_PINSEL2_VALUE 0x0e6149e4
 #endif
 
-/********************************************************************
+/*****************************************************************************
  * Macros
- ********************************************************************/
+ *****************************************************************************/
 
 /* Print a character on the UART to show boot status. This macro will
  * modify r0, r1, r2 and r14
@@ -332,13 +332,13 @@
 #endif
 	.endm
 
-/********************************************************************
+/*****************************************************************************
  * Text
- ********************************************************************/
+ *****************************************************************************/
 
 	.text
 
-/********************************************************************
+/*****************************************************************************
  * Name: _vector_table
  *
  * Description:
@@ -347,7 +347,7 @@
  *   the vector table is the reset vector and this is the code that
  *   will execute whn the processor is reset.
  *
- ********************************************************************/
+ *****************************************************************************/
 
 	.globl	_vector_table
 	.type	_vector_table, %function
@@ -357,7 +357,7 @@ _vector_table:
 	ldr	pc, .Lswihandler		/* 0x08: Software interrupt */
 	ldr	pc, .Lprefetchaborthandler	/* 0x0c: Prefetch abort */
 	ldr	pc, .Ldataaborthandler		/* 0x10: Data abort */
-	ldr	pc, .Laddrexcptnhandler		/* 0x14: Address exception */
+	.long	0				/* 0x14: Vector checksum */
 	ldr	pc, .Lirqhandler		/* 0x18: IRQ */
 	ldr	pc, .Lfiqhandler		/* 0x1c: FIQ */
 
@@ -366,7 +366,6 @@ _vector_table:
 	.globl	up_vectorswi
 	.globl	up_vectorprefetch
 	.globl	up_vectordata
-	.globl	up_vectoraddrexcptn
 	.globl	up_vectorirq
 	.globl	up_vectorfiq
 
@@ -380,15 +379,13 @@ _vector_table:
 	.long	up_vectorprefetch
 .Ldataaborthandler:
 	.long	up_vectordata
-.Laddrexcptnhandler:
-	.long	up_vectoraddrexcptn
 .Lirqhandler:
 	.long	up_vectorirq
 .Lfiqhandler:
 	.long	up_vectorfiq
 	.size	_vector_table, . - _vector_table
 
-/********************************************************************
+/*****************************************************************************
  * Name: __start
  *
  * Description:
@@ -396,7 +393,7 @@ _vector_table:
  *   the processor is reset.  It initializes hardware and then gives
  *   control to NuttX.
  *
- ********************************************************************/
+ *****************************************************************************/
 
 	.global __start
 	.type	__start, #function
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_irq.c b/nuttx/arch/arm/src/lpc214x/lpc214x_irq.c
index 37609a6dd..96a40b0e2 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_irq.c
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_irq.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lpc214x/lpc214x_irq.c
+ * arch/arm/src/lpc214x/lpc214x_irq.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_lowputc.S b/nuttx/arch/arm/src/lpc214x/lpc214x_lowputc.S
index 5e74e4a4b..23258fce9 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_lowputc.S
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_lowputc.S
@@ -1,5 +1,5 @@
 /**************************************************************************
- * lpc214x/lpc214X_lowputc.S
+ * arch/arm/src/lpc214x/lpc214X_lowputc.S
  *
  *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_timer.h b/nuttx/arch/arm/src/lpc214x/lpc214x_timer.h
index f9cb91c5f..47adf9796 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_timer.h
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_timer.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * lpc214x/lpc214x_timer.h
+ * arch/arm/src/lpc214x/lpc214x_timer.h
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c b/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c
index 8308200ba..618e9b15d 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c
@@ -1,7 +1,7 @@
-/************************************************************
- * lpc214x/lpc214x_timerisr.c
+/****************************************************************************
+ * arch/arm/src/lpc214x/lpc214x_timerisr.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,11 +31,11 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Included Files
- ************************************************************/
+ ****************************************************************************/
 
 #include <nuttx/config.h>
 #include <sys/types.h>
@@ -50,9 +50,9 @@
 #include "lpc214x_timer.h"
 #include "lpc214x_vic.h"
 
-/************************************************************
+/****************************************************************************
  * Definitions
- ************************************************************/
+ ****************************************************************************/
 
 #define PCLKFREQ (LPC214X_FOSC/4) /* PCLK must be FOSC/4 */
 
@@ -64,26 +64,26 @@
 #define tmr_putreg16(o,v) putreg16((v), LPC214X_TMR0_BASE+(o))
 #define tmr_putreg32(o,v) putreg32((v), LPC214X_TMR0_BASE+(o))
 
-/************************************************************
+/****************************************************************************
  * Private Types
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Private Function Prototypes
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Global Functions
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Function:  up_timerisr
  *
  * Description:
  *   The timer ISR will perform a variety of services for
  *   various portions of the systems.
  *
- ************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_VECTORED_INTERRUPTS
 int up_timerisr(uint32 *regs)
@@ -107,14 +107,14 @@ int up_timerisr(int irq, uint32 *regs)
    return 0;
 }
 
-/************************************************************
+/****************************************************************************
  * Function:  up_timerinit
  *
  * Description:
  *   This function is called during start-up to initialize
  *   the timer interrupt.
  *
- ************************************************************/
+ ****************************************************************************/
 
 void up_timerinit(void)
 {
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_uart.h b/nuttx/arch/arm/src/lpc214x/lpc214x_uart.h
index 7e1533abe..e87c7cb28 100755
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_uart.h
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_uart.h
@@ -1,7 +1,7 @@
 /************************************************************************************

- * lpc214x/uart.h

+ * arch/arm/src/lpc214x/uart.h

  *

- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.

+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.

  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>

  *

  * Redistribution and use in source and binary forms, with or without

@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in

  *    the documentation and/or other materials provided with the

  *    distribution.

- * 3. Neither the name Gregory Nutt nor the names of its contributors may be

+ * 3. Neither the name NuttX nor the names of its contributors may be

  *    used to endorse or promote products derived from this software

  *    without specific prior written permission.

  *

diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_vic.h b/nuttx/arch/arm/src/lpc214x/lpc214x_vic.h
index 7fecd9a31..912019e28 100755
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_vic.h
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_vic.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * lpc214x/lpc214x_vic.h
+ * arch/arm/src/lpc214x/lpc214x_vic.h
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *