[PATCH 10/25] score: Move ISR catch support functions

[Sebastian Huber]

Delete now unused file <rtems/score/isr.inl>.
---
 cpukit/rtems/src/intrcatch.c            |   24 ++++++++++++
 cpukit/score/Makefile.am                |    1 -
 cpukit/score/include/rtems/score/isr.h  |    2 -
 cpukit/score/inline/rtems/score/isr.inl |   60 -------------------------------
 cpukit/score/preinstall.am              |    4 --
 5 files changed, 24 insertions(+), 67 deletions(-)
 delete mode 100644 cpukit/score/inline/rtems/score/isr.inl

diff --git a/cpukit/rtems/src/intrcatch.c b/cpukit/rtems/src/intrcatch.c
index 0326a18..e5c7176 100644
--- a/cpukit/rtems/src/intrcatch.c
+++ b/cpukit/rtems/src/intrcatch.c
@@ -25,6 +25,30 @@
 
 #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
 
+/**
+ * This function returns true if the vector is a valid vector number
+ * for this processor and false otherwise.
+ */
+
+RTEMS_INLINE_ROUTINE bool _ISR_Is_vector_number_valid (
+  uint32_t   vector
+)
+{
+  return ( vector <= CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER );
+}
+
+/**
+ * This function returns true if handler is the entry point of a valid
+ * use interrupt service routine and false otherwise.
+ */
+
+RTEMS_INLINE_ROUTINE bool _ISR_Is_valid_user_handler (
+  void *handler
+)
+{
+  return (handler != NULL);
+}
+
 rtems_status_code rtems_interrupt_catch(
   rtems_isr_entry      new_isr_handler,
   rtems_vector_number  vector,
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index 8722c6e..09a87d8 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -90,7 +90,6 @@ include_rtems_score_HEADERS += inline/rtems/score/corebarrier.inl
 include_rtems_score_HEADERS += inline/rtems/score/coremsg.inl
 include_rtems_score_HEADERS += inline/rtems/score/coresem.inl
 include_rtems_score_HEADERS += inline/rtems/score/heap.inl
-include_rtems_score_HEADERS += inline/rtems/score/isr.inl
 include_rtems_score_HEADERS += inline/rtems/score/object.inl
 include_rtems_score_HEADERS += inline/rtems/score/priority.inl
 include_rtems_score_HEADERS += inline/rtems/score/prioritybitmap.inl
diff --git a/cpukit/score/include/rtems/score/isr.h b/cpukit/score/include/rtems/score/isr.h
index cb9c6ec..d174912 100644
--- a/cpukit/score/include/rtems/score/isr.h
+++ b/cpukit/score/include/rtems/score/isr.h
@@ -193,8 +193,6 @@ void _ISR_Dispatch( void );
           (_ISR_Nest_level != 0)
 #endif
 
-#include <rtems/score/isr.inl>
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/cpukit/score/inline/rtems/score/isr.inl b/cpukit/score/inline/rtems/score/isr.inl
deleted file mode 100644
index c46c585..0000000
--- a/cpukit/score/inline/rtems/score/isr.inl
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * @file
- *
- * @brief Inlined Routines in the Interrupt Handler
- *
- * This include file contains the static implementation of all
- * inlined routines in the Interrupt Handler.
- */
-
-/*
- *  COPYRIGHT (c) 1989-2012.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  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_ISR_H
-# error "Never use <rtems/score/isr.inl> directly; include <rtems/score/isr.h> instead."
-#endif
-
-#ifndef _RTEMS_SCORE_ISR_INL
-#define _RTEMS_SCORE_ISR_INL
-
-/**
- * @addtogroup ScoreISR
- */
-/**@{**/
-
-#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
-/**
- * This function returns true if the vector is a valid vector number
- * for this processor and false otherwise.
- */
-
-RTEMS_INLINE_ROUTINE bool _ISR_Is_vector_number_valid (
-  uint32_t   vector
-)
-{
-  return ( vector <= CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER );
-}
-
-/**
- * This function returns true if handler is the entry point of a valid
- * use interrupt service routine and false otherwise.
- */
-
-RTEMS_INLINE_ROUTINE bool _ISR_Is_valid_user_handler (
-  void *handler
-)
-{
-  return (handler != NULL);
-}
-#endif
-
-/** @} */
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am
index 5d880f1..0bbb879 100644
--- a/cpukit/score/preinstall.am
+++ b/cpukit/score/preinstall.am
@@ -291,10 +291,6 @@ $(PROJECT_INCLUDE)/rtems/score/heap.inl: inline/rtems/score/heap.inl $(PROJECT_I
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/heap.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/heap.inl
 
-$(PROJECT_INCLUDE)/rtems/score/isr.inl: inline/rtems/score/isr.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/isr.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/isr.inl
-
 $(PROJECT_INCLUDE)/rtems/score/object.inl: inline/rtems/score/object.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/object.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/object.inl
-- 
1.7.7