From c73b8ac27f85ef7bc732b311da28f65e722ee7be Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 9 Nov 1999 22:18:43 +0000 Subject: This patch adds the basic framework for the ITRON 3.0 API implementation for RTEMS. --- aclocal/check-itron.m4 | 29 +++++++++++++++++++++++++++++ aclocal/enable-itron.m4 | 36 ++++++++++++++++++++++++++++++++++++ c/src/lib/libbsp/shared/console.c | 16 ++-------------- c/src/lib/wrapup/Makefile.in | 1 + c/src/make/Makefile.inc.in | 1 + c/src/make/bsp.cfg.in | 5 +++++ c/src/make/configure.in | 1 + c/src/make/target.cfg.in | 1 + c/src/wrapup/Makefile.in | 1 + configure.in | 1 + make/target.cfg.in | 1 + tools/update/cipolish | 4 ++++ 12 files changed, 83 insertions(+), 14 deletions(-) create mode 100644 aclocal/check-itron.m4 create mode 100644 aclocal/enable-itron.m4 diff --git a/aclocal/check-itron.m4 b/aclocal/check-itron.m4 new file mode 100644 index 0000000000..e30023b341 --- /dev/null +++ b/aclocal/check-itron.m4 @@ -0,0 +1,29 @@ +dnl $Id$ +dnl +AC_DEFUN(RTEMS_CHECK_ITRON_API, +[dnl +AC_REQUIRE([RTEMS_CHECK_CPU])dnl +AC_REQUIRE([RTEMS_ENABLE_ITRON])dnl + +AC_CACHE_CHECK([whether BSP supports libitron], + rtems_cv_HAS_ITRON_API, + [dnl + case "$RTEMS_CPU" in + unix*) + rtems_cv_HAS_ITRON_API="no" + ;; + *) + if test "${RTEMS_HAS_ITRON_API}" = "yes"; then + rtems_cv_HAS_ITRON_API="yes"; + else + rtems_cv_HAS_ITRON_API="disabled"; + fi + ;; + esac]) +if test "$rtems_cv_HAS_ITRON_API" = "yes"; then + HAS_ITRON_API="yes"; +else + HAS_ITRON_API="no"; +fi +AC_SUBST(HAS_ITRON_API)dnl +]) diff --git a/aclocal/enable-itron.m4 b/aclocal/enable-itron.m4 new file mode 100644 index 0000000000..9ce17c1c72 --- /dev/null +++ b/aclocal/enable-itron.m4 @@ -0,0 +1,36 @@ +dnl $Id$ + +AC_DEFUN(RTEMS_ENABLE_ITRON, +[ +AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl + +AC_ARG_ENABLE(itron, +[ --enable-itron enable itron interface], +[case "${enableval}" in + yes) RTEMS_HAS_ITRON_API=yes ;; + no) RTEMS_HAS_ITRON_API=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for enable-itron option) ;; +esac],[RTEMS_HAS_ITRON_API=yes]) +AC_SUBST(RTEMS_HAS_ITRON_API) + +changequote(,)dnl +case "${target}" in + # hpux unix port should go here + i[3456]86-pc-linux*) # unix "simulator" port + RTEMS_HAS_ITRON_API=no + ;; + i[3456]86-*freebsd2*) # unix "simulator" port + RTEMS_HAS_ITRON_API=no + ;; + no_cpu-*rtems*) + RTEMS_HAS_ITRON_API=no + ;; + sparc-sun-solaris*) # unix "simulator" port + RTEMS_HAS_ITRON_API=no + ;; + *) + ;; +esac +changequote([,])dnl +AC_SUBST(RTEMS_HAS_ITRON_API) +]) diff --git a/c/src/lib/libbsp/shared/console.c b/c/src/lib/libbsp/shared/console.c index 60ced47ddf..cf56e87873 100644 --- a/c/src/lib/libbsp/shared/console.c +++ b/c/src/lib/libbsp/shared/console.c @@ -1,21 +1,9 @@ /* - * This file contains the TTY driver for the PPCn_60x + * This file contains the generic console driver shell used + * by all console drivers using libchip. * * This driver uses the termios pseudo driver. * - * COPYRIGHT (c) 1998 by Radstone Technology - * - * - * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY - * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK - * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU. - * - * You are hereby granted permission to use, copy, modify, and distribute - * this file, provided that this notice, plus the above copyright notice - * and disclaimer, appears in all copies. Radstone Technology will provide - * no support for this code. - * * COPYRIGHT (c) 1989-1997. * On-Line Applications Research Corporation (OAR). * Copyright assigned to U.S. Government, 1994. diff --git a/c/src/lib/wrapup/Makefile.in b/c/src/lib/wrapup/Makefile.in index c0c6d91214..483fdda4cd 100644 --- a/c/src/lib/wrapup/Makefile.in +++ b/c/src/lib/wrapup/Makefile.in @@ -25,6 +25,7 @@ LIB = $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a SRCS = $(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a $(wildcard \ $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) $(wildcard \ + $(PROJECT_RELEASE)/lib/libitron$(LIB_VARIANT).a) $(wildcard \ $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a) $(wildcard \ $(PROJECT_RELEASE)/lib/librpc$(LIB_VARIANT).a) $(wildcard \ $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a) $(wildcard \ diff --git a/c/src/make/Makefile.inc.in b/c/src/make/Makefile.inc.in index b9df25dcfa..c1aa34f6c8 100644 --- a/c/src/make/Makefile.inc.in +++ b/c/src/make/Makefile.inc.in @@ -35,6 +35,7 @@ RTEMS_CUSTOM = $(prefix)/make/custom/$(RTEMS_BSP).cfg PROJECT_ROOT = $(prefix)/ RTEMS_USE_OWN_PDIR = no RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@ +RTEMS_HAS_ITRON_API = @RTEMS_HAS_ITRON_API@ RTEMS_USE_MACROS = @RTEMS_USE_MACROS@ RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@ RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@ diff --git a/c/src/make/bsp.cfg.in b/c/src/make/bsp.cfg.in index 356dd72c20..e0ddae8cda 100644 --- a/c/src/make/bsp.cfg.in +++ b/c/src/make/bsp.cfg.in @@ -15,6 +15,11 @@ HAS_RDBG = @HAS_RDBG@ ## HAS_POSIX_API = @HAS_POSIX_API@ +## +## Does this BSP support RTEMS's ITRON API ? +## +HAS_ITRON_API = @HAS_ITRON_API@ + ## ## Does this BSP support RTEMS's CXX API ? ## diff --git a/c/src/make/configure.in b/c/src/make/configure.in index 28d14fb058..3047f719e2 100644 --- a/c/src/make/configure.in +++ b/c/src/make/configure.in @@ -18,6 +18,7 @@ AM_MAINTAINER_MODE RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_POSIX +RTEMS_ENABLE_ITRON RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_RDBG RTEMS_ENABLE_INLINES diff --git a/c/src/make/target.cfg.in b/c/src/make/target.cfg.in index f40a3753f3..a49cf8a8e3 100644 --- a/c/src/make/target.cfg.in +++ b/c/src/make/target.cfg.in @@ -39,6 +39,7 @@ RTEMS_CROSS_TARGET=@rtems_cv_prog_cc_cross@ RTEMS_HOST = @RTEMS_HOST@ RTEMS_HAS_MULTIPROCESSING = @RTEMS_HAS_MULTIPROCESSING@ RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@ +RTEMS_HAS_ITRON_API = @RTEMS_HAS_ITRON_API@ RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@ RTEMS_HAS_RDBG = @RTEMS_HAS_RDBG@ RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@ diff --git a/c/src/wrapup/Makefile.in b/c/src/wrapup/Makefile.in index c0c6d91214..483fdda4cd 100644 --- a/c/src/wrapup/Makefile.in +++ b/c/src/wrapup/Makefile.in @@ -25,6 +25,7 @@ LIB = $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a SRCS = $(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a $(wildcard \ $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) $(wildcard \ + $(PROJECT_RELEASE)/lib/libitron$(LIB_VARIANT).a) $(wildcard \ $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a) $(wildcard \ $(PROJECT_RELEASE)/lib/librpc$(LIB_VARIANT).a) $(wildcard \ $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a) $(wildcard \ diff --git a/configure.in b/configure.in index b4625e51d8..b202dde4f3 100644 --- a/configure.in +++ b/configure.in @@ -18,6 +18,7 @@ dnl These option are only in here to let --help report all supported dnl options. RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_POSIX +RTEMS_ENABLE_ITRON RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_RDBG RTEMS_ENABLE_INLINES diff --git a/make/target.cfg.in b/make/target.cfg.in index f40a3753f3..a49cf8a8e3 100644 --- a/make/target.cfg.in +++ b/make/target.cfg.in @@ -39,6 +39,7 @@ RTEMS_CROSS_TARGET=@rtems_cv_prog_cc_cross@ RTEMS_HOST = @RTEMS_HOST@ RTEMS_HAS_MULTIPROCESSING = @RTEMS_HAS_MULTIPROCESSING@ RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@ +RTEMS_HAS_ITRON_API = @RTEMS_HAS_ITRON_API@ RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@ RTEMS_HAS_RDBG = @RTEMS_HAS_RDBG@ RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@ diff --git a/tools/update/cipolish b/tools/update/cipolish index e7a72c92ab..bd83aee275 100755 --- a/tools/update/cipolish +++ b/tools/update/cipolish @@ -65,6 +65,10 @@ while( <> ) { #remove the line } + elsif ( /^[ ]*AC_SUBST\(RTEMS_HAS_ITRON_API\)[ ]*$/o ) + { + #remove the line + } elsif ( /^[ ]*AC_SUBST\(RTEMS_HAS_HWAPI\)[ ]*$/o ) { #remove the line -- cgit v1.2.3