[rtems commit] arm: Move prototypes to new file
Sebastian Huber
sebh at rtems.org
Mon Jan 7 14:05:03 UTC 2013
Module: rtems
Branch: master
Commit: 9b2e714322d80583c4b1d482503457db733f00c5
Changeset: http://git.rtems.org/rtems/commit/?id=9b2e714322d80583c4b1d482503457db733f00c5
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Fri Jan 4 13:05:28 2013 +0100
arm: Move prototypes to new file
Move bsp_interrupt_dispatch() and arm_exc_interrupt() prototypes to new
file <rtems/score/armv4.h> since they have nothing to do with the CPU
port.
---
c/src/lib/libbsp/arm/edb7312/irq/irq.c | 2 +
c/src/lib/libbsp/arm/lpc24xx/irq/irq.c | 1 +
c/src/lib/libbsp/arm/lpc32xx/irq/irq.c | 2 +
c/src/lib/libcpu/arm/at91rm9200/irq/irq.c | 2 +
c/src/lib/libcpu/arm/lpc22xx/irq/irq.c | 2 +
c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c | 2 +
c/src/lib/libcpu/arm/pxa255/irq/irq.c | 2 +
c/src/lib/libcpu/arm/s3c24xx/irq/irq.c | 2 +
cpukit/score/cpu/arm/Makefile.am | 1 +
cpukit/score/cpu/arm/preinstall.am | 4 +++
cpukit/score/cpu/arm/rtems/score/armv4.h | 36 +++++++++++++++++++++++++++++
cpukit/score/cpu/arm/rtems/score/cpu.h | 4 ---
12 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/c/src/lib/libbsp/arm/edb7312/irq/irq.c b/c/src/lib/libbsp/arm/edb7312/irq/irq.c
index a345d1b..afe22b9 100644
--- a/c/src/lib/libbsp/arm/edb7312/irq/irq.c
+++ b/c/src/lib/libbsp/arm/edb7312/irq/irq.c
@@ -12,6 +12,8 @@
* http://www.rtems.com/license/LICENSE.
*/
+#include <rtems/score/armv4.h>
+
#include <bsp.h>
#include <bsp/irq.h>
#include <bsp/irq-generic.h>
diff --git a/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c b/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c
index f99ce46..e1332a9 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c
+++ b/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c
@@ -20,6 +20,7 @@
* http://www.rtems.com/license/LICENSE.
*/
+#include <rtems/score/armv4.h>
#include <rtems/score/armv7m.h>
#include <bsp.h>
diff --git a/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c b/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c
index b53b9f4..14505a3 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c
+++ b/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c
@@ -19,6 +19,8 @@
* http://www.rtems.com/license/LICENSE.
*/
+#include <rtems/score/armv4.h>
+
#include <bsp.h>
#include <bsp/irq.h>
#include <bsp/irq-generic.h>
diff --git a/c/src/lib/libcpu/arm/at91rm9200/irq/irq.c b/c/src/lib/libcpu/arm/at91rm9200/irq/irq.c
index 8ef6775..fc136de 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/irq/irq.c
+++ b/c/src/lib/libcpu/arm/at91rm9200/irq/irq.c
@@ -10,6 +10,8 @@
* http://www.rtems.com/license/LICENSE.
*/
+#include <rtems/score/armv4.h>
+
#include <bsp.h>
#include <bsp/irq.h>
#include <bsp/irq-generic.h>
diff --git a/c/src/lib/libcpu/arm/lpc22xx/irq/irq.c b/c/src/lib/libcpu/arm/lpc22xx/irq/irq.c
index acb25dc..bbebdf9 100644
--- a/c/src/lib/libcpu/arm/lpc22xx/irq/irq.c
+++ b/c/src/lib/libcpu/arm/lpc22xx/irq/irq.c
@@ -9,6 +9,8 @@
* http://www.rtems.com/license/LICENSE.
*/
+#include <rtems/score/armv4.h>
+
#include <bsp.h>
#include <bsp/irq.h>
#include <bsp/irq-generic.h>
diff --git a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c b/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c
index a7e5b67..5209148 100644
--- a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c
+++ b/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c
@@ -10,6 +10,8 @@
* http://www.rtems.com/license/LICENSE.
*/
+#include <rtems/score/armv4.h>
+
#include <bsp.h>
#include <bsp/irq.h>
#include <bsp/irq-generic.h>
diff --git a/c/src/lib/libcpu/arm/pxa255/irq/irq.c b/c/src/lib/libcpu/arm/pxa255/irq/irq.c
index 214fb3c..376a157 100644
--- a/c/src/lib/libcpu/arm/pxa255/irq/irq.c
+++ b/c/src/lib/libcpu/arm/pxa255/irq/irq.c
@@ -9,6 +9,8 @@
* http://www.rtems.com/license/LICENSE.
*/
+#include <rtems/score/armv4.h>
+
#include <bsp.h>
#include <bsp/irq.h>
#include <bsp/irq-generic.h>
diff --git a/c/src/lib/libcpu/arm/s3c24xx/irq/irq.c b/c/src/lib/libcpu/arm/s3c24xx/irq/irq.c
index 9aa9793..d0877a1 100644
--- a/c/src/lib/libcpu/arm/s3c24xx/irq/irq.c
+++ b/c/src/lib/libcpu/arm/s3c24xx/irq/irq.c
@@ -12,6 +12,8 @@
* http://www.rtems.com/license/LICENSE.
*/
+#include <rtems/score/armv4.h>
+
#include <bsp.h>
#include <bsp/irq.h>
#include <bsp/irq-generic.h>
diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am
index f0ddbd6..b084e7a 100644
--- a/cpukit/score/cpu/arm/Makefile.am
+++ b/cpukit/score/cpu/arm/Makefile.am
@@ -6,6 +6,7 @@ include_rtems_scoredir = $(includedir)/rtems/score
include_rtems_score_HEADERS = rtems/score/cpu.h
include_rtems_score_HEADERS += rtems/score/cpu_asm.h
include_rtems_score_HEADERS += rtems/score/arm.h
+include_rtems_score_HEADERS += rtems/score/armv4.h
include_rtems_score_HEADERS += rtems/score/armv7m.h
include_rtems_score_HEADERS += rtems/score/types.h
diff --git a/cpukit/score/cpu/arm/preinstall.am b/cpukit/score/cpu/arm/preinstall.am
index 92ba468..fb8881d 100644
--- a/cpukit/score/cpu/arm/preinstall.am
+++ b/cpukit/score/cpu/arm/preinstall.am
@@ -39,6 +39,10 @@ $(PROJECT_INCLUDE)/rtems/score/arm.h: rtems/score/arm.h $(PROJECT_INCLUDE)/rtems
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/arm.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/arm.h
+$(PROJECT_INCLUDE)/rtems/score/armv4.h: rtems/score/armv4.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/armv4.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/armv4.h
+
$(PROJECT_INCLUDE)/rtems/score/armv7m.h: rtems/score/armv7m.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/armv7m.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/armv7m.h
diff --git a/cpukit/score/cpu/arm/rtems/score/armv4.h b/cpukit/score/cpu/arm/rtems/score/armv4.h
new file mode 100644
index 0000000..9204c73
--- /dev/null
+++ b/cpukit/score/cpu/arm/rtems/score/armv4.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2013 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Dornierstr. 4
+ * 82178 Puchheim
+ * Germany
+ * <rtems at embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ */
+
+#ifndef RTEMS_SCORE_ARMV4_H
+#define RTEMS_SCORE_ARMV4_H
+
+#include <rtems/score/cpu.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifdef ARM_MULTILIB_ARCH_V4
+
+void bsp_interrupt_dispatch( void );
+
+void arm_exc_interrupt( void );
+
+#endif /* ARM_MULTILIB_ARCH_V4 */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* RTEMS_SCORE_ARMV4_H */
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h
index ea41dfe..935dcd2 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/rtems/score/cpu.h
@@ -566,10 +566,6 @@ void arm_exc_prefetch_abort_set_handler( arm_exc_abort_handler handler );
void arm_exc_prefetch_abort( void );
-void bsp_interrupt_dispatch( void );
-
-void arm_exc_interrupt( void );
-
/** @} */
/* XXX This is out of date */
More information about the vc
mailing list