summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems/include/rtems/rtems/intr.h
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2012-05-07 18:29:56 -0500
committerJoel Sherrill <joel.sherrill@oarcorp.com>2012-05-09 16:55:10 -0500
commit826fa6b169d550edbda5f59430df13d33ed0a24f (patch)
tree915e49a9df4df485499fcdde66e9ba2d8778dc66 /cpukit/rtems/include/rtems/rtems/intr.h
parentScore Semaphore - Need Semaphore Seize Body When Multiprocessing is Enabled (diff)
downloadrtems-826fa6b169d550edbda5f59430df13d33ed0a24f.tar.bz2
Score ISR - Minimize Capabilities When Not Simple Vectored
In particular CPU_INTERRUPT_NUMBER_OF_VECTORS and CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER are only used on Simple Vectored Architectures, so do not depend on them being defined. This disables as much as possible that is specific to the Simple Vectored Model and not expected to be used on architectures which use the Programmable Interrupt Controller model for interrupt handler vectoring.
Diffstat (limited to '')
-rw-r--r--cpukit/rtems/include/rtems/rtems/intr.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/cpukit/rtems/include/rtems/rtems/intr.h b/cpukit/rtems/include/rtems/rtems/intr.h
index 9b0b1b4608..f1085d537d 100644
--- a/cpukit/rtems/include/rtems/rtems/intr.h
+++ b/cpukit/rtems/include/rtems/rtems/intr.h
@@ -48,8 +48,13 @@ typedef ISR_Vector_number rtems_vector_number;
/**
* @brief Return type for interrupt handler.
*/
-typedef void rtems_isr;
+typedef ISR_Handler rtems_isr;
+#if (CPU_SIMPLE_VECTORED_INTERRUPTS == FALSE)
+
+typedef ISR_Handler_entry rtems_isr_entry;
+
+#else
/**
* @brief Interrupt handler type.
*
@@ -59,7 +64,6 @@ typedef rtems_isr ( *rtems_isr_entry )(
rtems_vector_number
);
-#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
/**
* @brief Implementation of the rtems_interrupt_catch directive.
*