diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-10-02 21:39:40 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-10-02 21:39:40 +0000 |
commit | 9957dbf8cfb865ea15a4de95ac26c679e17eef87 (patch) | |
tree | 1e7a961a137fd399f4952da791fdd7b4637e033b /c/src/lib/libbsp/m68k | |
parent | 2008-10-02 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-9957dbf8cfb865ea15a4de95ac26c679e17eef87.tar.bz2 |
2008-10-02 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, preinstall.am: Use shared tm27.h stub.
* include/tm27.h: Removed.
Diffstat (limited to 'c/src/lib/libbsp/m68k')
24 files changed, 42 insertions, 212 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index a08629f1a8..f2e18058b2 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am, preinstall.am: Use shared tm27.h stub. + * include/tm27.h: Removed. + 2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com> * timer/timer.c: Eliminate uses of old benchmark timer names. diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index 4c59c1f88f..9d4dea0237 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/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/m68k/gen68302/include/tm27.h b/c/src/lib/libbsp/m68k/gen68302/include/tm27.h deleted file mode 100644 index a10e11cab1..0000000000 --- a/c/src/lib/libbsp/m68k/gen68302/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 - */ - -#define MUST_WAIT_FOR_INTERRUPT 0 - -#define Install_tm27_vector( handler ) set_vector( (handler), 0, 1 ) - -#define Cause_tm27_intr() /* empty */ - -#define Clear_tm27_intr() /* empty */ - -#define Lower_tm27_intr() /* empty */ - -#endif diff --git a/c/src/lib/libbsp/m68k/gen68302/preinstall.am b/c/src/lib/libbsp/m68k/gen68302/preinstall.am index 32e910ede8..540e452166 100644 --- a/c/src/lib/libbsp/m68k/gen68302/preinstall.am +++ b/c/src/lib/libbsp/m68k/gen68302/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/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index bb1706006f..1ef2fc1f53 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am, preinstall.am: Use shared tm27.h stub. + * include/tm27.h: Removed. + 2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com> * timer/timer.c: Eliminate uses of old benchmark timer names. diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index c2d3f5864d..6c81c4e9d8 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/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/m68k/gen68340/include/tm27.h b/c/src/lib/libbsp/m68k/gen68340/include/tm27.h deleted file mode 100644 index c332e8a5f6..0000000000 --- a/c/src/lib/libbsp/m68k/gen68340/include/tm27.h +++ /dev/null @@ -1,33 +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 - * Don't bother with hardware -- just use a software-interrupt - */ - -#define MUST_WAIT_FOR_INTERRUPT 0 - -#define Install_tm27_vector( handler ) set_vector( (handler), 34, 1 ) - -#define Cause_tm27_intr() /* asm volatile ("trap #2"); */ - -#define Clear_tm27_intr() /* empty */ - -#define Lower_tm27_intr() /* empty */ - -#endif diff --git a/c/src/lib/libbsp/m68k/gen68340/preinstall.am b/c/src/lib/libbsp/m68k/gen68340/preinstall.am index 8cb09ec562..0c891ea32e 100644 --- a/c/src/lib/libbsp/m68k/gen68340/preinstall.am +++ b/c/src/lib/libbsp/m68k/gen68340/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/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index 6d634d6c6a..7c94419006 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am, preinstall.am: Use shared tm27.h stub. + * include/tm27.h: Removed. + 2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com> * timer/timer.c: Eliminate uses of old benchmark timer names. diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index 2fb0f6cf38..0d522c26ff 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/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/m68k/idp/include/tm27.h b/c/src/lib/libbsp/m68k/idp/include/tm27.h deleted file mode 100644 index 7228bf4268..0000000000 --- a/c/src/lib/libbsp/m68k/idp/include/tm27.h +++ /dev/null @@ -1,34 +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 - -/* - * Define the interrupt mechanism for Time Test 27 - * - * NOTE: tm27 apparently not supported. - */ - -#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/m68k/idp/preinstall.am b/c/src/lib/libbsp/m68k/idp/preinstall.am index 03030bd234..1bcb5b692a 100644 --- a/c/src/lib/libbsp/m68k/idp/preinstall.am +++ b/c/src/lib/libbsp/m68k/idp/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/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index c029744cfc..df2f880ea6 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am, preinstall.am: Use shared tm27.h stub. + * include/tm27.h: Removed. + 2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com> * timer/timer.c: Eliminate uses of old benchmark timer names. diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index 34482d4fdb..a14f55ee03 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/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/m68k/mrm332/include/tm27.h b/c/src/lib/libbsp/m68k/mrm332/include/tm27.h deleted file mode 100644 index 0370a3e37d..0000000000 --- a/c/src/lib/libbsp/m68k/mrm332/include/tm27.h +++ /dev/null @@ -1,34 +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 - -/* - * Define the interrupt mechanism for Time Test 27 - */ - -/* XXX - JRS - I want to compile the tmtests */ - -#define MUST_WAIT_FOR_INTERRUPT 1 - -#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/m68k/mrm332/preinstall.am b/c/src/lib/libbsp/m68k/mrm332/preinstall.am index bc73049446..4a71e7df99 100644 --- a/c/src/lib/libbsp/m68k/mrm332/preinstall.am +++ b/c/src/lib/libbsp/m68k/mrm332/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/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index 137718bd09..b88d6eb7c9 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am, preinstall.am: Use shared tm27.h stub. + * include/tm27.h: Removed. + 2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com> * timer/timer.c: Eliminate uses of old benchmark timer names. diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/Makefile.am index dc2e65e2aa..841d9e7a5a 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am @@ -12,7 +12,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/m68k/ods68302/include/tm27.h b/c/src/lib/libbsp/m68k/ods68302/include/tm27.h deleted file mode 100644 index a10e11cab1..0000000000 --- a/c/src/lib/libbsp/m68k/ods68302/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 - */ - -#define MUST_WAIT_FOR_INTERRUPT 0 - -#define Install_tm27_vector( handler ) set_vector( (handler), 0, 1 ) - -#define Cause_tm27_intr() /* empty */ - -#define Clear_tm27_intr() /* empty */ - -#define Lower_tm27_intr() /* empty */ - -#endif diff --git a/c/src/lib/libbsp/m68k/ods68302/preinstall.am b/c/src/lib/libbsp/m68k/ods68302/preinstall.am index f7e0af8340..f95a8437f0 100644 --- a/c/src/lib/libbsp/m68k/ods68302/preinstall.am +++ b/c/src/lib/libbsp/m68k/ods68302/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/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index 6c29b2ca0e..ae4074d8cc 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am, preinstall.am: Use shared tm27.h stub. + * include/tm27.h: Removed. + 2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org> * Makefile.am: Eliminate bsp.am. Build startup files as side-effect diff --git a/c/src/lib/libbsp/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am index bf381faf55..a3a4300998 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/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/m68k/sim68000/include/tm27.h b/c/src/lib/libbsp/m68k/sim68000/include/tm27.h deleted file mode 100644 index 65ac2c5313..0000000000 --- a/c/src/lib/libbsp/m68k/sim68000/include/tm27.h +++ /dev/null @@ -1,35 +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 - -/* - * Define the interrupt mechanism for Time Test 27 - * - * NOTE: Following are not defined for the BSVC Simulator YET. - * - */ - -#define MUST_WAIT_FOR_INTERRUPT 0 - -#define Install_tm27_vector( handler ) /* set_vector( (handler), 6, 1 ) */ - -#define Cause_tm27_intr() /* empty */ - -#define Clear_tm27_intr() /* empty */ - -#define Lower_tm27_intr() /* empty */ - -#endif diff --git a/c/src/lib/libbsp/m68k/sim68000/preinstall.am b/c/src/lib/libbsp/m68k/sim68000/preinstall.am index 73323b55bf..bdd3a3e368 100644 --- a/c/src/lib/libbsp/m68k/sim68000/preinstall.am +++ b/c/src/lib/libbsp/m68k/sim68000/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 |