diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-05 15:36:49 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-05 15:36:49 +0000 |
| commit | 2b3692d3155bac0e02a968eb0d1f5f108f9dd470 (patch) | |
| tree | ce90d898a4456909019c70201ae115fdfacf361e /cpukit | |
| parent | 2009-08-05 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-2b3692d3155bac0e02a968eb0d1f5f108f9dd470.tar.bz2 | |
2009-08-05 Joel Sherrill <joel.sherrill@OARcorp.com>
* rtems/include/rtems/rtems/intr.h, rtems/src/intrcatch.c: Disable
rtems_interrupt_catch on targets which do not use the simple vectored
interrupt model.
Diffstat (limited to '')
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/rtems/include/rtems/rtems/intr.h | 2 | ||||
| -rw-r--r-- | cpukit/rtems/src/intrcatch.c | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 437e6fa33d..de99703912 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,11 @@ 2009-08-05 Joel Sherrill <joel.sherrill@OARcorp.com> + * rtems/include/rtems/rtems/intr.h, rtems/src/intrcatch.c: Disable + rtems_interrupt_catch on targets which do not use the simple vectored + interrupt model. + +2009-08-05 Joel Sherrill <joel.sherrill@OARcorp.com> + * score/src/heapallocatealigned.c: Fix spacing. 2009-08-05 Joel Sherrill <joel.sherrill@OARcorp.com> diff --git a/cpukit/rtems/include/rtems/rtems/intr.h b/cpukit/rtems/include/rtems/rtems/intr.h index f1bb485db2..747c14420f 100644 --- a/cpukit/rtems/include/rtems/rtems/intr.h +++ b/cpukit/rtems/include/rtems/rtems/intr.h @@ -57,6 +57,7 @@ typedef rtems_isr ( *rtems_isr_entry )( rtems_vector_number ); +#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) /** * @brief Implementation of the rtems_interrupt_catch directive. * @@ -69,6 +70,7 @@ rtems_status_code rtems_interrupt_catch( rtems_vector_number vector, rtems_isr_entry *old_isr_handler ); +#endif /** * @brief Disables all maskable interrupts and returns the previous level in diff --git a/cpukit/rtems/src/intrcatch.c b/cpukit/rtems/src/intrcatch.c index ae54008d1d..dc3f1d4684 100644 --- a/cpukit/rtems/src/intrcatch.c +++ b/cpukit/rtems/src/intrcatch.c @@ -21,6 +21,8 @@ #include <rtems/score/isr.h> #include <rtems/rtems/intr.h> +#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) + /* rtems_interrupt_catch * * This directive allows a thread to specify what action to take when @@ -56,3 +58,4 @@ rtems_status_code rtems_interrupt_catch( return RTEMS_SUCCESSFUL; } +#endif |