2004-04-22 Ralf Corsepius <ralf_corsepius@rtems.org>

	* include/bsp.h: Split out tmtest27 support.
	* include/tm27.h: New.

9 files changed, 118 insertions, 51 deletions

diff --git a/c/src/lib/libbsp/i960/cvme961/ChangeLog b/c/src/lib/libbsp/i960/cvme961/ChangeLog
index d93a097cfe..7fe9157df1 100644
--- a/c/src/lib/libbsp/i960/cvme961/ChangeLog
+++ b/c/src/lib/libbsp/i960/cvme961/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-22	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* include/bsp.h: Split out tmtest27 support.
+	* include/tm27.h: New.
+
 2004-04-21	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	PR 613/bsps
diff --git a/c/src/lib/libbsp/i960/cvme961/include/bsp.h b/c/src/lib/libbsp/i960/cvme961/include/bsp.h
index c482d5330e..869eefdfe7 100644
--- a/c/src/lib/libbsp/i960/cvme961/include/bsp.h
+++ b/c/src/lib/libbsp/i960/cvme961/include/bsp.h
@@ -39,23 +39,6 @@ extern "C" {
 #define CONFIGURE_INTERRUPT_STACK_MEMORY  (4 * 1024)
 
 /*
- *  Define the interrupt mechanism for Time Test 27
- *
- *  NOTE: Following are for i960CA and are board independent
- *
- */
-
-#define MUST_WAIT_FOR_INTERRUPT 0
-
-#define Install_tm27_vector( handler ) set_vector( (handler), 6, 1 )
-
-#define Cause_tm27_intr()  i960_cause_intr( 0x62 )
-
-#define Clear_tm27_intr()  i960_clear_intr( 6 )
-
-#define Lower_tm27_intr()
-
-/*
  *  Simple spin delay in microsecond units for device drivers.
  *  This is very dependent on the clock speed of the target.
  */
diff --git a/c/src/lib/libbsp/i960/cvme961/include/tm27.h b/c/src/lib/libbsp/i960/cvme961/include/tm27.h
new file mode 100644
index 0000000000..9624d508d1
--- /dev/null
+++ b/c/src/lib/libbsp/i960/cvme961/include/tm27.h
@@ -0,0 +1,32 @@
+/*
+ *  tm27.h
+ *
+ *  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.
+ *
+ *  $Id$
+ */
+
+#ifndef _TMTEST27
+#error "This is an RTEMS internal file you must not include directly."
+#endif
+
+#ifndef __tm27_h
+#define __tm27_h
+
+/*
+ *  Define the interrupt mechanism for Time Test 27
+ */
+
+#define MUST_WAIT_FOR_INTERRUPT 0
+
+#define Install_tm27_vector( handler ) set_vector( (handler), 6, 1 )
+
+#define Cause_tm27_intr()  i960_cause_intr( 0x62 )
+
+#define Clear_tm27_intr()  i960_clear_intr( 6 )
+
+#define Lower_tm27_intr()
+
+#endif
diff --git a/c/src/lib/libbsp/i960/i960sim/ChangeLog b/c/src/lib/libbsp/i960/i960sim/ChangeLog
index bca4f38a66..c7ea405e3b 100644
--- a/c/src/lib/libbsp/i960/i960sim/ChangeLog
+++ b/c/src/lib/libbsp/i960/i960sim/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-22	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* include/bsp.h: Split out tmtest27 support.
+	* include/tm27.h: New.
+
 2004-04-21	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	PR 613/bsps
diff --git a/c/src/lib/libbsp/i960/i960sim/include/bsp.h b/c/src/lib/libbsp/i960/i960sim/include/bsp.h
index f6f983ae68..350dfc4f72 100644
--- a/c/src/lib/libbsp/i960/i960sim/include/bsp.h
+++ b/c/src/lib/libbsp/i960/i960sim/include/bsp.h
@@ -27,23 +27,6 @@ extern "C" {
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
 
-/*
- *  Define the interrupt mechanism for Time Test 27
- *
- *  NOTE: Following are for i960CA and are board independent
- *
- */
-
-#define MUST_WAIT_FOR_INTERRUPT 0
-
-#define Install_tm27_vector( handler ) /* set_vector( (handler), 6, 1 ) */
-
-#define Cause_tm27_intr()  /* i960_cause_intr( 0x62 ) */
-
-#define Clear_tm27_intr()  /* i960_clear_intr( 6 ) */
-
-#define Lower_tm27_intr()
-
 /* Constants */
 
 /* miscellaneous stuff assumed to exist */
diff --git a/c/src/lib/libbsp/i960/i960sim/include/tm27.h b/c/src/lib/libbsp/i960/i960sim/include/tm27.h
new file mode 100644
index 0000000000..d1e37072c3
--- /dev/null
+++ b/c/src/lib/libbsp/i960/i960sim/include/tm27.h
@@ -0,0 +1,37 @@
+/*
+ *  tm27.h
+ *
+ *  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.
+ *
+ *  $Id$
+ */
+
+#ifndef _TMTEST27
+#error "This is an RTEMS internal file you must not include directly."
+#endif
+
+#ifndef __tm27_h
+#define __tm27_h
+
+/*
+ *  Define the interrupt mechanism for Time Test 27
+ *
+ *  NOTE: Following are for i960CA and are board independent
+ *
+ */
+
+#define MUST_WAIT_FOR_INTERRUPT 0
+
+#define Install_tm27_vector( handler ) /* set_vector( (handler), 6, 1 ) */
+
+#define Cause_tm27_intr()  /* i960_cause_intr( 0x62 ) */
+
+#define Clear_tm27_intr()  /* i960_clear_intr( 6 ) */
+
+#define Lower_tm27_intr()
+
+
+
+#endif
diff --git a/c/src/lib/libbsp/i960/rxgen960/ChangeLog b/c/src/lib/libbsp/i960/rxgen960/ChangeLog
index 9e769f7751..fa540fbef2 100644
--- a/c/src/lib/libbsp/i960/rxgen960/ChangeLog
+++ b/c/src/lib/libbsp/i960/rxgen960/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-22	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* include/bsp.h: Split out tmtest27 support.
+	* include/tm27.h: New.
+
 2004-04-21	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	PR 613/bsps
diff --git a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
index fa17352aee..2e213ab744 100644
--- a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
+++ b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
@@ -38,23 +38,6 @@ extern "C" {
 #define CONFIGURE_INTERRUPT_STACK_MEMORY  (8 * 1024)
 
 /*
- *  Define the interrupt mechanism for Time Test 27
- *
- *  NOTE: Following are for i960CA and are board independent
- *
- */
-
-#define MUST_WAIT_FOR_INTERRUPT 0
-
-#define Install_tm27_vector( handler ) set_vector( (handler), 6, 1 )
-
-#define Cause_tm27_intr()  i960_cause_intr( 0x62 )
-
-#define Clear_tm27_intr()  i960_clear_intr( 6 )
-
-#define Lower_tm27_intr()
-
-/*
  *  Simple spin delay in microsecond units for device drivers.
  *  This is very dependent on the clock speed of the target.
  */
diff --git a/c/src/lib/libbsp/i960/rxgen960/include/tm27.h b/c/src/lib/libbsp/i960/rxgen960/include/tm27.h
new file mode 100644
index 0000000000..4c53be687b
--- /dev/null
+++ b/c/src/lib/libbsp/i960/rxgen960/include/tm27.h
@@ -0,0 +1,34 @@
+/*
+ *  tm27.h
+ *
+ *  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.
+ *
+ *  $Id$
+ */
+
+#ifndef _TMTEST27
+#error "This is an RTEMS internal file you must not include directly."
+#endif
+
+#ifndef __tm27_h
+#define __tm27_h
+
+/*
+ *  Define the interrupt mechanism for Time Test 27
+ */
+
+#define MUST_WAIT_FOR_INTERRUPT 0
+
+#define Install_tm27_vector( handler ) set_vector( (handler), 6, 1 )
+
+#define Cause_tm27_intr()  i960_cause_intr( 0x62 )
+
+#define Clear_tm27_intr()  i960_clear_intr( 6 )
+
+#define Lower_tm27_intr()
+
+
+
+#endif