From 37222c7e74e745152f24389d7b74ed81deee9ca1 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 26 Jan 2001 21:57:44 +0000 Subject: 2001-01-26 Ralf Corsepius * configure.in: Remove stubdr, wrapup, AC_INIT(include). * Makefile.am: Remove stubdr, wrapup. * stubdr/Makefile.am, stubdr/open.c, stubdr/close.c, stubdr/init.c, stubdr/stubdrv.h, stubdr/cntrl.c, stubdr/.cvsignore, stubdr/read.c, stubdr/write.c, wrapup/Makefile.am, wrapup/.cvsignore, stubdr/, wrapup/: Remove. --- c/src/tests/support/ChangeLog | 9 +++++ c/src/tests/support/Makefile.am | 2 +- c/src/tests/support/configure.in | 4 +- c/src/tests/support/stubdr/.cvsignore | 2 - c/src/tests/support/stubdr/Makefile.am | 40 -------------------- c/src/tests/support/stubdr/close.c | 33 ----------------- c/src/tests/support/stubdr/cntrl.c | 33 ----------------- c/src/tests/support/stubdr/init.c | 36 ------------------ c/src/tests/support/stubdr/open.c | 33 ----------------- c/src/tests/support/stubdr/read.c | 33 ----------------- c/src/tests/support/stubdr/stubdrv.h | 68 ---------------------------------- c/src/tests/support/stubdr/write.c | 33 ----------------- c/src/tests/support/wrapup/.cvsignore | 2 - c/src/tests/support/wrapup/Makefile.am | 33 ----------------- testsuites/support/ChangeLog | 9 +++++ testsuites/support/Makefile.am | 2 +- 16 files changed, 21 insertions(+), 351 deletions(-) delete mode 100644 c/src/tests/support/stubdr/.cvsignore delete mode 100644 c/src/tests/support/stubdr/Makefile.am delete mode 100644 c/src/tests/support/stubdr/close.c delete mode 100644 c/src/tests/support/stubdr/cntrl.c delete mode 100644 c/src/tests/support/stubdr/init.c delete mode 100644 c/src/tests/support/stubdr/open.c delete mode 100644 c/src/tests/support/stubdr/read.c delete mode 100644 c/src/tests/support/stubdr/stubdrv.h delete mode 100644 c/src/tests/support/stubdr/write.c delete mode 100644 c/src/tests/support/wrapup/.cvsignore delete mode 100644 c/src/tests/support/wrapup/Makefile.am diff --git a/c/src/tests/support/ChangeLog b/c/src/tests/support/ChangeLog index e9bec8b7c0..98bb513b2b 100644 --- a/c/src/tests/support/ChangeLog +++ b/c/src/tests/support/ChangeLog @@ -1,3 +1,12 @@ +2001-01-26 Ralf Corsepius + + * configure.in: Remove stubdr, wrapup, AC_INIT(include). + * Makefile.am: Remove stubdr, wrapup. + * stubdr/Makefile.am, stubdr/open.c, stubdr/close.c, stubdr/init.c, + stubdr/stubdrv.h, stubdr/cntrl.c, stubdr/.cvsignore, stubdr/read.c, + stubdr/write.c, wrapup/Makefile.am, wrapup/.cvsignore, stubdr/, + wrapup/: Remove. + 2000-11-09 Ralf Corsepius * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. diff --git a/c/src/tests/support/Makefile.am b/c/src/tests/support/Makefile.am index a9c20113fd..5bc471a7c0 100644 --- a/c/src/tests/support/Makefile.am +++ b/c/src/tests/support/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I ../../../../aclocal -SUBDIRS = include stubdr wrapup +SUBDIRS = include include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/tests/support/configure.in b/c/src/tests/support/configure.in index bf2c4f3e06..4d419970bb 100644 --- a/c/src/tests/support/configure.in +++ b/c/src/tests/support/configure.in @@ -3,7 +3,7 @@ dnl dnl $Id$ AC_PREREQ(2.13) -AC_INIT(wrapup) +AC_INIT(include) RTEMS_TOP(../../../..) AC_CONFIG_AUX_DIR(../../../..) @@ -31,6 +31,4 @@ AC_SUBST(BARE_CPU_MODEL) AC_OUTPUT( Makefile include/Makefile -stubdr/Makefile -wrapup/Makefile ) diff --git a/c/src/tests/support/stubdr/.cvsignore b/c/src/tests/support/stubdr/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/tests/support/stubdr/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/tests/support/stubdr/Makefile.am b/c/src/tests/support/stubdr/Makefile.am deleted file mode 100644 index 7c1343eeb2..0000000000 --- a/c/src/tests/support/stubdr/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -PGM = ${ARCH}/stubdr.rel - -C_FILES = open.c close.c read.c write.c init.c cntrl.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) - -H_FILES = stubdrv.h -noinst_HEADERS = $(H_FILES) - -SRCS = $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) - -$(PROJECT_INCLUDE): - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): ${OBJS} - $(make-rel) - -all-local: ${ARCH} $(PGM) $(TMPINSTALL_FILES) - -EXTRA_DIST = $(C_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/tests/support/stubdr/close.c b/c/src/tests/support/stubdr/close.c deleted file mode 100644 index 2dcb12970c..0000000000 --- a/c/src/tests/support/stubdr/close.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Stub_close - * - * This routine is the terminal driver close routine. - * - * Input parameters: - * major - device major number - * minor - device minor number - * pargb - pointer to close parameter block - * - * Output parameters: - * rval - STUB_SUCCESSFUL - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include "stubdrv.h" - -rtems_device_driver Stub_close( - rtems_device_major_number major, - rtems_device_minor_number minor, - void *pargp -) -{ - return STUB_SUCCESSFUL; -} diff --git a/c/src/tests/support/stubdr/cntrl.c b/c/src/tests/support/stubdr/cntrl.c deleted file mode 100644 index 4d75b617a2..0000000000 --- a/c/src/tests/support/stubdr/cntrl.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Stub_control - * - * This routine is the terminal driver control routine. - * - * Input parameters: - * major - device major number - * minor - device minor number - * pargp - pointer to cntrl parameter block - * - * Output parameters: - * rval - STUB_SUCCESSFUL - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include "stubdrv.h" - -rtems_device_driver Stub_control( - rtems_device_major_number major, - rtems_device_minor_number minor, - void *pargp -) -{ - return STUB_SUCCESSFUL; -} diff --git a/c/src/tests/support/stubdr/init.c b/c/src/tests/support/stubdr/init.c deleted file mode 100644 index b00a1d6701..0000000000 --- a/c/src/tests/support/stubdr/init.c +++ /dev/null @@ -1,36 +0,0 @@ -/* Stub_initialize - * - * This routine is the terminal driver init routine. - * - * Input parameters: - * major - device major number - * minor - device minor number - * pargp - pointer to parameter block - * - * Output parameters: - * rval - STUB_SUCCESSFUL - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include "stubdrv.h" - -rtems_unsigned32 STUB_major; - -rtems_device_driver Stub_initialize( - rtems_device_major_number major, - rtems_device_minor_number minor, - void *pargp -) -{ - STUB_major = major; - return STUB_SUCCESSFUL; -} diff --git a/c/src/tests/support/stubdr/open.c b/c/src/tests/support/stubdr/open.c deleted file mode 100644 index d7da70a070..0000000000 --- a/c/src/tests/support/stubdr/open.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Stub_open - * - * This routine is the terminal driver open routine. - * - * Input parameters: - * major - device major number - * minor - device minor number - * pargb - pointer to open parameter block - * - * Output parameters: - * rval - STUB_SUCCESSFUL - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include "stubdrv.h" - -rtems_device_driver Stub_open( - rtems_device_major_number major, - rtems_device_minor_number minor, - void *pargp -) -{ - return STUB_SUCCESSFUL; -} diff --git a/c/src/tests/support/stubdr/read.c b/c/src/tests/support/stubdr/read.c deleted file mode 100644 index f8be255e97..0000000000 --- a/c/src/tests/support/stubdr/read.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Stub_read - * - * This routine is the terminal driver read routine. - * - * Input parameters: - * major - device major number - * minor - device minor number - * pargp - pointer to read parameter block - * - * Output parameters: - * rval - STUB_SUCCESSFUL - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include "stubdrv.h" - -rtems_device_driver Stub_read( - rtems_device_major_number major, - rtems_device_minor_number minor, - void *pargp -) -{ - return STUB_SUCCESSFUL; -} diff --git a/c/src/tests/support/stubdr/stubdrv.h b/c/src/tests/support/stubdr/stubdrv.h deleted file mode 100644 index 08f3e7822a..0000000000 --- a/c/src/tests/support/stubdr/stubdrv.h +++ /dev/null @@ -1,68 +0,0 @@ -/* stubdrv.h - * - * This file describes the Stub Driver for all boards. - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#ifndef __STUB_DRIVER_h -#define __STUB_DRIVER_h - -#ifdef __cplusplus -extern "C" { -#endif - -#define STUB_DRIVER_TABLE_ENTRY \ - { Stub_initialize, NULL, NULL, NULL, NULL, NULL } - -#define STUB_SUCCESSFUL RTEMS_SUCCESSFUL - -rtems_device_driver Stub_initialize( - rtems_device_major_number, - rtems_device_minor_number, - void * -); - -rtems_device_driver Stub_open( - rtems_device_major_number, - rtems_device_minor_number, - void * -); - -rtems_device_driver Stub_close( - rtems_device_major_number, - rtems_device_minor_number, - void * -); - -rtems_device_driver Stub_read( - rtems_device_major_number, - rtems_device_minor_number, - void * -); - -rtems_device_driver Stub_write( - rtems_device_major_number, - rtems_device_minor_number, - void * -); - -rtems_device_driver Stub_control( - rtems_device_major_number, - rtems_device_minor_number, - void * -); - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ diff --git a/c/src/tests/support/stubdr/write.c b/c/src/tests/support/stubdr/write.c deleted file mode 100644 index c82d419f58..0000000000 --- a/c/src/tests/support/stubdr/write.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Stub_write - * - * This routine is the terminal driver write routine. - * - * Input parameters: - * major - device major number - * minor - device minor number - * pargp - pointer to write parameter block - * - * Output parameters: - * rval - STUB_SUCCESSFUL - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include "stubdrv.h" - -rtems_device_driver Stub_write( - rtems_device_major_number major, - rtems_device_minor_number minor, - void *pargp -) -{ - return STUB_SUCCESSFUL; -} diff --git a/c/src/tests/support/wrapup/.cvsignore b/c/src/tests/support/wrapup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/tests/support/wrapup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/tests/support/wrapup/Makefile.am b/c/src/tests/support/wrapup/Makefile.am deleted file mode 100644 index 61cd22e363..0000000000 --- a/c/src/tests/support/wrapup/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -LIBNAME = libtest -LIB = $(ARCH)/$(LIBNAME).a - -GENERIC_FILES = stubdr - -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(GENERIC_FILES), ../$(piece)/$(ARCH)/$(piece).rel) - -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 += -# - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a - -$(LIB): ${OBJS} - $(make-library) - -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ - -all-local: ${ARCH} $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/testsuites/support/ChangeLog b/testsuites/support/ChangeLog index e9bec8b7c0..98bb513b2b 100644 --- a/testsuites/support/ChangeLog +++ b/testsuites/support/ChangeLog @@ -1,3 +1,12 @@ +2001-01-26 Ralf Corsepius + + * configure.in: Remove stubdr, wrapup, AC_INIT(include). + * Makefile.am: Remove stubdr, wrapup. + * stubdr/Makefile.am, stubdr/open.c, stubdr/close.c, stubdr/init.c, + stubdr/stubdrv.h, stubdr/cntrl.c, stubdr/.cvsignore, stubdr/read.c, + stubdr/write.c, wrapup/Makefile.am, wrapup/.cvsignore, stubdr/, + wrapup/: Remove. + 2000-11-09 Ralf Corsepius * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. diff --git a/testsuites/support/Makefile.am b/testsuites/support/Makefile.am index a9c20113fd..5bc471a7c0 100644 --- a/testsuites/support/Makefile.am +++ b/testsuites/support/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I ../../../../aclocal -SUBDIRS = include stubdr wrapup +SUBDIRS = include include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3