From 826fa6b169d550edbda5f59430df13d33ed0a24f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 7 May 2012 18:29:56 -0500 Subject: 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. --- cpukit/rtems/include/rtems/rtems/intr.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cpukit/rtems/include/rtems/rtems/intr.h') 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. * -- cgit v1.2.3