diff options
23 files changed, 31 insertions, 399 deletions
diff --git a/c/README.DOS b/c/README.DOS index 908d6f4c9a..5219479910 100644 --- a/c/README.DOS +++ b/c/README.DOS @@ -1,5 +1,5 @@ # -# $Id$ +# $Id$ # tools diff --git a/c/build-tools/cklength.c b/c/build-tools/cklength.c index b2a8cdf006..0849b9bbf8 100644 --- a/c/build-tools/cklength.c +++ b/c/build-tools/cklength.c @@ -11,6 +11,9 @@ * * $Id$ * $Log$ + * Revision 1.4 1995/10/06 20:00:38 joel + * SPARC merged and successfully tested w/o interrupt support + * * Revision 1.3 1995/10/06 16:32:20 joel * moved to new development machine and went to gcc 2.7.0 * diff --git a/c/build-tools/eolstrip.c b/c/build-tools/eolstrip.c index bf39bd4972..e258fcd9be 100644 --- a/c/build-tools/eolstrip.c +++ b/c/build-tools/eolstrip.c @@ -9,6 +9,9 @@ * * $Id$ * $Log$ + * Revision 1.4 1995/10/06 20:00:39 joel + * SPARC merged and successfully tested w/o interrupt support + * * Revision 1.3 1995/10/06 16:32:21 joel * moved to new development machine and went to gcc 2.7.0 * diff --git a/c/build-tools/src/cklength.c b/c/build-tools/src/cklength.c index b2a8cdf006..0849b9bbf8 100644 --- a/c/build-tools/src/cklength.c +++ b/c/build-tools/src/cklength.c @@ -11,6 +11,9 @@ * * $Id$ * $Log$ + * Revision 1.4 1995/10/06 20:00:38 joel + * SPARC merged and successfully tested w/o interrupt support + * * Revision 1.3 1995/10/06 16:32:20 joel * moved to new development machine and went to gcc 2.7.0 * diff --git a/c/build-tools/src/eolstrip.c b/c/build-tools/src/eolstrip.c index bf39bd4972..e258fcd9be 100644 --- a/c/build-tools/src/eolstrip.c +++ b/c/build-tools/src/eolstrip.c @@ -9,6 +9,9 @@ * * $Id$ * $Log$ + * Revision 1.4 1995/10/06 20:00:39 joel + * SPARC merged and successfully tested w/o interrupt support + * * Revision 1.3 1995/10/06 16:32:21 joel * moved to new development machine and went to gcc 2.7.0 * diff --git a/c/src/exec/score/headers/interr.h b/c/src/exec/score/headers/interr.h index c1088a9dff..655656acc7 100644 --- a/c/src/exec/score/headers/interr.h +++ b/c/src/exec/score/headers/interr.h @@ -12,7 +12,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id# + * $Id$ */ #ifndef __RTEMS_INTERNAL_ERROR_h diff --git a/c/src/exec/score/include/rtems/score/interr.h b/c/src/exec/score/include/rtems/score/interr.h index c1088a9dff..655656acc7 100644 --- a/c/src/exec/score/include/rtems/score/interr.h +++ b/c/src/exec/score/include/rtems/score/interr.h @@ -12,7 +12,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id# + * $Id$ */ #ifndef __RTEMS_INTERNAL_ERROR_h diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c index 0f0ecbf00d..9336a54a09 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c @@ -1,4 +1,3 @@ -#define STACK_CHECKER_ON /* bsp_start() * * This routine starts the application. It includes application, diff --git a/c/src/lib/libbsp/m68k/mvme162/include/page_table.h b/c/src/lib/libbsp/m68k/mvme162/include/page_table.h index ec73c3dae8..a5685245f2 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/page_table.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/page_table.h @@ -5,6 +5,9 @@ * supports page table initialization. * * $Log$ + * Revision 1.1 1995/12/19 19:22:36 joel + * file lost in crash and re-added + * * Revision 1.1 1995/12/05 15:29:19 joel * added.. submitted by Eric Vaitl <vaitl@viasat.com> * diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/README b/c/src/lib/libbsp/unix/posix/shmsupp/README index 93d6fcbe8c..e69de29bb2 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/README +++ b/c/src/lib/libbsp/unix/posix/shmsupp/README @@ -1,9 +0,0 @@ -# -# $Id$ -# - -This directory contains the SHM driver support files for -System V/POSIX derived UNIX flavors. - -WARNING: The interrupt support in this directory currently will - only work in a homogeneous system. diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c b/c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c index 8af7498b64..e69de29bb2 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c +++ b/c/src/lib/libbsp/unix/posix/shmsupp/addrconv.c @@ -1,30 +0,0 @@ -/* rtems_unsigned32 *Shm_Convert_address( addr ) - * - * No address range conversion is required. - * - * Input parameters: - * addr - address to convert - * - * Output parameters: - * returns - converted address - * - * COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994. - * On-Line Applications Research Corporation (OAR). - * All rights assigned to U.S. Government, 1994. - * - * This material may be reproduced by or for the U.S. Government pursuant - * to the copyright license under the clause at DFARS 252.227-7013. This - * notice must appear in all copies of this file and its derivatives. - * - * $Id$ - */ - -#include <bsp.h> -#include <shm.h> - -void *Shm_Convert_address( - void *addr -) -{ - return ( addr ); -} diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c b/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c index c912447631..e69de29bb2 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c +++ b/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c @@ -1,74 +0,0 @@ -/* void Shm_get_config( localnode, &shmcfg ) - * - * This routine initializes, if necessary, and returns a pointer - * to the Shared Memory Configuration Table for the UNIX - * simulator. - * - * INPUT PARAMETERS: - * localnode - local node number - * shmcfg - address of pointer to SHM Config Table - * - * OUTPUT PARAMETERS: - * *shmcfg - pointer to SHM Config Table - * - * NOTES: This driver is capable of supporting a practically unlimited - * number of nodes. - * - * COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994. - * On-Line Applications Research Corporation (OAR). - * All rights assigned to U.S. Government, 1994. - * - * This material may be reproduced by or for the U.S. Government pursuant - * to the copyright license under the clause at DFARS 252.227-7013. This - * notice must appear in all copies of this file and its derivatives. - * - * $Id$ - */ - -#include <bsp.h> -#include <shm.h> - -shm_config_table BSP_shm_cfgtbl; - -int semid; - -void Shm_Cause_interrupt_unix( - rtems_unsigned32 node -); - -void Shm_Get_configuration( - rtems_unsigned32 localnode, - shm_config_table **shmcfg -) -{ - _CPU_SHM_Init( - Shm_Maximum_nodes, - Shm_Is_master_node(), - (void **)&BSP_shm_cfgtbl.base, - (unsigned32 *)&BSP_shm_cfgtbl.length - ); - - BSP_shm_cfgtbl.format = SHM_BIG; - - BSP_shm_cfgtbl.cause_intr = Shm_Cause_interrupt_unix; - -#ifdef NEUTRAL_BIG - BSP_shm_cfgtbl.convert = NULL_CONVERT; -#else - BSP_shm_cfgtbl.convert = CPU_swap_u32; -#endif - - if ( _CPU_SHM_Get_vector() ) { - BSP_shm_cfgtbl.poll_intr = INTR_MODE; - BSP_shm_cfgtbl.Intr.address = (vol_u32 *) _CPU_Get_pid(); /* process id */ - BSP_shm_cfgtbl.Intr.value = _CPU_SHM_Get_vector(); /* signal to send */ - BSP_shm_cfgtbl.Intr.length = LONG; - } else { - BSP_shm_cfgtbl.poll_intr = POLLED_MODE; - BSP_shm_cfgtbl.Intr.address = NO_INTERRUPT; - BSP_shm_cfgtbl.Intr.value = NO_INTERRUPT; - BSP_shm_cfgtbl.Intr.length = NO_INTERRUPT; - } - - *shmcfg = &BSP_shm_cfgtbl; -} diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/intr.c b/c/src/lib/libbsp/unix/posix/shmsupp/intr.c index 243af403d9..e69de29bb2 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/intr.c +++ b/c/src/lib/libbsp/unix/posix/shmsupp/intr.c @@ -1,33 +0,0 @@ -/* void Shm_interrupt_unix( node ) - * - * This routine is the shared memory driver routine which - * generates interrupts to other CPUs. - * - * Input parameters: - * node - destination of this packet (0 = broadcast) - * - * Output parameters: NONE - * - * COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994. - * On-Line Applications Research Corporation (OAR). - * All rights assigned to U.S. Government, 1994. - * - * This material may be reproduced by or for the U.S. Government pursuant - * to the copyright license under the clause at DFARS 252.227-7013. This - * notice must appear in all copies of this file and its derivatives. - * - * $Id$ - */ - -#include <bsp.h> -#include <shm.h> - -void Shm_Cause_interrupt_unix( - rtems_unsigned32 node -) -{ - Shm_Interrupt_information *intr; - intr = &Shm_Interrupt_table[node]; - - _CPU_SHM_Send_interrupt( (int) intr->address, (int) intr->value ); -} diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/lock.c b/c/src/lib/libbsp/unix/posix/shmsupp/lock.c index 76a57d0a06..e69de29bb2 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/lock.c +++ b/c/src/lib/libbsp/unix/posix/shmsupp/lock.c @@ -1,74 +0,0 @@ -/* Shared Memory Lock Routines - * - * This shared memory locked queue support routine need to be - * able to lock the specified locked queue. Interrupts are - * disabled while the queue is locked to prevent preemption - * and deadlock when two tasks poll for the same lock. - * previous level. - * - * COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994. - * On-Line Applications Research Corporation (OAR). - * All rights assigned to U.S. Government, 1994. - * - * This material may be reproduced by or for the U.S. Government pursuant - * to the copyright license under the clause at DFARS 252.227-7013. This - * notice must appear in all copies of this file and its derivatives. - * - * $Id$ - */ - -#include <bsp.h> -#include <shm.h> - -extern int semid; - -/* - * Shm_Initialize_lock - * - * Initialize the lock for the specified locked queue. - */ - -void Shm_Initialize_lock( - Shm_Locked_queue_Control *lq_cb -) -{ - lq_cb->lock = lq_cb - Shm_Locked_queues; -} - -/* Shm_Lock( &lq_cb ) - * - * This shared memory locked queue support routine locks the - * specified locked queue. It disables interrupts to prevent - * a deadlock condition. - */ - -void Shm_Lock( - Shm_Locked_queue_Control *lq_cb -) -{ - rtems_unsigned32 isr_level; - - rtems_interrupt_disable( isr_level ); - - Shm_isrstat = isr_level; - - _CPU_SHM_Lock( lq_cb->lock ); -} - -/* - * Shm_Unlock - * - * Unlock the lock for the specified locked queue. - */ - -void Shm_Unlock( - Shm_Locked_queue_Control *lq_cb -) -{ - rtems_unsigned32 isr_level; - - _CPU_SHM_Unlock( lq_cb->lock ); - - isr_level = Shm_isrstat; - rtems_interrupt_enable( isr_level ); -} diff --git a/c/src/tests/mptests/mp12/system.h b/c/src/tests/mptests/mp12/system.h index c743c4a415..e69de29bb2 100644 --- a/c/src/tests/mptests/mp12/system.h +++ b/c/src/tests/mptests/mp12/system.h @@ -1,53 +0,0 @@ -/* system.h - * - * This include file contains information that is included in every - * function in the test set. - * - * COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994. - * On-Line Applications Research Corporation (OAR). - * All rights assigned to U.S. Government, 1994. - * - * This material may be reproduced by or for the U.S. Government pursuant - * to the copyright license under the clause at DFARS 252.227-7013. This - * notice must appear in all copies of this file and its derivatives. - * - * $Id$ - */ - -#include <tmacros.h> - -#define PT_NAME rtems_build_name( 'P', 'A', 'R', '\0' ) - -/* functions */ - -rtems_task Init( - rtems_task_argument argument -); - -/* configuration information */ - -#define CONFIGURE_MPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS 1 -#define CONFIGURE_MP_MAXIMUM_PROXIES 0 - -#if ( NODE_NUMBER == 1 ) -#define CONFIGURE_MAXIMUM_PARTITIONS 1 -#elif ( NODE_NUMBER == 2 ) -#define CONFIGURE_MAXIMUM_PARTITIONS 2 -#endif - -#include <confdefs.h> - -/* variables */ - -TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */ -TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */ - -TEST_EXTERN rtems_id Partition_id[ 2 ]; /* array of partition ids */ -TEST_EXTERN rtems_name Partition_name[ 2 ]; /* array of partition names */ - -/* end of include file */ diff --git a/c/src/tests/support/stubdr/close.c b/c/src/tests/support/stubdr/close.c index 02cd37f0a8..e69de29bb2 100644 --- a/c/src/tests/support/stubdr/close.c +++ b/c/src/tests/support/stubdr/close.c @@ -1,34 +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, 1990, 1991, 1992, 1993, 1994. - * On-Line Applications Research Corporation (OAR). - * All rights assigned to U.S. Government, 1994. - * - * This material may be reproduced by or for the U.S. Government pursuant - * to the copyright license under the clause at DFARS 252.227-7013. This - * notice must appear in all copies of this file and its derivatives. - * - * $Id$ - */ - -#include <rtems.h> -#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 index 0d21af5f4f..e69de29bb2 100644 --- a/c/src/tests/support/stubdr/cntrl.c +++ b/c/src/tests/support/stubdr/cntrl.c @@ -1,34 +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, 1990, 1991, 1992, 1993, 1994. - * On-Line Applications Research Corporation (OAR). - * All rights assigned to U.S. Government, 1994. - * - * This material may be reproduced by or for the U.S. Government pursuant - * to the copyright license under the clause at DFARS 252.227-7013. This - * notice must appear in all copies of this file and its derivatives. - * - * $Id$ - */ - -#include <rtems.h> -#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/cpukit/score/include/rtems/score/interr.h b/cpukit/score/include/rtems/score/interr.h index c1088a9dff..655656acc7 100644 --- a/cpukit/score/include/rtems/score/interr.h +++ b/cpukit/score/include/rtems/score/interr.h @@ -12,7 +12,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id# + * $Id$ */ #ifndef __RTEMS_INTERNAL_ERROR_h diff --git a/testsuites/mptests/mp12/system.h b/testsuites/mptests/mp12/system.h index c743c4a415..e69de29bb2 100644 --- a/testsuites/mptests/mp12/system.h +++ b/testsuites/mptests/mp12/system.h @@ -1,53 +0,0 @@ -/* system.h - * - * This include file contains information that is included in every - * function in the test set. - * - * COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994. - * On-Line Applications Research Corporation (OAR). - * All rights assigned to U.S. Government, 1994. - * - * This material may be reproduced by or for the U.S. Government pursuant - * to the copyright license under the clause at DFARS 252.227-7013. This - * notice must appear in all copies of this file and its derivatives. - * - * $Id$ - */ - -#include <tmacros.h> - -#define PT_NAME rtems_build_name( 'P', 'A', 'R', '\0' ) - -/* functions */ - -rtems_task Init( - rtems_task_argument argument -); - -/* configuration information */ - -#define CONFIGURE_MPTEST - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS 1 -#define CONFIGURE_MP_MAXIMUM_PROXIES 0 - -#if ( NODE_NUMBER == 1 ) -#define CONFIGURE_MAXIMUM_PARTITIONS 1 -#elif ( NODE_NUMBER == 2 ) -#define CONFIGURE_MAXIMUM_PARTITIONS 2 -#endif - -#include <confdefs.h> - -/* variables */ - -TEST_EXTERN rtems_id Task_id[ 4 ]; /* array of task ids */ -TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */ - -TEST_EXTERN rtems_id Partition_id[ 2 ]; /* array of partition ids */ -TEST_EXTERN rtems_name Partition_name[ 2 ]; /* array of partition names */ - -/* end of include file */ diff --git a/tools/build/cklength.c b/tools/build/cklength.c index b2a8cdf006..0849b9bbf8 100644 --- a/tools/build/cklength.c +++ b/tools/build/cklength.c @@ -11,6 +11,9 @@ * * $Id$ * $Log$ + * Revision 1.4 1995/10/06 20:00:38 joel + * SPARC merged and successfully tested w/o interrupt support + * * Revision 1.3 1995/10/06 16:32:20 joel * moved to new development machine and went to gcc 2.7.0 * diff --git a/tools/build/eolstrip.c b/tools/build/eolstrip.c index bf39bd4972..e258fcd9be 100644 --- a/tools/build/eolstrip.c +++ b/tools/build/eolstrip.c @@ -9,6 +9,9 @@ * * $Id$ * $Log$ + * Revision 1.4 1995/10/06 20:00:39 joel + * SPARC merged and successfully tested w/o interrupt support + * * Revision 1.3 1995/10/06 16:32:21 joel * moved to new development machine and went to gcc 2.7.0 * diff --git a/tools/build/src/cklength.c b/tools/build/src/cklength.c index b2a8cdf006..0849b9bbf8 100644 --- a/tools/build/src/cklength.c +++ b/tools/build/src/cklength.c @@ -11,6 +11,9 @@ * * $Id$ * $Log$ + * Revision 1.4 1995/10/06 20:00:38 joel + * SPARC merged and successfully tested w/o interrupt support + * * Revision 1.3 1995/10/06 16:32:20 joel * moved to new development machine and went to gcc 2.7.0 * diff --git a/tools/build/src/eolstrip.c b/tools/build/src/eolstrip.c index bf39bd4972..e258fcd9be 100644 --- a/tools/build/src/eolstrip.c +++ b/tools/build/src/eolstrip.c @@ -9,6 +9,9 @@ * * $Id$ * $Log$ + * Revision 1.4 1995/10/06 20:00:39 joel + * SPARC merged and successfully tested w/o interrupt support + * * Revision 1.3 1995/10/06 16:32:21 joel * moved to new development machine and went to gcc 2.7.0 * |