From affb282b11d4644f12799dd2ae0fc61749a4a066 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 24 Nov 2017 13:01:41 +0100 Subject: bsps: Remove empty tm27.h variants Update #3254. --- c/src/lib/libbsp/arm/gumstix/Makefile.am | 2 +- c/src/lib/libbsp/arm/gumstix/include/tm27.h | 48 ----------------- c/src/lib/libbsp/arm/gumstix/preinstall.am | 2 +- c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am | 2 +- .../libbsp/epiphany/epiphany_sim/include/tm27.h | 62 ---------------------- .../lib/libbsp/epiphany/epiphany_sim/preinstall.am | 2 +- .../lib/libbsp/riscv/riscv_generic/include/tm27.h | 53 ------------------ c/src/lib/libbsp/sparc64/niagara/Makefile.am | 2 +- c/src/lib/libbsp/sparc64/niagara/include/tm27.h | 34 ------------ c/src/lib/libbsp/sparc64/niagara/preinstall.am | 2 +- c/src/lib/libbsp/sparc64/usiii/Makefile.am | 2 +- c/src/lib/libbsp/sparc64/usiii/include/tm27.h | 34 ------------ c/src/lib/libbsp/sparc64/usiii/preinstall.am | 2 +- 13 files changed, 8 insertions(+), 239 deletions(-) delete mode 100644 c/src/lib/libbsp/arm/gumstix/include/tm27.h delete mode 100644 c/src/lib/libbsp/epiphany/epiphany_sim/include/tm27.h delete mode 100644 c/src/lib/libbsp/riscv/riscv_generic/include/tm27.h delete mode 100644 c/src/lib/libbsp/sparc64/niagara/include/tm27.h delete mode 100644 c/src/lib/libbsp/sparc64/usiii/include/tm27.h diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am index 42104577ad..9c158f63f3 100644 --- a/c/src/lib/libbsp/arm/gumstix/Makefile.am +++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am @@ -8,7 +8,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h +include_HEADERS += ../../shared/include/tm27.h include_bsp_HEADERS = diff --git a/c/src/lib/libbsp/arm/gumstix/include/tm27.h b/c/src/lib/libbsp/arm/gumstix/include/tm27.h deleted file mode 100644 index ed8d73e113..0000000000 --- a/c/src/lib/libbsp/arm/gumstix/include/tm27.h +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file - * @ingroup gumstix_tm27 - * @brief tm27 timing test support - */ - -/* - * tm27.h - * - * 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. - */ - -#ifndef _RTEMS_TMTEST27 -#error "This is an RTEMS internal file you must not include directly." -#endif - -#ifndef __tm27_h -#define __tm27_h - -/** - * @defgroup gumstix_tm27 tm27 Support - * @ingroup arm_gumstix - * @brief tm27 Timing Test Support - * @{ - */ - -/** - * @name Interrupt mechanisms for Time Test 27 - * @{ - */ - -#define MUST_WAIT_FOR_INTERRUPT 0 - -#define Install_tm27_vector( handler ) /* empty */ - -#define Cause_tm27_intr() /* empty */ - -#define Clear_tm27_intr() /* empty */ - -#define Lower_tm27_intr() /* empty */ - -/** @} */ - -/** @} */ - -#endif diff --git a/c/src/lib/libbsp/arm/gumstix/preinstall.am b/c/src/lib/libbsp/arm/gumstix/preinstall.am index 23dbe2a207..5d7105b740 100644 --- a/c/src/lib/libbsp/arm/gumstix/preinstall.am +++ b/c/src/lib/libbsp/arm/gumstix/preinstall.am @@ -41,7 +41,7 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) +$(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am index 8517cee49a..dedc1f28a2 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am +++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am @@ -17,7 +17,7 @@ dist_project_lib_DATA = bsp_specs ############################################################################### include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h +include_HEADERS += ../../shared/include/tm27.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h include_bsp_HEADERS = ../shared/include/linker-symbols.h diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/tm27.h b/c/src/lib/libbsp/epiphany/epiphany_sim/include/tm27.h deleted file mode 100644 index 6e3d3055e4..0000000000 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/include/tm27.h +++ /dev/null @@ -1,62 +0,0 @@ -/** - * @ingroup bsp_epiphany - * - * @brief Epiphany Time Test 27 Routines - */ - -/* - * - * Copyright (c) 2015 University of York. - * Hesham ALMatary - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * 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 AUTHOR 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 AUTHOR 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. - */ - -#ifndef _RTEMS_TMTEST27 -#error "This is an RTEMS internal file you must not include directly." -#endif - -#ifndef LIBBSP_EPIPHANY_EPIPHANY_SIM_TM27_H -#define LIBBSP_EPIPHANY_EPIPHANY_SIM_TM27_H - -/** - * @name Interrupt mechanisms for Time Test 27 - * - * @{ - */ - -#define MUST_WAIT_FOR_INTERRUPT 0 - -#define Install_tm27_vector( handler ) /* empty */ - -#define Cause_tm27_intr() /* empty */ - -#define Clear_tm27_intr() /* empty */ - -#define Lower_tm27_intr() /* empty */ - -/** @} */ - -#endif /* LIBBSP_EPIPHANY_EPIPHANY_SIM_TM27_H */ diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am b/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am index d79d62cd60..4ee8b02beb 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am +++ b/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am @@ -46,7 +46,7 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) +$(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h diff --git a/c/src/lib/libbsp/riscv/riscv_generic/include/tm27.h b/c/src/lib/libbsp/riscv/riscv_generic/include/tm27.h deleted file mode 100644 index 392f106da4..0000000000 --- a/c/src/lib/libbsp/riscv/riscv_generic/include/tm27.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * - * Copyright (c) 2015 University of York. - * Hesham Almatary - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * 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 AUTHOR 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 AUTHOR 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. - */ - -#ifndef _RTEMS_TMTEST27 -#error "This is an RTEMS internal file you must not include directly." -#endif - -#ifndef __tm27_h -#define __tm27_h - -/** - * @name Interrupt mechanisms for Time Test 27 - * @{ - */ - -#define MUST_WAIT_FOR_INTERRUPT 0 - -#define Install_tm27_vector( handler ) /* empty */ - -#define Cause_tm27_intr() /* empty */ - -#define Clear_tm27_intr() /* empty */ - -#define Lower_tm27_intr() /* empty */ - -#endif diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am index 129f9bc3e8..5f2d97e0d2 100644 --- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am +++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am @@ -8,7 +8,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h +include_HEADERS += ../../shared/include/tm27.h include_HEADERS += ../shared/include/asm.h include_bootdir = $(includedir)/boot diff --git a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h b/c/src/lib/libbsp/sparc64/niagara/include/tm27.h deleted file mode 100644 index 9001b807ab..0000000000 --- a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * @file - * @ingroup sparc64_niagara - * @brief Implementations for interrupt mechanisms for Time Test 27 - */ - -/* - * 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. - */ - -#ifndef _RTEMS_TMTEST27 -#error "This is an RTEMS internal file you must not include directly." -#endif - -#ifndef __tm27_h -#define __tm27_h - -/* - * Define the interrupt mechanism for Time Test 27 - */ - -#define MUST_WAIT_FOR_INTERRUPT 0 - -#define Install_tm27_vector( handler ) /* set_vector( (handler), 6, 1 ) */ - -#define Cause_tm27_intr() /* XXX */ - -#define Clear_tm27_intr() /* XXX */ - -#define Lower_tm27_intr() /* empty */ - -#endif diff --git a/c/src/lib/libbsp/sparc64/niagara/preinstall.am b/c/src/lib/libbsp/sparc64/niagara/preinstall.am index d2c8f3b3b8..d417b88f62 100644 --- a/c/src/lib/libbsp/sparc64/niagara/preinstall.am +++ b/c/src/lib/libbsp/sparc64/niagara/preinstall.am @@ -41,7 +41,7 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) +$(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am index 951afd2d09..8ce40238db 100644 --- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am +++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am @@ -8,7 +8,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h +include_HEADERS += ../../shared/include/tm27.h include_HEADERS += ../shared/include/asm.h include_HEADERS += ../shared/include/traptable.h diff --git a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h b/c/src/lib/libbsp/sparc64/usiii/include/tm27.h deleted file mode 100644 index 14e07ca3a8..0000000000 --- a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * @file - * @ingroup sparc64_usiii - * @brief Implementations for interrupt mechanisms for Time Test 27 - */ - -/* - * 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. - */ - -#ifndef _RTEMS_TMTEST27 -#error "This is an RTEMS internal file you must not include directly." -#endif - -#ifndef __tm27_h -#define __tm27_h - -/* - * Define the interrupt mechanism for Time Test 27 - */ - -#define MUST_WAIT_FOR_INTERRUPT 0 - -#define Install_tm27_vector( handler ) /* set_vector( (handler), 6, 1 ) */ - -#define Cause_tm27_intr() /* XXX */ - -#define Clear_tm27_intr() /* XXX */ - -#define Lower_tm27_intr() /* empty */ - -#endif diff --git a/c/src/lib/libbsp/sparc64/usiii/preinstall.am b/c/src/lib/libbsp/sparc64/usiii/preinstall.am index fa403a3842..912959c807 100644 --- a/c/src/lib/libbsp/sparc64/usiii/preinstall.am +++ b/c/src/lib/libbsp/sparc64/usiii/preinstall.am @@ -41,7 +41,7 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) +$(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h -- cgit v1.2.3