From 88efd30570152c127a3890b059858b1b6341ea84 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Tue, 19 May 2009 18:46:14 +0000
Subject: [PATCH] Make sure all ARM targets still compile
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1798 42af7a65-404d-4744-a932-0658087f49c3
---
arch/arm/src/arm/up_head.S | 2 +
arch/arm/src/arm/up_initialstate.c | 1 +
arch/arm/src/arm/up_nommuhead.S | 2 +
arch/arm/src/arm/up_schedulesigaction.c | 1 +
arch/arm/src/arm/up_sigdeliver.c | 2 +-
arch/arm/src/arm/up_vectors.S | 1 +
arch/arm/src/c5471/c5471_irq.c | 67 +++++++++++++------------
arch/arm/src/c5471/c5471_vectors.S | 4 +-
arch/arm/src/dm320/dm320_boot.c | 6 ++-
arch/arm/src/dm320/dm320_irq.c | 8 +--
arch/arm/src/dm320/dm320_restart.S | 6 ++-
arch/arm/src/imx/imx_memorymap.h | 2 +
arch/arm/src/lpc214x/lpc214x_head.S | 4 +-
arch/arm/src/lpc214x/lpc214x_irq.c | 5 +-
arch/arm/src/str71x/str71x_head.S | 1 +
arch/arm/src/str71x/str71x_irq.c | 3 +-
arch/arm/src/str71x/str71x_serial.c | 4 +-
17 files changed, 72 insertions(+), 47 deletions(-)
diff --git a/arch/arm/src/arm/up_head.S b/arch/arm/src/arm/up_head.S
index dda8566d38..f5f34d04ad 100644
--- a/arch/arm/src/arm/up_head.S
+++ b/arch/arm/src/arm/up_head.S
@@ -38,6 +38,8 @@
****************************************************************************/
#include <nuttx/config.h>
+
+#include "arm.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/arm/up_initialstate.c b/arch/arm/src/arm/up_initialstate.c
index deed07209b..2ba6834454 100644
--- a/arch/arm/src/arm/up_initialstate.c
+++ b/arch/arm/src/arm/up_initialstate.c
@@ -43,6 +43,7 @@
#include <nuttx/arch.h>
+#include "arm.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/arm/up_nommuhead.S b/arch/arm/src/arm/up_nommuhead.S
index 05c5cf9e64..509985296b 100644
--- a/arch/arm/src/arm/up_nommuhead.S
+++ b/arch/arm/src/arm/up_nommuhead.S
@@ -38,6 +38,8 @@
****************************************************************************/
#include <nuttx/config.h>
+
+#include "arm.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/arm/up_schedulesigaction.c b/arch/arm/src/arm/up_schedulesigaction.c
index af536bd079..091c5a400a 100644
--- a/arch/arm/src/arm/up_schedulesigaction.c
+++ b/arch/arm/src/arm/up_schedulesigaction.c
@@ -45,6 +45,7 @@
#include <nuttx/arch.h>
+#include "arm.h"
#include "os_internal.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/arm/up_sigdeliver.c b/arch/arm/src/arm/up_sigdeliver.c
index 8b12a88cc3..8d1601aeae 100644
--- a/arch/arm/src/arm/up_sigdeliver.c
+++ b/arch/arm/src/arm/up_sigdeliver.c
@@ -137,7 +137,7 @@ void up_sigdeliver(void)
up_ledoff(LED_SIGNAL);
up_fullcontextrestore(regs);
-\}
+}
#endif /* !CONFIG_DISABLE_SIGNALS */
diff --git a/arch/arm/src/arm/up_vectors.S b/arch/arm/src/arm/up_vectors.S
index a084b8594c..987b875ce1 100644
--- a/arch/arm/src/arm/up_vectors.S
+++ b/arch/arm/src/arm/up_vectors.S
@@ -40,6 +40,7 @@
#include <nuttx/config.h>
#include <nuttx/irq.h>
+#include "arm.h"
#include "up_arch.h"
/************************************************************************************
diff --git a/arch/arm/src/c5471/c5471_irq.c b/arch/arm/src/c5471/c5471_irq.c
index a9ab7b1660..08b76d3e71 100644
--- a/arch/arm/src/c5471/c5471_irq.c
+++ b/arch/arm/src/c5471/c5471_irq.c
@@ -1,7 +1,7 @@
-/************************************************************
- * c5471/c5471_irq.c
+/****************************************************************************
+ * arch/arm/src/c5471/c5471_irq.c
*
- * Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007, 2009 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,35 +31,38 @@
* 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>
+
#include <nuttx/irq.h>
+
+#include "arm.h"
#include "up_arch.h"
#include "os_internal.h"
#include "up_internal.h"
-/************************************************************
+/****************************************************************************
* Definitions
- ************************************************************/
+ ****************************************************************************/
#define ILR_EDGESENSITIVE 0x00000020
#define ILR_PRIORITY 0x0000001E
-/************************************************************
+/****************************************************************************
* Public Data
- ************************************************************/
+ ****************************************************************************/
uint32 *current_regs;
-/************************************************************
+/****************************************************************************
* Private Data
- ************************************************************/
+ ****************************************************************************/
/* The value of _vflashstart is defined in ld.script. It
* could be hard-coded because we know that correct IRAM
@@ -87,11 +90,11 @@ static up_vector_t g_vectorinittab[] =
};
#define NVECTORS ((sizeof(g_vectorinittab)) / sizeof(up_vector_t))
-/************************************************************
+/****************************************************************************
* Private Functions
- ************************************************************/
+ ****************************************************************************/
-/************************************************************
+/****************************************************************************
* Name: up_ackirq
*
* Description:
@@ -100,7 +103,7 @@ static up_vector_t g_vectorinittab[] =
* output. Clear source IRQ register. Enables a new IRQ
* generation. Reset by internal logic.
*
- ************************************************************/
+ ****************************************************************************/
static inline void up_ackirq(unsigned int irq)
{
@@ -109,7 +112,7 @@ static inline void up_ackirq(unsigned int irq)
putreg32(reg | 0x00000001, INT_CTRL_REG); /* write the NEW_IRQ_AGR bit. */
}
-/************************************************************
+/****************************************************************************
* Name: up_ackfiq
*
* Description:
@@ -118,7 +121,7 @@ static inline void up_ackirq(unsigned int irq)
* output. Clear source FIQ register. Enables a new FIQ
* generation. Reset by internal logic.
*
- ************************************************************/
+ ****************************************************************************/
static inline void up_ackfiq(unsigned int irq)
{
@@ -127,9 +130,9 @@ static inline void up_ackfiq(unsigned int irq)
putreg32(reg | 0x00000002, INT_CTRL_REG); /* write the NEW_FIQ_AGR bit. */
}
-/************************************************************
+/****************************************************************************
* Name: up_vectorinitialize
- ************************************************************/
+ ****************************************************************************/
static inline void up_vectorinitialize(void)
{
@@ -143,13 +146,13 @@ static inline void up_vectorinitialize(void)
}
}
-/************************************************************
- * Public Funtions
- ************************************************************/
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
-/************************************************************
+/****************************************************************************
* Name: up_irqinitialize
- ************************************************************/
+ ****************************************************************************/
void up_irqinitialize(void)
{
@@ -182,13 +185,13 @@ void up_irqinitialize(void)
#endif
}
-/************************************************************
+/****************************************************************************
* Name: up_disable_irq
*
* Description:
* Disable the IRQ specified by 'irq'
*
- ************************************************************/
+ ****************************************************************************/
void up_disable_irq(int irq)
{
@@ -199,13 +202,13 @@ void up_disable_irq(int irq)
}
}
-/************************************************************
+/****************************************************************************
* Name: up_enable_irq
*
* Description:
* Enable the IRQ specified by 'irq'
*
- ************************************************************/
+ ****************************************************************************/
void up_enable_irq(int irq)
{
@@ -216,13 +219,13 @@ void up_enable_irq(int irq)
}
}
-/************************************************************
+/****************************************************************************
* Name: up_maskack_irq
*
* Description:
* Mask the IRQ and acknowledge it
*
- ************************************************************/
+ ****************************************************************************/
void up_maskack_irq(int irq)
{
diff --git a/arch/arm/src/c5471/c5471_vectors.S b/arch/arm/src/c5471/c5471_vectors.S
index f846477078..0176c8aedd 100644
--- a/arch/arm/src/c5471/c5471_vectors.S
+++ b/arch/arm/src/c5471/c5471_vectors.S
@@ -1,7 +1,7 @@
/************************************************************************************
* arch/arm/src/c5471/c5471_vectors.S
*
- * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,8 @@
#include <nuttx/config.h>
#include <nuttx/irq.h>
+
+#include "arm.h"
#include "up_arch.h"
/************************************************************************************
diff --git a/arch/arm/src/dm320/dm320_boot.c b/arch/arm/src/dm320/dm320_boot.c
index 46a39dfd20..9d7cb1a95c 100644
--- a/arch/arm/src/dm320/dm320_boot.c
+++ b/arch/arm/src/dm320/dm320_boot.c
@@ -1,7 +1,7 @@
/************************************************************************************
- * dm320/dm320_boot.c
+ * arch/arm/src/dm320/dm320_boot.c
*
- * Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,8 @@
#include <nuttx/config.h>
#include <sys/types.h>
+
+#include "arm.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/dm320/dm320_irq.c b/arch/arm/src/dm320/dm320_irq.c
index 692d06a980..84e0efcf5a 100644
--- a/arch/arm/src/dm320/dm320_irq.c
+++ b/arch/arm/src/dm320/dm320_irq.c
@@ -1,7 +1,7 @@
/************************************************************
- * dm320/dm320_irq.c
+ * arch/arm/src/dm320/dm320_irq.c
*
- * Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -40,6 +40,8 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <nuttx/irq.h>
+
+#include "arm.h"
#include "up_arch.h"
#include "os_internal.h"
#include "up_internal.h"
@@ -70,7 +72,7 @@ extern int _svectors; /* Type does not matter */
************************************************************/
/************************************************************
- * Public Funtions
+ * Public Functions
************************************************************/
/************************************************************
diff --git a/arch/arm/src/dm320/dm320_restart.S b/arch/arm/src/dm320/dm320_restart.S
index 1ce9e373f4..5990605c70 100644
--- a/arch/arm/src/dm320/dm320_restart.S
+++ b/arch/arm/src/dm320/dm320_restart.S
@@ -1,7 +1,7 @@
/********************************************************************
- * dm320/dm320_restart.S
+ * arch/arm/src/dm320/dm320_restart.S
*
- * Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,8 @@
********************************************************************/
#include <nuttx/config.h>
+
+#include "arm.h"
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/imx/imx_memorymap.h b/arch/arm/src/imx/imx_memorymap.h
index c25b44b9bb..23a88d2b56 100644
--- a/arch/arm/src/imx/imx_memorymap.h
+++ b/arch/arm/src/imx/imx_memorymap.h
@@ -40,6 +40,8 @@
* Included Files
************************************************************************************/
+#include "arm.h"
+
/************************************************************************************
* Definitions
************************************************************************************/
diff --git a/arch/arm/src/lpc214x/lpc214x_head.S b/arch/arm/src/lpc214x/lpc214x_head.S
index 58b852e606..042262ca91 100644
--- a/arch/arm/src/lpc214x/lpc214x_head.S
+++ b/arch/arm/src/lpc214x/lpc214x_head.S
@@ -1,7 +1,7 @@
/*****************************************************************************
* arch/arm/src/lpc214x/lpc214x_head.S
*
- * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -40,6 +40,8 @@
#include <nuttx/config.h>
#include <arch/board/board.h>
+
+#include "arm.h"
#include "chip.h"
#include "lpc214x_pll.h"
#include "lpc214x_apb.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_irq.c b/arch/arm/src/lpc214x/lpc214x_irq.c
index 1bfd6bba0f..04668536aa 100644
--- a/arch/arm/src/lpc214x/lpc214x_irq.c
+++ b/arch/arm/src/lpc214x/lpc214x_irq.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/lpc214x/lpc214x_irq.c
*
- * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
#include <debug.h>
#include <nuttx/irq.h>
+#include "arm.h"
#include "up_arch.h"
#include "os_internal.h"
#include "up_internal.h"
@@ -66,7 +67,7 @@ uint32 *current_regs;
****************************************************************************/
/****************************************************************************
- * Public Funtions
+ * Public Functions
****************************************************************************/
/****************************************************************************
diff --git a/arch/arm/src/str71x/str71x_head.S b/arch/arm/src/str71x/str71x_head.S
index 22164f198f..2e5eaef5c3 100644
--- a/arch/arm/src/str71x/str71x_head.S
+++ b/arch/arm/src/str71x/str71x_head.S
@@ -39,6 +39,7 @@
#include <nuttx/config.h> /* NuttX configuration settings */
#include <arch/board/board.h> /* Board-specific settings */
+
#include "arm.h" /* ARM-specific settings */
#include "chip.h" /* Chip-specific settings */
#include "up_internal.h"
diff --git a/arch/arm/src/str71x/str71x_irq.c b/arch/arm/src/str71x/str71x_irq.c
index db2ea57aa1..6abbd27d9c 100644
--- a/arch/arm/src/str71x/str71x_irq.c
+++ b/arch/arm/src/str71x/str71x_irq.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/st71x/st71x_irq.c
*
- * Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
#include <errno.h>
#include <nuttx/irq.h>
+#include "arm.h"
#include "up_arch.h"
#include "up_internal.h"
#include "chip.h"
diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c
index 1d4a28f75c..2b816101c6 100644
--- a/arch/arm/src/str71x/str71x_serial.c
+++ b/arch/arm/src/str71x/str71x_serial.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/str71x/str71x_serial.c
*
- * Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@
/* Is there a UART enabled? */
#if !defined(CONFIG_STR71X_UART0) && !defined(CONFIG_STR71X_UART1) && \
- !defined(CONFIG_STR71X_UART2) && !defined(CONFIG_STR71X_UART3))
+ !defined(CONFIG_STR71X_UART2) && !defined(CONFIG_STR71X_UART3)
# error "No UARTs enabled"
#endif
--
GitLab