8 files changed, 29 insertions, 25 deletions
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am
index 817e4ccaff..07fdfa2b9b 100644
--- a/cpukit/rtems/Makefile.am
+++ b/cpukit/rtems/Makefile.am
@@ -15,6 +15,7 @@ include_rtems_rtemsdir = $(includedir)/rtems/rtems
 include_rtems_rtems_HEADERS =
 
 include_rtems_rtems_HEADERS += include/rtems/rtems/asr.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/asrimpl.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/attr.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/attrimpl.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/barrier.h
@@ -64,7 +65,6 @@ include_rtems_rtems_HEADERS += include/rtems/rtems/signalmp.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/taskmp.h
 endif
 
-include_rtems_rtems_HEADERS += inline/rtems/rtems/asr.inl
 include_rtems_rtems_HEADERS += inline/rtems/rtems/dpmem.inl
 include_rtems_rtems_HEADERS += inline/rtems/rtems/event.inl
 include_rtems_rtems_HEADERS += inline/rtems/rtems/eventset.inl
diff --git a/cpukit/rtems/include/rtems/rtems/asr.h b/cpukit/rtems/include/rtems/rtems/asr.h
index 6516233328..225b0b9e37 100644
--- a/cpukit/rtems/include/rtems/rtems/asr.h
+++ b/cpukit/rtems/include/rtems/rtems/asr.h
@@ -145,15 +145,11 @@ typedef struct {
 /** This defines the bit in the signal set associated with signal 31. */
 #define RTEMS_SIGNAL_31   0x80000000
 
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/asr.inl>
-#endif
+/**@}*/
 
 #ifdef __cplusplus
 }
 #endif
 
-/**@}*/
-
 #endif
 /* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/asr.inl b/cpukit/rtems/include/rtems/rtems/asrimpl.h
index 9f42120018..dc7da55dfe 100644
--- a/cpukit/rtems/inline/rtems/rtems/asr.inl
+++ b/cpukit/rtems/include/rtems/rtems/asrimpl.h
@@ -1,13 +1,9 @@
 /**
- * @file rtems/rtems/asr.inl
+ * @file
  *
- * @defgroup ClassicASR ASR Support
+ * @ingroup ClassicASRImpl
  *
- * @ingroup ClassicRTEMS
- * @brief Asynchronous Signal Handler
- *
- * This include file contains the implemenation of all routines
- * associated with the asynchronous signal handler which are inlined.
+ * @brief Classic ASR Implementation
  */
 
 /* COPYRIGHT (c) 1989-2008.
@@ -18,18 +14,22 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#ifndef _RTEMS_RTEMS_ASR_H
-# error "Never use <rtems/rtems/asr.inl> directly; include <rtems/rtems/asr.h> instead."
-#endif
+#ifndef _RTEMS_RTEMS_ASRIMPL_H
+#define _RTEMS_RTEMS_ASRIMPL_H
 
-#ifndef _RTEMS_RTEMS_ASR_INL
-#define _RTEMS_RTEMS_ASR_INL
+#include <rtems/rtems/asr.h>
+#include <rtems/score/isrlevel.h>
 
-#include <rtems/score/isr.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
- *  @addtogroup ClassicASR
- *  @{
+ * @defgroup ClassicASRImpl Classic ASR Implementation
+ *
+ * @ingroup ClassicASR
+ *
+ * @{
  */
 
 /**
@@ -118,5 +118,9 @@ RTEMS_INLINE_ROUTINE void _ASR_Post_signals(
 
 /**@}*/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
diff --git a/cpukit/rtems/preinstall.am b/cpukit/rtems/preinstall.am
index 72b00a7849..cf823b0e3f 100644
--- a/cpukit/rtems/preinstall.am
+++ b/cpukit/rtems/preinstall.am
@@ -31,6 +31,10 @@ $(PROJECT_INCLUDE)/rtems/rtems/asr.h: include/rtems/rtems/asr.h $(PROJECT_INCLUD
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asr.h
 
+$(PROJECT_INCLUDE)/rtems/rtems/asrimpl.h: include/rtems/rtems/asrimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asrimpl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asrimpl.h
+
 $(PROJECT_INCLUDE)/rtems/rtems/attr.h: include/rtems/rtems/attr.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attr.h
@@ -201,10 +205,6 @@ $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h: include/rtems/rtems/taskmp.h $(PROJECT_
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h
 endif
-$(PROJECT_INCLUDE)/rtems/rtems/asr.inl: inline/rtems/rtems/asr.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asr.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asr.inl
-
 $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl: inline/rtems/rtems/dpmem.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl
diff --git a/cpukit/rtems/src/signalcatch.c b/cpukit/rtems/src/signalcatch.c
index 4b709a85f9..4821e1fb8c 100644
--- a/cpukit/rtems/src/signalcatch.c
+++ b/cpukit/rtems/src/signalcatch.c
@@ -19,6 +19,7 @@
 #endif
 
 #include <rtems/system.h>
+#include <rtems/rtems/asrimpl.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/asr.h>
 #include <rtems/score/isr.h>
diff --git a/cpukit/rtems/src/signalsend.c b/cpukit/rtems/src/signalsend.c
index eb259303f4..f8002e5789 100644
--- a/cpukit/rtems/src/signalsend.c
+++ b/cpukit/rtems/src/signalsend.c
@@ -19,6 +19,7 @@
 #endif
 
 #include <rtems/system.h>
+#include <rtems/rtems/asrimpl.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/asr.h>
 #include <rtems/score/isr.h>
diff --git a/cpukit/rtems/src/taskmode.c b/cpukit/rtems/src/taskmode.c
index 3439f89549..24e75bbed2 100644
--- a/cpukit/rtems/src/taskmode.c
+++ b/cpukit/rtems/src/taskmode.c
@@ -20,6 +20,7 @@
 
 #include <rtems/system.h>
 #include <rtems/config.h>
+#include <rtems/rtems/asrimpl.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
 #include <rtems/rtems/modesimpl.h>
diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c
index 99bcef93c6..b586487f93 100644
--- a/cpukit/rtems/src/tasks.c
+++ b/cpukit/rtems/src/tasks.c
@@ -20,6 +20,7 @@
 
 #include <rtems/system.h>
 #include <rtems/config.h>
+#include <rtems/rtems/asrimpl.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
 #include <rtems/rtems/modes.h>