summaryrefslogtreecommitdiffstats
path: root/cpukit/score/src/isr.c
diff options
context:
space:
mode:
Diffstat (limited to 'cpukit/score/src/isr.c')
-rw-r--r--cpukit/score/src/isr.c41
1 files changed, 23 insertions, 18 deletions
diff --git a/cpukit/score/src/isr.c b/cpukit/score/src/isr.c
index 519532b283..7337028b0f 100644
--- a/cpukit/score/src/isr.c
+++ b/cpukit/score/src/isr.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
/**
* @file
*
@@ -11,9 +13,26 @@
* 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.org/license/LICENSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef HAVE_CONFIG_H
@@ -22,18 +41,10 @@
#include <rtems/score/isr.h>
#include <rtems/score/address.h>
-#include <rtems/score/interr.h>
#include <rtems/score/percpu.h>
-#include <rtems/score/stackimpl.h>
#include <rtems/config.h>
-#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
- ISR_Handler_entry _ISR_Vector_table[ CPU_INTERRUPT_NUMBER_OF_VECTORS ];
-#elif defined(CPU_INTERRUPT_NUMBER_OF_VECTORS)
- #error "CPU_INTERRUPT_NUMBER_OF_VECTORS is defined for non-simple vectored interrupts"
-#elif defined(CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER)
- #error "CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER is defined for non-simple vectored interrupts"
-#endif
+const char * const volatile _ISR_Stack_size_object = _ISR_Stack_size;
void _ISR_Handler_initialization( void )
{
@@ -42,12 +53,6 @@ void _ISR_Handler_initialization( void )
size_t stack_size;
char *stack_low;
- _ISR_Nest_level = 0;
-
-#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
- _CPU_Initialize_vectors();
-#endif
-
stack_size = rtems_configuration_get_interrupt_stack_size();
cpu_max = rtems_configuration_get_maximum_processors();
stack_low = _ISR_Stack_area_begin;