diff --git a/bsps/sparc/erc32/include/bsp.h b/bsps/sparc/erc32/include/bsp.h index f6acd2e904..df50f3fd9c 100644 --- a/bsps/sparc/erc32/include/bsp.h +++ b/bsps/sparc/erc32/include/bsp.h @@ -86,8 +86,6 @@ extern int end; /* last address in the program */ /* functions */ -void SPARC_Clear_and_unmask_interrupt( rtems_vector_number vector ); - void BSP_fatal_exit( uint32_t error ); /* Interrupt Service Routine (ISR) pointer */ diff --git a/bsps/sparc/leon2/include/bsp.h b/bsps/sparc/leon2/include/bsp.h index 162e660156..2bd29c8100 100644 --- a/bsps/sparc/leon2/include/bsp.h +++ b/bsps/sparc/leon2/include/bsp.h @@ -108,8 +108,6 @@ extern int CLOCK_SPEED; extern int end; /* last address in the program */ -void SPARC_Clear_and_unmask_interrupt( rtems_vector_number vector ); - void BSP_fatal_exit( uint32_t error ); /* Interrupt Service Routine (ISR) pointer */ diff --git a/bsps/sparc/leon3/include/bsp.h b/bsps/sparc/leon3/include/bsp.h index bd33f21de8..cd3277ef16 100644 --- a/bsps/sparc/leon3/include/bsp.h +++ b/bsps/sparc/leon3/include/bsp.h @@ -123,8 +123,6 @@ extern int CLOCK_SPEED; extern int end; /* last address in the program */ -void SPARC_Clear_and_unmask_interrupt( rtems_vector_number vector ); - void BSP_fatal_exit( uint32_t error ); /* diff --git a/bsps/sparc/shared/start/sparctrap.c b/bsps/sparc/shared/start/sparctrap.c deleted file mode 100644 index 19d9eba7c2..0000000000 --- a/bsps/sparc/shared/start/sparctrap.c +++ /dev/null @@ -1,47 +0,0 @@ -/* SPDX-License-Identifier: BSD-2-Clause */ - -/** - * @file leontrap.c - * @ingroup RTEMSBSPsSPARCERC32 - * @ingroup RTEMSBSPsLEON2 - * @ingroup RTEMSBSPsLEON3 - * @ingroup RTEMSBSPsSPARCShared - * @brief Clears and unmasks a SPARC interrupt on LEON. - */ - -/* - * Copyright (c) 2025 On-Line Applications Research Corporation (OAR) - * Copyright (c) 2025 Sunil Hegde - * - * 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. - */ - -#include - -void SPARC_Clear_and_unmask_interrupt( rtems_vector_number vector ) -{ - if ( SPARC_IS_INTERRUPT_TRAP( vector ) ) { - uint32_t source = SPARC_INTERRUPT_TRAP_TO_SOURCE( vector ); - BSP_Clear_interrupt( source ); - BSP_Unmask_interrupt( source ); - } -} diff --git a/spec/build/bsps/sparc/erc32/bsperc32.yml b/spec/build/bsps/sparc/erc32/bsperc32.yml index b83fe0dddf..90956f2a66 100644 --- a/spec/build/bsps/sparc/erc32/bsperc32.yml +++ b/spec/build/bsps/sparc/erc32/bsperc32.yml @@ -63,7 +63,6 @@ source: - bsps/sparc/erc32/start/bspidle.c - bsps/sparc/erc32/start/bspstart.c - bsps/sparc/erc32/start/erc32mec.c -- bsps/sparc/shared/start/sparctrap.c - bsps/sparc/shared/gnatcommon.c - bsps/sparc/shared/irq/bsp_isr_handler.c - bsps/sparc/shared/irq/irq-shared.c diff --git a/spec/build/bsps/sparc/leon2/obj.yml b/spec/build/bsps/sparc/leon2/obj.yml index 8374826451..e16c5fadb6 100644 --- a/spec/build/bsps/sparc/leon2/obj.yml +++ b/spec/build/bsps/sparc/leon2/obj.yml @@ -29,7 +29,6 @@ source: - bsps/shared/irq/irq-default-handler.c - bsps/shared/start/gettargethash-default.c - bsps/shared/start/sbrk.c -- bsps/sparc/shared/start/sparctrap.c - bsps/sparc/leon2/btimer/btimer.c - bsps/sparc/leon2/clock/ckinit.c - bsps/sparc/leon2/console/console.c diff --git a/spec/build/bsps/sparc/leon3/obj.yml b/spec/build/bsps/sparc/leon3/obj.yml index 33d955eac0..6afc55eb79 100644 --- a/spec/build/bsps/sparc/leon3/obj.yml +++ b/spec/build/bsps/sparc/leon3/obj.yml @@ -36,7 +36,6 @@ source: - bsps/shared/dev/serial/console-termios.c - bsps/shared/irq/irq-default-handler.c - bsps/shared/start/sbrk.c -- bsps/sparc/shared/start/sparctrap.c - bsps/sparc/leon3/btimer/btimer.c - bsps/sparc/leon3/btimer/watchdog.c - bsps/sparc/leon3/clock/ckinit.c