From 9957dbf8cfb865ea15a4de95ac26c679e17eef87 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 2 Oct 2008 21:39:40 +0000 Subject: 2008-10-02 Joel Sherrill * Makefile.am, preinstall.am: Use shared tm27.h stub. * include/tm27.h: Removed. --- c/src/lib/libbsp/sh/gensh1/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/gensh1/Makefile.am | 2 +- c/src/lib/libbsp/sh/gensh1/include/tm27.h | 36 ------------------------------- c/src/lib/libbsp/sh/gensh1/preinstall.am | 2 +- c/src/lib/libbsp/sh/gensh2/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/gensh2/Makefile.am | 2 +- c/src/lib/libbsp/sh/gensh2/include/tm27.h | 36 ------------------------------- c/src/lib/libbsp/sh/gensh2/preinstall.am | 2 +- c/src/lib/libbsp/sh/shsim/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/shsim/Makefile.am | 2 +- c/src/lib/libbsp/sh/shsim/include/tm27.h | 32 --------------------------- c/src/lib/libbsp/sh/shsim/preinstall.am | 2 +- 12 files changed, 21 insertions(+), 110 deletions(-) delete mode 100644 c/src/lib/libbsp/sh/gensh1/include/tm27.h delete mode 100644 c/src/lib/libbsp/sh/gensh2/include/tm27.h delete mode 100644 c/src/lib/libbsp/sh/shsim/include/tm27.h (limited to 'c/src/lib/libbsp/sh') diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog index fe6ca3ce35..99984007e9 100644 --- a/c/src/lib/libbsp/sh/gensh1/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Joel Sherrill + + * Makefile.am, preinstall.am: Use shared tm27.h stub. + * include/tm27.h: Removed. + 2008-09-30 Ralf Corsépius * Makefile.am: Eliminate bsp.am. Build startup files as side-effect diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index bc4260a592..ed6e50c488 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am @@ -11,7 +11,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 nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/sh/gensh1/include/tm27.h b/c/src/lib/libbsp/sh/gensh1/include/tm27.h deleted file mode 100644 index 9d8d31f796..0000000000 --- a/c/src/lib/libbsp/sh/gensh1/include/tm27.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_TMTEST27 -#error "This is an RTEMS internal file you must not include directly." -#endif - -#ifndef __tm27_h -#define __tm27_h - -/* - * Stuff for Time Test 27 - */ - -#define MUST_WAIT_FOR_INTERRUPT 0 - -#define Install_tm27_vector( handler ) \ -{ \ - rtems_isr_entry ignored ; \ - rtems_interrupt_catch( (handler), 0, &ignored ) ; \ -} - -#define Cause_tm27_intr() /* empty */ - -#define Clear_tm27_intr() /* empty */ - -#define Lower_tm27_intr() /* empty */ - -#endif diff --git a/c/src/lib/libbsp/sh/gensh1/preinstall.am b/c/src/lib/libbsp/sh/gensh1/preinstall.am index cccaa25f26..639852cbb3 100644 --- a/c/src/lib/libbsp/sh/gensh1/preinstall.am +++ b/c/src/lib/libbsp/sh/gensh1/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/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog index 0a2f294e73..a74e0e7a4c 100644 --- a/c/src/lib/libbsp/sh/gensh2/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Joel Sherrill + + * Makefile.am, preinstall.am: Use shared tm27.h stub. + * include/tm27.h: Removed. + 2008-09-30 Ralf Corsépius * Makefile.am: Eliminate bsp.am. Build startup files as side-effect diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index c7f466bf47..bc54b0a17d 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -11,7 +11,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 nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/sh/gensh2/include/tm27.h b/c/src/lib/libbsp/sh/gensh2/include/tm27.h deleted file mode 100644 index 9d8d31f796..0000000000 --- a/c/src/lib/libbsp/sh/gensh2/include/tm27.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_TMTEST27 -#error "This is an RTEMS internal file you must not include directly." -#endif - -#ifndef __tm27_h -#define __tm27_h - -/* - * Stuff for Time Test 27 - */ - -#define MUST_WAIT_FOR_INTERRUPT 0 - -#define Install_tm27_vector( handler ) \ -{ \ - rtems_isr_entry ignored ; \ - rtems_interrupt_catch( (handler), 0, &ignored ) ; \ -} - -#define Cause_tm27_intr() /* empty */ - -#define Clear_tm27_intr() /* empty */ - -#define Lower_tm27_intr() /* empty */ - -#endif diff --git a/c/src/lib/libbsp/sh/gensh2/preinstall.am b/c/src/lib/libbsp/sh/gensh2/preinstall.am index 0b8068f43b..7d4c5ecb59 100644 --- a/c/src/lib/libbsp/sh/gensh2/preinstall.am +++ b/c/src/lib/libbsp/sh/gensh2/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/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog index aded3c44ac..41ad3ea988 100644 --- a/c/src/lib/libbsp/sh/shsim/ChangeLog +++ b/c/src/lib/libbsp/sh/shsim/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Joel Sherrill + + * Makefile.am, preinstall.am: Use shared tm27.h stub. + * include/tm27.h: Removed. + 2008-10-02 Joel Sherrill * preinstall.am: Regenerated. diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index f7577e430b..05e44c8499 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -12,7 +12,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/syscall.h -include_HEADERS += include/tm27.h +include_HEADERS += ../../shared/include/tm27.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/sh/shsim/include/tm27.h b/c/src/lib/libbsp/sh/shsim/include/tm27.h deleted file mode 100644 index c65c907a1b..0000000000 --- a/c/src/lib/libbsp/sh/shsim/include/tm27.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.com/license/LICENSE. - * - * $Id$ - */ - -#ifndef _RTEMS_TMTEST27 -#error "This is an RTEMS internal file you must not include directly." -#endif - -#ifndef __tm27_h -#define __tm27_h - -/* - * Stuff for Time Test 27 - * - * FIXME: This should not be here. - */ - -#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/sh/shsim/preinstall.am b/c/src/lib/libbsp/sh/shsim/preinstall.am index b0972f68b7..f6fa6846d7 100644 --- a/c/src/lib/libbsp/sh/shsim/preinstall.am +++ b/c/src/lib/libbsp/sh/shsim/preinstall.am @@ -45,7 +45,7 @@ $(PROJECT_INCLUDE)/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/syscall.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/syscall.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