From 8f51fa52e2603598f0cd2b158eb7a0bb9f4bda0c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 18 Jul 2003 14:22:14 +0000 Subject: [PATCH] 2003-07-18 Joel Sherrill PR 426/ada * configure.ac, samples/Makefile.am: Remove base_mp from 4.6 branch. * samples/base_mp/.cvsignore, samples/base_mp/Makefile.am, samples/base_mp/config.h, samples/base_mp/mptest.adb, samples/base_mp/mptest.ads, samples/base_mp/node1/.cvsignore, samples/base_mp/node1/Makefile.am, samples/base_mp/node1/base_mp.scn, samples/base_mp/node2/.cvsignore, samples/base_mp/node2/Makefile.am, samples/base_mp/node2/base_mp.scn: Removed. --- c/src/ada-tests/ChangeLog | 11 ++ c/src/ada-tests/configure.ac | 8 -- c/src/ada-tests/samples/Makefile.am | 5 - c/src/ada-tests/samples/base_mp/.cvsignore | 2 - c/src/ada-tests/samples/base_mp/Makefile.am | 25 ----- c/src/ada-tests/samples/base_mp/config.h | 38 ------- c/src/ada-tests/samples/base_mp/mptest.adb | 103 ------------------ c/src/ada-tests/samples/base_mp/mptest.ads | 62 ----------- .../samples/base_mp/node1/.cvsignore | 2 - .../samples/base_mp/node1/Makefile.am | 24 ---- .../samples/base_mp/node1/base_mp.scn | 5 - .../samples/base_mp/node2/.cvsignore | 2 - .../samples/base_mp/node2/Makefile.am | 26 ----- .../samples/base_mp/node2/base_mp.scn | 5 - 14 files changed, 11 insertions(+), 307 deletions(-) delete mode 100644 c/src/ada-tests/samples/base_mp/.cvsignore delete mode 100644 c/src/ada-tests/samples/base_mp/Makefile.am delete mode 100644 c/src/ada-tests/samples/base_mp/config.h delete mode 100644 c/src/ada-tests/samples/base_mp/mptest.adb delete mode 100644 c/src/ada-tests/samples/base_mp/mptest.ads delete mode 100644 c/src/ada-tests/samples/base_mp/node1/.cvsignore delete mode 100644 c/src/ada-tests/samples/base_mp/node1/Makefile.am delete mode 100644 c/src/ada-tests/samples/base_mp/node1/base_mp.scn delete mode 100644 c/src/ada-tests/samples/base_mp/node2/.cvsignore delete mode 100644 c/src/ada-tests/samples/base_mp/node2/Makefile.am delete mode 100644 c/src/ada-tests/samples/base_mp/node2/base_mp.scn diff --git a/c/src/ada-tests/ChangeLog b/c/src/ada-tests/ChangeLog index 4f207972af..b790d5dac8 100644 --- a/c/src/ada-tests/ChangeLog +++ b/c/src/ada-tests/ChangeLog @@ -1,3 +1,14 @@ +2003-07-18 Joel Sherrill + + PR 426/ada + * configure.ac, samples/Makefile.am: Remove base_mp from 4.6 branch. + * samples/base_mp/.cvsignore, samples/base_mp/Makefile.am, + samples/base_mp/config.h, samples/base_mp/mptest.adb, + samples/base_mp/mptest.ads, samples/base_mp/node1/.cvsignore, + samples/base_mp/node1/Makefile.am, samples/base_mp/node1/base_mp.scn, + samples/base_mp/node2/.cvsignore, samples/base_mp/node2/Makefile.am, + samples/base_mp/node2/base_mp.scn: Removed. + 2003-07-17 Joel Sherrill PR 425/ada diff --git a/c/src/ada-tests/configure.ac b/c/src/ada-tests/configure.ac index 411f591598..995d8d40ca 100644 --- a/c/src/ada-tests/configure.ac +++ b/c/src/ada-tests/configure.ac @@ -50,14 +50,6 @@ samples/hello/Makefile samples/ticker/Makefile ]) -if test "$HAS_MP" = "yes"; then -AC_CONFIG_FILES([ -samples/base_mp/Makefile -samples/base_mp/node1/Makefile -samples/base_mp/node2/Makefile -]) -fi - AC_CONFIG_FILES([ sptests/Makefile sptests/sp01/Makefile diff --git a/c/src/ada-tests/samples/Makefile.am b/c/src/ada-tests/samples/Makefile.am index 512bf021c0..a3edb7b0b0 100644 --- a/c/src/ada-tests/samples/Makefile.am +++ b/c/src/ada-tests/samples/Makefile.am @@ -2,10 +2,5 @@ SUBDIRS = hello ticker base_sp -if HAS_MP -SUBDIRS += base_mp -endif - - include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/ada-tests/samples/base_mp/.cvsignore b/c/src/ada-tests/samples/base_mp/.cvsignore deleted file mode 100644 index 3dda72986f..0000000000 --- a/c/src/ada-tests/samples/base_mp/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile.in -Makefile diff --git a/c/src/ada-tests/samples/base_mp/Makefile.am b/c/src/ada-tests/samples/base_mp/Makefile.am deleted file mode 100644 index 2349541b6c..0000000000 --- a/c/src/ada-tests/samples/base_mp/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## $Id$ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/subdirs.am - -SUBDIRS = node1 node2 -#include $(top_srcdir)/ada.am - -#mptest$(EXEEXT): mptest.adb -# $(GNATCOMPILE) -margs -a $< -o $@ - -#if EXPADA -#noinst_PROGRAMS = mptest -#endif - -#mptest_SOURCES = mptest.adb mptest.ads - -#EXTRA_DIST = node1/base_mp.scn -#EXTRA_DIST += node1/mptest-per_node_configuration.adb - -#EXTRA_DIST += node2/base_mp.scn -#EXTRA_DIST += node2/mptest-per_node_configuration.adb - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/ada-tests/samples/base_mp/config.h b/c/src/ada-tests/samples/base_mp/config.h deleted file mode 100644 index 88f8fc564b..0000000000 --- a/c/src/ada-tests/samples/base_mp/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* system.h - * - * This include file contains information that is included in every - * function in the test set. - * - * 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$ - */ - -/* configuration information */ - -#define CONFIGURE_MP_APPLICATION - -#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_MAXIMUM_TASKS 2 - -#define CONFIGURE_POSIX_INIT_THREAD_TABLE - -#define CONFIGURE_MAXIMUM_POSIX_THREADS 10 -#define CONFIGURE_MAXIMUM_POSIX_KEYS 10 -#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20 -#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10 - -/* - * Put the overrides of default configuration parameters here. - */ - -#include - -/* end of include file */ diff --git a/c/src/ada-tests/samples/base_mp/mptest.adb b/c/src/ada-tests/samples/base_mp/mptest.adb deleted file mode 100644 index 490f55cc54..0000000000 --- a/c/src/ada-tests/samples/base_mp/mptest.adb +++ /dev/null @@ -1,103 +0,0 @@ --- --- MPTEST / BODY --- --- DESCRIPTION: --- --- This package is the implementation for Test 1 of the RTEMS --- Multiprocessor Test Suite. --- --- DEPENDENCIES: --- --- --- --- COPYRIGHT (c) 1989-1997. --- On-Line Applications Research Corporation (OAR). --- Copyright assigned to U.S. Government, 1994. --- --- The license and distribution terms for this file may in --- the file LICENSE in this distribution or at --- http://www.OARcorp.com/rtems/license.html. --- --- $Id$ --- - -with INTERFACES; use INTERFACES; -with RTEMS; -with TEST_SUPPORT; -with TEXT_IO; -with UNSIGNED32_IO; - -package body MPTEST is - ---PAGE --- --- INIT --- - - procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT - ) is - STATUS : RTEMS.STATUS_CODES; - begin - - TEXT_IO.NEW_LINE( 2 ); - TEXT_IO.PUT( "*** SAMPLE MULTIPROCESSOR APPLICATION ***" ); - TEXT_IO.PUT( "Creating and starting an application task" ); - - - MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' ); - - RTEMS.TASK_CREATE( - MPTEST.TASK_NAME( 1 ), - 1, - 2048, - RTEMS.INTERRUPT_LEVEL( 0 ), - RTEMS.DEFAULT_ATTRIBUTES, - MPTEST.TASK_ID( 1 ), - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" ); - - RTEMS.TASK_START( - MPTEST.TASK_ID( 1 ), - MPTEST.APPLICATION_TASK'ACCESS, - 0, - STATUS - ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" ); - - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); - - end INIT; - ---PAGE --- --- APPLICATION_TASK --- - - procedure APPLICATION_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT - ) is - TID : RTEMS.ID; - STATUS : RTEMS.STATUS_CODES; - begin - - RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS ); - TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" ); - - TEXT_IO.PUT( "This task was invoked with node argument (" ); - UNSIGNED32_IO.PUT( ARGUMENT ); - TEXT_IO.PUT_LINE( ")" ); - - TEXT_IO.PUT( "This task has the id of 0x" ); - UNSIGNED32_IO.PUT( TID, BASE => 16 ); - TEXT_IO.NEW_LINE; - - TEXT_IO.PUT_LINE( "*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***" ); - - RTEMS.SHUTDOWN_EXECUTIVE( 0 ); - - end APPLICATION_TASK; - -end MPTEST; diff --git a/c/src/ada-tests/samples/base_mp/mptest.ads b/c/src/ada-tests/samples/base_mp/mptest.ads deleted file mode 100644 index 984c12254b..0000000000 --- a/c/src/ada-tests/samples/base_mp/mptest.ads +++ /dev/null @@ -1,62 +0,0 @@ --- --- MPTEST / SPECIFICATION --- --- DESCRIPTION: --- --- This package is the specification for Test 1 of the RTEMS --- Multiprocessor Test Suite. --- --- DEPENDENCIES: --- --- --- --- COPYRIGHT (c) 1989-1997. --- On-Line Applications Research Corporation (OAR). --- Copyright assigned to U.S. Government, 1994. --- --- The license and distribution terms for this file may in --- the file LICENSE in this distribution or at --- http://www.OARcorp.com/rtems/license.html. --- --- $Id$ --- - -with RTEMS; - -package MPTEST is - --- --- These arrays contain the IDs and NAMEs of all RTEMS tasks created --- by this test. --- - - TASK_ID : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID; - TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME; - --- --- INIT --- --- DESCRIPTION: --- --- This RTEMS task initializes the application. --- - - procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT - ); - --- --- APPLICATION_TASK --- --- DESCRIPTION: --- --- This routine is as an example of an application task which --- prints a message including its RTEMS task id. This task --- then invokes exit to return to the monitor. --- - - procedure APPLICATION_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT - ); - -end MPTEST; diff --git a/c/src/ada-tests/samples/base_mp/node1/.cvsignore b/c/src/ada-tests/samples/base_mp/node1/.cvsignore deleted file mode 100644 index 3dda72986f..0000000000 --- a/c/src/ada-tests/samples/base_mp/node1/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile.in -Makefile diff --git a/c/src/ada-tests/samples/base_mp/node1/Makefile.am b/c/src/ada-tests/samples/base_mp/node1/Makefile.am deleted file mode 100644 index 6687d4cc5f..0000000000 --- a/c/src/ada-tests/samples/base_mp/node1/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## $Id$ - -NODE=1 - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am - -include $(top_srcdir)/ada.am - -AM_ADAFLAGS += -I$(srcdir)/.. - -node1$(EXEEXT): ../mptest.adb init.o - $(GNATCOMPILE) -margs -a $< -o $@ - -init.o: ../../../support/init.c - $(COMPILE.c) -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. -c $< - -if EXPADA -noinst_PROGRAMS = node1 -endif - -EXTRA_DIST = base_mp.scn - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/ada-tests/samples/base_mp/node1/base_mp.scn b/c/src/ada-tests/samples/base_mp/node1/base_mp.scn deleted file mode 100644 index a2d2f359be..0000000000 --- a/c/src/ada-tests/samples/base_mp/node1/base_mp.scn +++ /dev/null @@ -1,5 +0,0 @@ -*** SAMPLE MULTIPROCESSOR APPLICATION *** -Creating and starting an application task -This task was invoked with the node argument (1) -This task has the id of 0x10002 -*** END OF SAMPLE MULTIPROCESSOR APPLICATION *** diff --git a/c/src/ada-tests/samples/base_mp/node2/.cvsignore b/c/src/ada-tests/samples/base_mp/node2/.cvsignore deleted file mode 100644 index 3dda72986f..0000000000 --- a/c/src/ada-tests/samples/base_mp/node2/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile.in -Makefile diff --git a/c/src/ada-tests/samples/base_mp/node2/Makefile.am b/c/src/ada-tests/samples/base_mp/node2/Makefile.am deleted file mode 100644 index aa818980d6..0000000000 --- a/c/src/ada-tests/samples/base_mp/node2/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## $Id$ - -NODE=2 - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am - -include $(top_srcdir)/ada.am - -AM_ADAFLAGS += -I$(srcdir)/.. - -node2$(EXEEXT): ../mptest.adb init.o - $(GNATCOMPILE) -margs -a $< -o $@ - -init.o: ../../../support/init.c - $(COMPILE.c) -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. -c $< - -if EXPADA -noinst_PROGRAMS = node2 -endif - -node2_SOURCES = mptest-per_node_configuration.adb - -EXTRA_DIST = base_mp.scn - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/ada-tests/samples/base_mp/node2/base_mp.scn b/c/src/ada-tests/samples/base_mp/node2/base_mp.scn deleted file mode 100644 index 95bc96a808..0000000000 --- a/c/src/ada-tests/samples/base_mp/node2/base_mp.scn +++ /dev/null @@ -1,5 +0,0 @@ -*** SAMPLE MULTIPROCESSOR APPLICATION *** -Creating and starting an application task -This task was invoked with the node argument (2) -This task has the id of 0x20002 -*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***