diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-04-21 20:24:36 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-04-21 20:24:36 +0000 |
| commit | 7312649847ee783fdb1a5330761696781ab22dc1 (patch) | |
| tree | d3c86900efc1bd022d53a104cd75f9b028ce2292 /c | |
| parent | 2004-04-21 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-7312649847ee783fdb1a5330761696781ab22dc1.tar.bz2 | |
2004-04-21 Joel Sherrill <joel@OARcorp.com>
PR 611/bsps
* Makefile.am, include/bsp.h, wrapup/Makefile.am: Follow conventions
for tm27 and do not add another macro definition.
* startup/tm27supp.c: New file.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/ChangeLog | 14 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/Makefile.am | 16 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/include/bsp.h | 23 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c | 29 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am | 3 |
5 files changed, 62 insertions, 23 deletions
diff --git a/c/src/lib/libbsp/powerpc/ss555/ChangeLog b/c/src/lib/libbsp/powerpc/ss555/ChangeLog index 3bf84afbfc..35cc9692bc 100644 --- a/c/src/lib/libbsp/powerpc/ss555/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ss555/ChangeLog @@ -1,3 +1,17 @@ +2004-04-21 Joel Sherrill <joel@OARcorp.com> + + PR 611/bsps + * Makefile.am, include/bsp.h, wrapup/Makefile.am: Follow conventions + for tm27 and do not add another macro definition. + * startup/tm27supp.c: New file. + +2004-04-21 Joel Sherrill <joel@OARcorp.com> + + PR 611/bsps + * Makefile.am, include/bsp.h, wrapup/Makefile.am: Follow conventions + for tm27 and do not add another macro definition. + * startup/tm27supp.c: New file. + 2004-04-21 Ralf Corsepius <ralf_corsepius@rtems.org> PR 613/bsps diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am index 5f8bc8429a..e69f505058 100644 --- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am @@ -74,6 +74,22 @@ startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) noinst_DATA += startup$(LIB_VARIANT).rel +EXTRA_PROGRAMS += tm27supp.rel +CLEANFILES += tm27supp.rel +tm27supp_rel_SOURCES = startup/tm27supp.c +tm27supp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +tm27supp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += tm27supp$(LIB_VARIANT).rel + +EXTRA_PROGRAMS += tm27supp_g.rel +CLEANFILES += tm27supp_g.rel +tm27supp_g_rel_SOURCES = $(tm27supp_rel_SOURCES) +tm27supp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +tm27supp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += tm27supp$(LIB_VARIANT).rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) PREINSTALL_DIRS = diff --git a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h index e4fd98df1b..118d9a193b 100644 --- a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h @@ -84,30 +84,9 @@ extern volatile cpld_t cpld; /* defined in linkcmds */ #define MUST_WAIT_FOR_INTERRUPT 1 -#define Declarations_for_tm27 \ -void tm27On() \ -{ \ -} \ - \ -void tm27Off() \ -{ \ -} \ - \ -int tm27IsOn() \ -{ \ - return 1; \ -} \ - \ -rtems_irq_connect_data tm27IrqData = { \ - CPU_USIU_EXT_IRQ_7, \ - (rtems_irq_hdl)0, \ - (rtems_irq_enable)tm27On, \ - (rtems_irq_disable)tm27Off, \ - (rtems_irq_is_enabled)tm27IsOn \ -}; - #define Install_tm27_vector( handler ) \ { \ + extern rtems_irq_connect_data tm27IrqData; \ usiu.siel |= (1 << 17); \ usiu.sipend |= (1 << 17); \ \ diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c b/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c new file mode 100644 index 0000000000..a05b4e5b7a --- /dev/null +++ b/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c @@ -0,0 +1,29 @@ +/* + * Support routines for TM27 + * + * $Id$ + */ + +#include <bsp.h> + +void tm27On() +{ +} + +void tm27Off() +{ +} + +int tm27IsOn() +{ + return 1; +} + +rtems_irq_connect_data tm27IrqData = { + CPU_USIU_EXT_IRQ_7, + (rtems_irq_hdl)0, + (rtems_irq_enable)tm27On, + (rtems_irq_disable)tm27Off, + (rtems_irq_is_enabled)tm27IsOn +}; + diff --git a/c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am index e4652a6b5d..845d14cf54 100644 --- a/c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am @@ -9,7 +9,8 @@ CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = ___libbsp_a_LIBADD = ../pclock$(LIB_VARIANT).rel \ - ../console$(LIB_VARIANT).rel ../startup$(LIB_VARIANT).rel + ../console$(LIB_VARIANT).rel ../startup$(LIB_VARIANT).rel \ + ../tm27supp$(LIB_VARIANT).rel ___libbsp_a_LIBADD += \ ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \ |