From 962e6f05ec1730ec2f65607a33d68a0d36b07415 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 17 Oct 2001 20:26:56 +0000 Subject: 2001-10-17 Joel Sherrill * timer: New subdirectory. * timer/Makefile.am: New file. * timer/.cvsignore: New file. * Makefile.am: Modified to reflect above. * configure.ac: Ditto. * include/bsp.h: Stubs to let tm27 compile and link. --- c/src/lib/libbsp/i960/i960sim/Makefile.am | 3 +-- c/src/lib/libbsp/i960/i960sim/configure.ac | 1 + c/src/lib/libbsp/i960/i960sim/include/bsp.h | 6 ++--- c/src/lib/libbsp/i960/i960sim/timer/.cvsignore | 2 ++ c/src/lib/libbsp/i960/i960sim/timer/Makefile.am | 35 +++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 c/src/lib/libbsp/i960/i960sim/timer/.cvsignore create mode 100644 c/src/lib/libbsp/i960/i960sim/timer/Makefile.am (limited to 'c') diff --git a/c/src/lib/libbsp/i960/i960sim/Makefile.am b/c/src/lib/libbsp/i960/i960sim/Makefile.am index a0320f099b..a18be0ca0c 100644 --- a/c/src/lib/libbsp/i960/i960sim/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/Makefile.am @@ -7,8 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -#SUBDIRS = include start startup clock console timer wrapup -SUBDIRS = include start startup clock console wrapup +SUBDIRS = include start startup clock console timer wrapup include $(top_srcdir)/../../bsp.am diff --git a/c/src/lib/libbsp/i960/i960sim/configure.ac b/c/src/lib/libbsp/i960/i960sim/configure.ac index e58466cea8..929ee7651b 100644 --- a/c/src/lib/libbsp/i960/i960sim/configure.ac +++ b/c/src/lib/libbsp/i960/i960sim/configure.ac @@ -30,5 +30,6 @@ console/Makefile include/Makefile start/Makefile startup/Makefile +timer/Makefile wrapup/Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/i960/i960sim/include/bsp.h b/c/src/lib/libbsp/i960/i960sim/include/bsp.h index f320be8ffc..5863f9f3c5 100644 --- a/c/src/lib/libbsp/i960/i960sim/include/bsp.h +++ b/c/src/lib/libbsp/i960/i960sim/include/bsp.h @@ -47,11 +47,11 @@ extern "C" { #define MUST_WAIT_FOR_INTERRUPT 0 -#define Install_tm27_vector( handler ) set_vector( (handler), 6, 1 ) +#define Install_tm27_vector( handler ) /* set_vector( (handler), 6, 1 ) */ -#define Cause_tm27_intr() i960_cause_intr( 0x62 ) +#define Cause_tm27_intr() /* i960_cause_intr( 0x62 ) */ -#define Clear_tm27_intr() i960_clear_intr( 6 ) +#define Clear_tm27_intr() /* i960_clear_intr( 6 ) */ #define Lower_tm27_intr() diff --git a/c/src/lib/libbsp/i960/i960sim/timer/.cvsignore b/c/src/lib/libbsp/i960/i960sim/timer/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/c/src/lib/libbsp/i960/i960sim/timer/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am b/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am new file mode 100644 index 0000000000..7e3394e263 --- /dev/null +++ b/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am @@ -0,0 +1,35 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +VPATH = @srcdir@:@srcdir@/../../../shared + +PGM = $(ARCH)/timer.rel + +C_FILES = timerstub.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +OBJS = $(C_O_FILES) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am +include $(top_srcdir)/../../../../../../automake/lib.am + +# +# (OPTIONAL) Add local stuff here using += +# + +$(PGM): $(OBJS) + $(make-rel) + +# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile + +all-local: $(ARCH) $(OBJS) $(PGM) + +.PRECIOUS: $(PGM) + +EXTRA_DIST = timer.c + +include $(top_srcdir)/../../../../../../automake/local.am -- cgit v1.2.3