diff options
414 files changed, 3776 insertions, 1118 deletions
diff --git a/c/src/exec/libcsupport/src/__brk.c b/c/src/exec/libcsupport/src/__brk.c index 7c43ffa32b..5f256cb072 100644 --- a/c/src/exec/libcsupport/src/__brk.c +++ b/c/src/exec/libcsupport/src/__brk.c @@ -14,7 +14,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. * - * __brk.c,v 1.2 1995/05/09 20:24:28 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/c/src/exec/libcsupport/src/__gettod.c b/c/src/exec/libcsupport/src/__gettod.c index 6f8df8a65f..d01a85b4a4 100644 --- a/c/src/exec/libcsupport/src/__gettod.c +++ b/c/src/exec/libcsupport/src/__gettod.c @@ -11,7 +11,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. * - * __gettod.c,v 1.2 1995/05/09 20:24:31 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/c/src/exec/libcsupport/src/newlibc.c b/c/src/exec/libcsupport/src/newlibc.c index c3e886266d..4493b473da 100644 --- a/c/src/exec/libcsupport/src/newlibc.c +++ b/c/src/exec/libcsupport/src/newlibc.c @@ -35,7 +35,7 @@ * * NOTE: * - * newlibc.c,v 1.2 1995/05/09 20:24:37 joel Exp + * $Id$ * */ diff --git a/c/src/exec/rtems/headers/dpmem.h b/c/src/exec/rtems/headers/dpmem.h index 669eb394d8..2b6016a842 100644 --- a/c/src/exec/rtems/headers/dpmem.h +++ b/c/src/exec/rtems/headers/dpmem.h @@ -32,6 +32,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> /* @@ -78,7 +79,7 @@ void _Dual_ported_memory_Manager_initialization( */ rtems_status_code rtems_port_create( - Objects_Name name, + rtems_name name, void *internal_start, void *external_start, unsigned32 length, @@ -96,7 +97,7 @@ rtems_status_code rtems_port_create( */ rtems_status_code rtems_port_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/c/src/exec/rtems/headers/eventmp.h b/c/src/exec/rtems/headers/eventmp.h index f192ea7f77..4b42cf791e 100644 --- a/c/src/exec/rtems/headers/eventmp.h +++ b/c/src/exec/rtems/headers/eventmp.h @@ -43,9 +43,9 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - Event_MP_Remote_operations operation; - rtems_event_set event_in; + rtems_packet_prefix Prefix; + Event_MP_Remote_operations operation; + rtems_event_set event_in; } Event_MP_Packet; /* diff --git a/c/src/exec/rtems/headers/message.h b/c/src/exec/rtems/headers/message.h index 04aa6dfb16..25188044be 100644 --- a/c/src/exec/rtems/headers/message.h +++ b/c/src/exec/rtems/headers/message.h @@ -34,6 +34,7 @@ extern "C" { #endif +#include <rtems/types.h> #include <rtems/chain.h> #include <rtems/object.h> #include <rtems/threadq.h> @@ -129,7 +130,7 @@ void _Message_queue_Manager_initialization( */ rtems_status_code rtems_message_queue_create( - Objects_Name name, + rtems_name name, unsigned32 count, unsigned32 max_message_size, rtems_attribute attribute_set, @@ -151,7 +152,7 @@ rtems_status_code rtems_message_queue_create( */ rtems_status_code rtems_message_queue_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/c/src/exec/rtems/headers/msgmp.h b/c/src/exec/rtems/headers/msgmp.h index d3e40fe123..ff84e83ed3 100644 --- a/c/src/exec/rtems/headers/msgmp.h +++ b/c/src/exec/rtems/headers/msgmp.h @@ -57,7 +57,7 @@ typedef enum { typedef struct { rtems_packet_prefix Prefix; Message_queue_MP_Remote_operations operation; - Objects_Name name; + rtems_name name; rtems_option option_set; Objects_Id proxy_id; unsigned32 count; @@ -78,7 +78,7 @@ typedef struct { void _Message_queue_MP_Send_process_packet ( Message_queue_MP_Remote_operations operation, Objects_Id message_queue_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/c/src/exec/rtems/headers/part.h b/c/src/exec/rtems/headers/part.h index e639029dc8..230cf029f7 100644 --- a/c/src/exec/rtems/headers/part.h +++ b/c/src/exec/rtems/headers/part.h @@ -31,6 +31,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/address.h> #include <rtems/attr.h> #include <rtems/object.h> @@ -83,7 +84,7 @@ void _Partition_Manager_initialization( */ rtems_status_code rtems_partition_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 buffer_size, @@ -106,7 +107,7 @@ rtems_status_code rtems_partition_create( */ rtems_status_code rtems_partition_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/c/src/exec/rtems/headers/partmp.h b/c/src/exec/rtems/headers/partmp.h index 9c551bd890..4b3bf876ff 100644 --- a/c/src/exec/rtems/headers/partmp.h +++ b/c/src/exec/rtems/headers/partmp.h @@ -48,9 +48,9 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; + rtems_packet_prefix Prefix; Partition_MP_Remote_operations operation; - Objects_Name name; + rtems_name name; void *buffer; Objects_Id proxy_id; } Partition_MP_Packet; @@ -67,7 +67,7 @@ typedef struct { void _Partition_MP_Send_process_packet ( Partition_MP_Remote_operations operation, Objects_Id partition_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/c/src/exec/rtems/headers/ratemon.h b/c/src/exec/rtems/headers/ratemon.h index 86acfb9a38..75a9963888 100644 --- a/c/src/exec/rtems/headers/ratemon.h +++ b/c/src/exec/rtems/headers/ratemon.h @@ -29,6 +29,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/thread.h> #include <rtems/watchdog.h> @@ -88,7 +89,7 @@ void _Rate_monotonic_Manager_initialization( */ rtems_status_code rtems_rate_monotonic_create( - Objects_Name name, + rtems_name name, Objects_Id *id ); @@ -104,7 +105,7 @@ rtems_status_code rtems_rate_monotonic_create( */ rtems_status_code rtems_rate_monotonic_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/c/src/exec/rtems/headers/region.h b/c/src/exec/rtems/headers/region.h index c31e193c33..a5f6aa761c 100644 --- a/c/src/exec/rtems/headers/region.h +++ b/c/src/exec/rtems/headers/region.h @@ -30,6 +30,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/threadq.h> #include <rtems/heap.h> @@ -86,7 +87,7 @@ void _Region_Manager_initialization( */ rtems_status_code rtems_region_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 page_size, @@ -123,7 +124,7 @@ rtems_status_code rtems_region_extend( */ rtems_status_code rtems_region_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/c/src/exec/rtems/headers/regionmp.h b/c/src/exec/rtems/headers/regionmp.h index f414925e1f..9756103a60 100644 --- a/c/src/exec/rtems/headers/regionmp.h +++ b/c/src/exec/rtems/headers/regionmp.h @@ -48,10 +48,10 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; + rtems_packet_prefix Prefix; Region_MP_Remote_operations operation; - Objects_Name name; - rtems_option option_set; + rtems_name name; + rtems_option option_set; unsigned32 size; Objects_Id proxy_id; void *segment; @@ -69,7 +69,7 @@ typedef struct { void _Region_MP_Send_process_packet ( Region_MP_Remote_operations operation, Objects_Id region_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/c/src/exec/rtems/headers/rtems.h b/c/src/exec/rtems/headers/rtems.h index d0ab705f57..d1e1e6b406 100644 --- a/c/src/exec/rtems/headers/rtems.h +++ b/c/src/exec/rtems/headers/rtems.h @@ -24,6 +24,8 @@ extern "C" { #endif #include <rtems/system.h> +#include <rtems/types.h> + #include <rtems/init.h> #include <rtems/tasks.h> #include <rtems/intr.h> @@ -43,31 +45,7 @@ extern "C" { #include <rtems/ratemon.h> #include <rtems/mp.h> -/* - * RTEMS basic type definitions - */ - -typedef unsigned8 rtems_unsigned8; /* unsigned 8-bit value */ -typedef unsigned16 rtems_unsigned16; /* unsigned 16-bit value */ -typedef unsigned32 rtems_unsigned32; /* unsigned 32-bit value */ -typedef unsigned64 rtems_unsigned64; /* unsigned 64-bit value */ - -typedef signed8 rtems_signed8; /* signed 8-bit value */ -typedef signed16 rtems_signed16; /* signed 16-bit value */ -typedef signed32 rtems_signed32; /* signed 32-bit value */ -typedef signed64 rtems_signed64; /* signed 64-bit value */ - -typedef single_precision rtems_single; /* single precision float */ -typedef double_precision rtems_double; /* double precision float */ - -typedef boolean rtems_boolean; - -typedef Objects_Name rtems_name; -typedef Objects_Id rtems_id; - -typedef Context_Control rtems_context; -typedef Context_Control_fp rtems_context_fp; -typedef CPU_Interrupt_frame rtems_interrupt_frame; +#include <rtems/support.h> #define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP diff --git a/c/src/exec/rtems/headers/sem.h b/c/src/exec/rtems/headers/sem.h index 66f5ab82b8..e70253dcb1 100644 --- a/c/src/exec/rtems/headers/sem.h +++ b/c/src/exec/rtems/headers/sem.h @@ -31,6 +31,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/attr.h> #include <rtems/object.h> #include <rtems/threadq.h> @@ -81,7 +82,7 @@ void _Semaphore_Manager_initialization( */ rtems_status_code rtems_semaphore_create( - Objects_Name name, + rtems_name name, unsigned32 count, rtems_attribute attribute_set, Objects_Id *id @@ -102,7 +103,7 @@ rtems_status_code rtems_semaphore_create( */ rtems_status_code rtems_semaphore_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/c/src/exec/rtems/headers/semmp.h b/c/src/exec/rtems/headers/semmp.h index 882812a457..915e18164c 100644 --- a/c/src/exec/rtems/headers/semmp.h +++ b/c/src/exec/rtems/headers/semmp.h @@ -49,11 +49,11 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - Semaphore_MP_Remote_operations operation; - Objects_Name name; - rtems_option option_set; - Objects_Id proxy_id; + rtems_packet_prefix Prefix; + Semaphore_MP_Remote_operations operation; + rtems_name name; + rtems_option option_set; + Objects_Id proxy_id; } Semaphore_MP_Packet; /* @@ -68,7 +68,7 @@ typedef struct { void _Semaphore_MP_Send_process_packet ( Semaphore_MP_Remote_operations operation, Objects_Id semaphore_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/c/src/exec/rtems/headers/signalmp.h b/c/src/exec/rtems/headers/signalmp.h index 80aa3b7d60..b72f476bee 100644 --- a/c/src/exec/rtems/headers/signalmp.h +++ b/c/src/exec/rtems/headers/signalmp.h @@ -43,9 +43,9 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - Signal_MP_Remote_operations operation; - rtems_signal_set signal_in; + rtems_packet_prefix Prefix; + Signal_MP_Remote_operations operation; + rtems_signal_set signal_in; } Signal_MP_Packet; /* diff --git a/c/src/exec/rtems/headers/support.h b/c/src/exec/rtems/headers/support.h new file mode 100644 index 0000000000..c6452e0847 --- /dev/null +++ b/c/src/exec/rtems/headers/support.h @@ -0,0 +1,80 @@ +/* support.h + * + * This include file contains information about support functions for + * the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_RTEMS_SUPPORT_h +#define __RTEMS_RTEMS_SUPPORT_h + +#ifdef __cplusplus +extern "C" { +#endif + +#include <rtems/types.h> + +/* + * rtems_is_name_valid + * + * DESCRIPTION: + * + * This function returns TRUE if the name is valid, and FALSE otherwise. + */ + +STATIC INLINE rtems_boolean rtems_is_name_valid ( + rtems_name name +); + +/* + * rtems_build_name + * + * DESCRIPTION: + * + * This function returns an object name composed of the four characters + * C1, C2, C3, and C4. + * + * NOTE: + * + * This must be implemented as a macro for use in Configuration Tables. + * + */ + +#define rtems_build_name( _C1, _C2, _C3, _C4 ) \ + ( (_C1) << 24 | (_C2) << 16 | (_C3) << 8 | (_C4) ) + +/* + * rtems_name_to_characters + * + * DESCRIPTION: + * + * This function breaks the object name into the four component + * characters C1, C2, C3, and C4. + * + */ + +STATIC INLINE void rtems_name_to_characters( + rtems_name name, + char *c1, + char *c2, + char *c3, + char *c4 +); + +#include <rtems/support.inl> + +#ifdef __cplusplus +} +#endif + +#endif +/* end of include file */ diff --git a/c/src/exec/rtems/headers/taskmp.h b/c/src/exec/rtems/headers/taskmp.h index a83723bd9f..d05277a69c 100644 --- a/c/src/exec/rtems/headers/taskmp.h +++ b/c/src/exec/rtems/headers/taskmp.h @@ -54,12 +54,12 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - RTEMS_tasks_MP_Remote_operations operation; - Objects_Name name; - rtems_task_priority the_priority; - unsigned32 notepad; - unsigned32 note; + rtems_packet_prefix Prefix; + RTEMS_tasks_MP_Remote_operations operation; + rtems_name name; + rtems_task_priority the_priority; + unsigned32 notepad; + unsigned32 note; } RTEMS_tasks_MP_Packet; /* @@ -74,7 +74,7 @@ typedef struct { void _RTEMS_tasks_MP_Send_process_packet ( RTEMS_tasks_MP_Remote_operations operation, Objects_Id task_id, - Objects_Name name + rtems_name name ); /* diff --git a/c/src/exec/rtems/headers/tasks.h b/c/src/exec/rtems/headers/tasks.h index d92913548e..88bf8e0e65 100644 --- a/c/src/exec/rtems/headers/tasks.h +++ b/c/src/exec/rtems/headers/tasks.h @@ -38,6 +38,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/message.h> #include <rtems/object.h> #include <rtems/part.h> @@ -74,7 +75,7 @@ extern "C" { */ rtems_status_code rtems_task_create( - Objects_Name name, + rtems_name name, rtems_task_priority initial_priority, unsigned32 stack_size, rtems_mode initial_modes, @@ -97,7 +98,7 @@ rtems_status_code rtems_task_create( */ rtems_status_code rtems_task_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/c/src/exec/rtems/headers/timer.h b/c/src/exec/rtems/headers/timer.h index f6ccb5f4a1..bab05378c7 100644 --- a/c/src/exec/rtems/headers/timer.h +++ b/c/src/exec/rtems/headers/timer.h @@ -33,6 +33,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/tod.h> #include <rtems/watchdog.h> @@ -95,7 +96,7 @@ void _Timer_Manager_initialization( */ rtems_status_code rtems_timer_create( - Objects_Name name, + rtems_name name, Objects_Id *id ); @@ -111,7 +112,7 @@ rtems_status_code rtems_timer_create( */ rtems_status_code rtems_timer_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/c/src/exec/rtems/headers/types.h b/c/src/exec/rtems/headers/types.h new file mode 100644 index 0000000000..2a5cb6f4fd --- /dev/null +++ b/c/src/exec/rtems/headers/types.h @@ -0,0 +1,56 @@ +/* types.h + * + * This include file defines the types used by the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_RTEMS_TYPES_h +#define __RTEMS_RTEMS_TYPES_h + +#ifdef __cplusplus +extern "C" { +#endif + +#include <rtems/object.h> + +/* + * RTEMS basic type definitions + */ + +typedef unsigned8 rtems_unsigned8; /* unsigned 8-bit value */ +typedef unsigned16 rtems_unsigned16; /* unsigned 16-bit value */ +typedef unsigned32 rtems_unsigned32; /* unsigned 32-bit value */ +typedef unsigned64 rtems_unsigned64; /* unsigned 64-bit value */ + +typedef signed8 rtems_signed8; /* signed 8-bit value */ +typedef signed16 rtems_signed16; /* signed 16-bit value */ +typedef signed32 rtems_signed32; /* signed 32-bit value */ +typedef signed64 rtems_signed64; /* signed 64-bit value */ + +typedef single_precision rtems_single; /* single precision float */ +typedef double_precision rtems_double; /* double precision float */ + +typedef boolean rtems_boolean; + +typedef unsigned32 rtems_name; +typedef Objects_Id rtems_id; + +typedef Context_Control rtems_context; +typedef Context_Control_fp rtems_context_fp; +typedef CPU_Interrupt_frame rtems_interrupt_frame; + +#ifdef __cplusplus +} +#endif + +#endif +/* end of include file */ diff --git a/c/src/exec/rtems/include/rtems.h b/c/src/exec/rtems/include/rtems.h index d0ab705f57..d1e1e6b406 100644 --- a/c/src/exec/rtems/include/rtems.h +++ b/c/src/exec/rtems/include/rtems.h @@ -24,6 +24,8 @@ extern "C" { #endif #include <rtems/system.h> +#include <rtems/types.h> + #include <rtems/init.h> #include <rtems/tasks.h> #include <rtems/intr.h> @@ -43,31 +45,7 @@ extern "C" { #include <rtems/ratemon.h> #include <rtems/mp.h> -/* - * RTEMS basic type definitions - */ - -typedef unsigned8 rtems_unsigned8; /* unsigned 8-bit value */ -typedef unsigned16 rtems_unsigned16; /* unsigned 16-bit value */ -typedef unsigned32 rtems_unsigned32; /* unsigned 32-bit value */ -typedef unsigned64 rtems_unsigned64; /* unsigned 64-bit value */ - -typedef signed8 rtems_signed8; /* signed 8-bit value */ -typedef signed16 rtems_signed16; /* signed 16-bit value */ -typedef signed32 rtems_signed32; /* signed 32-bit value */ -typedef signed64 rtems_signed64; /* signed 64-bit value */ - -typedef single_precision rtems_single; /* single precision float */ -typedef double_precision rtems_double; /* double precision float */ - -typedef boolean rtems_boolean; - -typedef Objects_Name rtems_name; -typedef Objects_Id rtems_id; - -typedef Context_Control rtems_context; -typedef Context_Control_fp rtems_context_fp; -typedef CPU_Interrupt_frame rtems_interrupt_frame; +#include <rtems/support.h> #define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP diff --git a/c/src/exec/rtems/include/rtems/rtems/dpmem.h b/c/src/exec/rtems/include/rtems/rtems/dpmem.h index 669eb394d8..2b6016a842 100644 --- a/c/src/exec/rtems/include/rtems/rtems/dpmem.h +++ b/c/src/exec/rtems/include/rtems/rtems/dpmem.h @@ -32,6 +32,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> /* @@ -78,7 +79,7 @@ void _Dual_ported_memory_Manager_initialization( */ rtems_status_code rtems_port_create( - Objects_Name name, + rtems_name name, void *internal_start, void *external_start, unsigned32 length, @@ -96,7 +97,7 @@ rtems_status_code rtems_port_create( */ rtems_status_code rtems_port_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/eventmp.h b/c/src/exec/rtems/include/rtems/rtems/eventmp.h index f192ea7f77..4b42cf791e 100644 --- a/c/src/exec/rtems/include/rtems/rtems/eventmp.h +++ b/c/src/exec/rtems/include/rtems/rtems/eventmp.h @@ -43,9 +43,9 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - Event_MP_Remote_operations operation; - rtems_event_set event_in; + rtems_packet_prefix Prefix; + Event_MP_Remote_operations operation; + rtems_event_set event_in; } Event_MP_Packet; /* diff --git a/c/src/exec/rtems/include/rtems/rtems/message.h b/c/src/exec/rtems/include/rtems/rtems/message.h index 04aa6dfb16..25188044be 100644 --- a/c/src/exec/rtems/include/rtems/rtems/message.h +++ b/c/src/exec/rtems/include/rtems/rtems/message.h @@ -34,6 +34,7 @@ extern "C" { #endif +#include <rtems/types.h> #include <rtems/chain.h> #include <rtems/object.h> #include <rtems/threadq.h> @@ -129,7 +130,7 @@ void _Message_queue_Manager_initialization( */ rtems_status_code rtems_message_queue_create( - Objects_Name name, + rtems_name name, unsigned32 count, unsigned32 max_message_size, rtems_attribute attribute_set, @@ -151,7 +152,7 @@ rtems_status_code rtems_message_queue_create( */ rtems_status_code rtems_message_queue_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/msgmp.h b/c/src/exec/rtems/include/rtems/rtems/msgmp.h index d3e40fe123..ff84e83ed3 100644 --- a/c/src/exec/rtems/include/rtems/rtems/msgmp.h +++ b/c/src/exec/rtems/include/rtems/rtems/msgmp.h @@ -57,7 +57,7 @@ typedef enum { typedef struct { rtems_packet_prefix Prefix; Message_queue_MP_Remote_operations operation; - Objects_Name name; + rtems_name name; rtems_option option_set; Objects_Id proxy_id; unsigned32 count; @@ -78,7 +78,7 @@ typedef struct { void _Message_queue_MP_Send_process_packet ( Message_queue_MP_Remote_operations operation, Objects_Id message_queue_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/part.h b/c/src/exec/rtems/include/rtems/rtems/part.h index e639029dc8..230cf029f7 100644 --- a/c/src/exec/rtems/include/rtems/rtems/part.h +++ b/c/src/exec/rtems/include/rtems/rtems/part.h @@ -31,6 +31,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/address.h> #include <rtems/attr.h> #include <rtems/object.h> @@ -83,7 +84,7 @@ void _Partition_Manager_initialization( */ rtems_status_code rtems_partition_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 buffer_size, @@ -106,7 +107,7 @@ rtems_status_code rtems_partition_create( */ rtems_status_code rtems_partition_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/partmp.h b/c/src/exec/rtems/include/rtems/rtems/partmp.h index 9c551bd890..4b3bf876ff 100644 --- a/c/src/exec/rtems/include/rtems/rtems/partmp.h +++ b/c/src/exec/rtems/include/rtems/rtems/partmp.h @@ -48,9 +48,9 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; + rtems_packet_prefix Prefix; Partition_MP_Remote_operations operation; - Objects_Name name; + rtems_name name; void *buffer; Objects_Id proxy_id; } Partition_MP_Packet; @@ -67,7 +67,7 @@ typedef struct { void _Partition_MP_Send_process_packet ( Partition_MP_Remote_operations operation, Objects_Id partition_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/ratemon.h b/c/src/exec/rtems/include/rtems/rtems/ratemon.h index 86acfb9a38..75a9963888 100644 --- a/c/src/exec/rtems/include/rtems/rtems/ratemon.h +++ b/c/src/exec/rtems/include/rtems/rtems/ratemon.h @@ -29,6 +29,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/thread.h> #include <rtems/watchdog.h> @@ -88,7 +89,7 @@ void _Rate_monotonic_Manager_initialization( */ rtems_status_code rtems_rate_monotonic_create( - Objects_Name name, + rtems_name name, Objects_Id *id ); @@ -104,7 +105,7 @@ rtems_status_code rtems_rate_monotonic_create( */ rtems_status_code rtems_rate_monotonic_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/region.h b/c/src/exec/rtems/include/rtems/rtems/region.h index c31e193c33..a5f6aa761c 100644 --- a/c/src/exec/rtems/include/rtems/rtems/region.h +++ b/c/src/exec/rtems/include/rtems/rtems/region.h @@ -30,6 +30,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/threadq.h> #include <rtems/heap.h> @@ -86,7 +87,7 @@ void _Region_Manager_initialization( */ rtems_status_code rtems_region_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 page_size, @@ -123,7 +124,7 @@ rtems_status_code rtems_region_extend( */ rtems_status_code rtems_region_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/regionmp.h b/c/src/exec/rtems/include/rtems/rtems/regionmp.h index f414925e1f..9756103a60 100644 --- a/c/src/exec/rtems/include/rtems/rtems/regionmp.h +++ b/c/src/exec/rtems/include/rtems/rtems/regionmp.h @@ -48,10 +48,10 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; + rtems_packet_prefix Prefix; Region_MP_Remote_operations operation; - Objects_Name name; - rtems_option option_set; + rtems_name name; + rtems_option option_set; unsigned32 size; Objects_Id proxy_id; void *segment; @@ -69,7 +69,7 @@ typedef struct { void _Region_MP_Send_process_packet ( Region_MP_Remote_operations operation, Objects_Id region_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/sem.h b/c/src/exec/rtems/include/rtems/rtems/sem.h index 66f5ab82b8..e70253dcb1 100644 --- a/c/src/exec/rtems/include/rtems/rtems/sem.h +++ b/c/src/exec/rtems/include/rtems/rtems/sem.h @@ -31,6 +31,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/attr.h> #include <rtems/object.h> #include <rtems/threadq.h> @@ -81,7 +82,7 @@ void _Semaphore_Manager_initialization( */ rtems_status_code rtems_semaphore_create( - Objects_Name name, + rtems_name name, unsigned32 count, rtems_attribute attribute_set, Objects_Id *id @@ -102,7 +103,7 @@ rtems_status_code rtems_semaphore_create( */ rtems_status_code rtems_semaphore_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/semmp.h b/c/src/exec/rtems/include/rtems/rtems/semmp.h index 882812a457..915e18164c 100644 --- a/c/src/exec/rtems/include/rtems/rtems/semmp.h +++ b/c/src/exec/rtems/include/rtems/rtems/semmp.h @@ -49,11 +49,11 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - Semaphore_MP_Remote_operations operation; - Objects_Name name; - rtems_option option_set; - Objects_Id proxy_id; + rtems_packet_prefix Prefix; + Semaphore_MP_Remote_operations operation; + rtems_name name; + rtems_option option_set; + Objects_Id proxy_id; } Semaphore_MP_Packet; /* @@ -68,7 +68,7 @@ typedef struct { void _Semaphore_MP_Send_process_packet ( Semaphore_MP_Remote_operations operation, Objects_Id semaphore_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/signalmp.h b/c/src/exec/rtems/include/rtems/rtems/signalmp.h index 80aa3b7d60..b72f476bee 100644 --- a/c/src/exec/rtems/include/rtems/rtems/signalmp.h +++ b/c/src/exec/rtems/include/rtems/rtems/signalmp.h @@ -43,9 +43,9 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - Signal_MP_Remote_operations operation; - rtems_signal_set signal_in; + rtems_packet_prefix Prefix; + Signal_MP_Remote_operations operation; + rtems_signal_set signal_in; } Signal_MP_Packet; /* diff --git a/c/src/exec/rtems/include/rtems/rtems/support.h b/c/src/exec/rtems/include/rtems/rtems/support.h new file mode 100644 index 0000000000..c6452e0847 --- /dev/null +++ b/c/src/exec/rtems/include/rtems/rtems/support.h @@ -0,0 +1,80 @@ +/* support.h + * + * This include file contains information about support functions for + * the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_RTEMS_SUPPORT_h +#define __RTEMS_RTEMS_SUPPORT_h + +#ifdef __cplusplus +extern "C" { +#endif + +#include <rtems/types.h> + +/* + * rtems_is_name_valid + * + * DESCRIPTION: + * + * This function returns TRUE if the name is valid, and FALSE otherwise. + */ + +STATIC INLINE rtems_boolean rtems_is_name_valid ( + rtems_name name +); + +/* + * rtems_build_name + * + * DESCRIPTION: + * + * This function returns an object name composed of the four characters + * C1, C2, C3, and C4. + * + * NOTE: + * + * This must be implemented as a macro for use in Configuration Tables. + * + */ + +#define rtems_build_name( _C1, _C2, _C3, _C4 ) \ + ( (_C1) << 24 | (_C2) << 16 | (_C3) << 8 | (_C4) ) + +/* + * rtems_name_to_characters + * + * DESCRIPTION: + * + * This function breaks the object name into the four component + * characters C1, C2, C3, and C4. + * + */ + +STATIC INLINE void rtems_name_to_characters( + rtems_name name, + char *c1, + char *c2, + char *c3, + char *c4 +); + +#include <rtems/support.inl> + +#ifdef __cplusplus +} +#endif + +#endif +/* end of include file */ diff --git a/c/src/exec/rtems/include/rtems/rtems/taskmp.h b/c/src/exec/rtems/include/rtems/rtems/taskmp.h index a83723bd9f..d05277a69c 100644 --- a/c/src/exec/rtems/include/rtems/rtems/taskmp.h +++ b/c/src/exec/rtems/include/rtems/rtems/taskmp.h @@ -54,12 +54,12 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - RTEMS_tasks_MP_Remote_operations operation; - Objects_Name name; - rtems_task_priority the_priority; - unsigned32 notepad; - unsigned32 note; + rtems_packet_prefix Prefix; + RTEMS_tasks_MP_Remote_operations operation; + rtems_name name; + rtems_task_priority the_priority; + unsigned32 notepad; + unsigned32 note; } RTEMS_tasks_MP_Packet; /* @@ -74,7 +74,7 @@ typedef struct { void _RTEMS_tasks_MP_Send_process_packet ( RTEMS_tasks_MP_Remote_operations operation, Objects_Id task_id, - Objects_Name name + rtems_name name ); /* diff --git a/c/src/exec/rtems/include/rtems/rtems/tasks.h b/c/src/exec/rtems/include/rtems/rtems/tasks.h index d92913548e..88bf8e0e65 100644 --- a/c/src/exec/rtems/include/rtems/rtems/tasks.h +++ b/c/src/exec/rtems/include/rtems/rtems/tasks.h @@ -38,6 +38,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/message.h> #include <rtems/object.h> #include <rtems/part.h> @@ -74,7 +75,7 @@ extern "C" { */ rtems_status_code rtems_task_create( - Objects_Name name, + rtems_name name, rtems_task_priority initial_priority, unsigned32 stack_size, rtems_mode initial_modes, @@ -97,7 +98,7 @@ rtems_status_code rtems_task_create( */ rtems_status_code rtems_task_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/timer.h b/c/src/exec/rtems/include/rtems/rtems/timer.h index f6ccb5f4a1..bab05378c7 100644 --- a/c/src/exec/rtems/include/rtems/rtems/timer.h +++ b/c/src/exec/rtems/include/rtems/rtems/timer.h @@ -33,6 +33,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/tod.h> #include <rtems/watchdog.h> @@ -95,7 +96,7 @@ void _Timer_Manager_initialization( */ rtems_status_code rtems_timer_create( - Objects_Name name, + rtems_name name, Objects_Id *id ); @@ -111,7 +112,7 @@ rtems_status_code rtems_timer_create( */ rtems_status_code rtems_timer_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/c/src/exec/rtems/include/rtems/rtems/types.h b/c/src/exec/rtems/include/rtems/rtems/types.h new file mode 100644 index 0000000000..2a5cb6f4fd --- /dev/null +++ b/c/src/exec/rtems/include/rtems/rtems/types.h @@ -0,0 +1,56 @@ +/* types.h + * + * This include file defines the types used by the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_RTEMS_TYPES_h +#define __RTEMS_RTEMS_TYPES_h + +#ifdef __cplusplus +extern "C" { +#endif + +#include <rtems/object.h> + +/* + * RTEMS basic type definitions + */ + +typedef unsigned8 rtems_unsigned8; /* unsigned 8-bit value */ +typedef unsigned16 rtems_unsigned16; /* unsigned 16-bit value */ +typedef unsigned32 rtems_unsigned32; /* unsigned 32-bit value */ +typedef unsigned64 rtems_unsigned64; /* unsigned 64-bit value */ + +typedef signed8 rtems_signed8; /* signed 8-bit value */ +typedef signed16 rtems_signed16; /* signed 16-bit value */ +typedef signed32 rtems_signed32; /* signed 32-bit value */ +typedef signed64 rtems_signed64; /* signed 64-bit value */ + +typedef single_precision rtems_single; /* single precision float */ +typedef double_precision rtems_double; /* double precision float */ + +typedef boolean rtems_boolean; + +typedef unsigned32 rtems_name; +typedef Objects_Id rtems_id; + +typedef Context_Control rtems_context; +typedef Context_Control_fp rtems_context_fp; +typedef CPU_Interrupt_frame rtems_interrupt_frame; + +#ifdef __cplusplus +} +#endif + +#endif +/* end of include file */ diff --git a/c/src/exec/rtems/inline/rtems/rtems/support.inl b/c/src/exec/rtems/inline/rtems/rtems/support.inl new file mode 100644 index 0000000000..2f98a98ad0 --- /dev/null +++ b/c/src/exec/rtems/inline/rtems/rtems/support.inl @@ -0,0 +1,54 @@ +/* support.inl + * + * This include file contains the static inline implementation of all + * of the inlined routines specific to the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_SUPPORT_inl +#define __RTEMS_SUPPORT_inl + +/*PAGE + * + * rtems_is_name_valid + * + */ + +STATIC INLINE rtems_boolean rtems_is_name_valid ( + rtems_name name +) +{ + return ( name != 0 ); +} + +/*PAGE + * + * rtems_name_to_characters + * + */ + +STATIC INLINE void rtems_name_to_characters( + rtems_name name, + char *c1, + char *c2, + char *c3, + char *c4 +) +{ + *c1 = (name >> 24) & 0xff; + *c2 = (name >> 16) & 0xff; + *c3 = (name >> 8) & 0xff; + *c4 = name & 0xff; +} + +#endif +/* end of include file */ diff --git a/c/src/exec/rtems/inline/rtems/rtems/tasks.inl b/c/src/exec/rtems/inline/rtems/rtems/tasks.inl index d5df18831a..10d3e3c197 100644 --- a/c/src/exec/rtems/inline/rtems/rtems/tasks.inl +++ b/c/src/exec/rtems/inline/rtems/rtems/tasks.inl @@ -17,6 +17,11 @@ #ifndef __RTEMS_TASKS_inl #define __RTEMS_TASKS_inl +#include <rtems/msgmp.h> +#include <rtems/partmp.h> +#include <rtems/regionmp.h> +#include <rtems/semmp.h> + /*PAGE * * _RTEMS_tasks_Allocate diff --git a/c/src/exec/rtems/inline/support.inl b/c/src/exec/rtems/inline/support.inl new file mode 100644 index 0000000000..2f98a98ad0 --- /dev/null +++ b/c/src/exec/rtems/inline/support.inl @@ -0,0 +1,54 @@ +/* support.inl + * + * This include file contains the static inline implementation of all + * of the inlined routines specific to the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_SUPPORT_inl +#define __RTEMS_SUPPORT_inl + +/*PAGE + * + * rtems_is_name_valid + * + */ + +STATIC INLINE rtems_boolean rtems_is_name_valid ( + rtems_name name +) +{ + return ( name != 0 ); +} + +/*PAGE + * + * rtems_name_to_characters + * + */ + +STATIC INLINE void rtems_name_to_characters( + rtems_name name, + char *c1, + char *c2, + char *c3, + char *c4 +) +{ + *c1 = (name >> 24) & 0xff; + *c2 = (name >> 16) & 0xff; + *c3 = (name >> 8) & 0xff; + *c4 = name & 0xff; +} + +#endif +/* end of include file */ diff --git a/c/src/exec/rtems/inline/tasks.inl b/c/src/exec/rtems/inline/tasks.inl index d5df18831a..10d3e3c197 100644 --- a/c/src/exec/rtems/inline/tasks.inl +++ b/c/src/exec/rtems/inline/tasks.inl @@ -17,6 +17,11 @@ #ifndef __RTEMS_TASKS_inl #define __RTEMS_TASKS_inl +#include <rtems/msgmp.h> +#include <rtems/partmp.h> +#include <rtems/regionmp.h> +#include <rtems/semmp.h> + /*PAGE * * _RTEMS_tasks_Allocate diff --git a/c/src/exec/rtems/macros/rtems/rtems/support.inl b/c/src/exec/rtems/macros/rtems/rtems/support.inl new file mode 100644 index 0000000000..a25b445aff --- /dev/null +++ b/c/src/exec/rtems/macros/rtems/rtems/support.inl @@ -0,0 +1,44 @@ +/* support.inl + * + * This include file contains the macros implementation of all + * of the inlined routines specific to the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_SUPPORT_inl +#define __RTEMS_SUPPORT_inl + +/*PAGE + * + * rtems_is_name_valid + * + */ + +#define rtems_is_name_valid( _name ) \ + ( (_name) != 0 ) + +/*PAGE + * + * rtems_name_to_characters + * + */ + +#define rtems_name_to_characters( _name, _c1, _c2, _c3, _c4 ) \ + { \ + (*(_c1) = ((_name) >> 24) & 0xff; \ + (*(_c2) = ((_name) >> 16) & 0xff; \ + (*(_c3) = ((_name) >> 8) & 0xff; \ + (*(_c4) = ((_name)) & 0xff; \ + } + +#endif +/* end of include file */ diff --git a/c/src/exec/rtems/macros/rtems/rtems/tasks.inl b/c/src/exec/rtems/macros/rtems/rtems/tasks.inl index 7b40cbf7fd..8fec704ea4 100644 --- a/c/src/exec/rtems/macros/rtems/rtems/tasks.inl +++ b/c/src/exec/rtems/macros/rtems/rtems/tasks.inl @@ -17,6 +17,11 @@ #ifndef __RTEMS_TASKS_inl #define __RTEMS_TASKS_inl +#include <rtems/msgmp.h> +#include <rtems/partmp.h> +#include <rtems/regionmp.h> +#include <rtems/semmp.h> + /*PAGE * * _RTEMS_tasks_Allocate diff --git a/c/src/exec/rtems/macros/support.inl b/c/src/exec/rtems/macros/support.inl new file mode 100644 index 0000000000..a25b445aff --- /dev/null +++ b/c/src/exec/rtems/macros/support.inl @@ -0,0 +1,44 @@ +/* support.inl + * + * This include file contains the macros implementation of all + * of the inlined routines specific to the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_SUPPORT_inl +#define __RTEMS_SUPPORT_inl + +/*PAGE + * + * rtems_is_name_valid + * + */ + +#define rtems_is_name_valid( _name ) \ + ( (_name) != 0 ) + +/*PAGE + * + * rtems_name_to_characters + * + */ + +#define rtems_name_to_characters( _name, _c1, _c2, _c3, _c4 ) \ + { \ + (*(_c1) = ((_name) >> 24) & 0xff; \ + (*(_c2) = ((_name) >> 16) & 0xff; \ + (*(_c3) = ((_name) >> 8) & 0xff; \ + (*(_c4) = ((_name)) & 0xff; \ + } + +#endif +/* end of include file */ diff --git a/c/src/exec/rtems/macros/tasks.inl b/c/src/exec/rtems/macros/tasks.inl index 7b40cbf7fd..8fec704ea4 100644 --- a/c/src/exec/rtems/macros/tasks.inl +++ b/c/src/exec/rtems/macros/tasks.inl @@ -17,6 +17,11 @@ #ifndef __RTEMS_TASKS_inl #define __RTEMS_TASKS_inl +#include <rtems/msgmp.h> +#include <rtems/partmp.h> +#include <rtems/regionmp.h> +#include <rtems/semmp.h> + /*PAGE * * _RTEMS_tasks_Allocate diff --git a/c/src/exec/rtems/optman/no-dpmem.c b/c/src/exec/rtems/optman/no-dpmem.c index 4d4cc4cdbc..40f343eef4 100644 --- a/c/src/exec/rtems/optman/no-dpmem.c +++ b/c/src/exec/rtems/optman/no-dpmem.c @@ -25,7 +25,7 @@ void _Dual_ported_memory_Manager_initialization( } rtems_status_code rtems_port_create( - Objects_Name name, + rtems_name name, void *internal_start, void *external_start, unsigned32 length, @@ -36,7 +36,7 @@ rtems_status_code rtems_port_create( } rtems_status_code rtems_port_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { diff --git a/c/src/exec/rtems/optman/no-msg.c b/c/src/exec/rtems/optman/no-msg.c index bee0295df5..6e8503ee32 100644 --- a/c/src/exec/rtems/optman/no-msg.c +++ b/c/src/exec/rtems/optman/no-msg.c @@ -32,7 +32,7 @@ void _Message_queue_Manager_initialization( } rtems_status_code rtems_message_queue_create( - Objects_Name name, + rtems_name name, unsigned32 count, unsigned32 max_message_size, rtems_attribute attribute_set, @@ -43,7 +43,7 @@ rtems_status_code rtems_message_queue_create( } rtems_status_code rtems_message_queue_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) diff --git a/c/src/exec/rtems/optman/no-part.c b/c/src/exec/rtems/optman/no-part.c index d51b62cfb8..0b0e51329f 100644 --- a/c/src/exec/rtems/optman/no-part.c +++ b/c/src/exec/rtems/optman/no-part.c @@ -27,7 +27,7 @@ void _Partition_Manager_initialization( } rtems_status_code rtems_partition_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 buffer_size, @@ -39,7 +39,7 @@ rtems_status_code rtems_partition_create( } rtems_status_code rtems_partition_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) diff --git a/c/src/exec/rtems/optman/no-region.c b/c/src/exec/rtems/optman/no-region.c index 4ebdda6aa1..490d1371c0 100644 --- a/c/src/exec/rtems/optman/no-region.c +++ b/c/src/exec/rtems/optman/no-region.c @@ -28,7 +28,7 @@ void _Region_Manager_initialization( } rtems_status_code rtems_region_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 page_size, @@ -40,7 +40,7 @@ rtems_status_code rtems_region_create( } rtems_status_code rtems_region_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { diff --git a/c/src/exec/rtems/optman/no-rtmon.c b/c/src/exec/rtems/optman/no-rtmon.c index 1799cc7533..8371f19a7f 100644 --- a/c/src/exec/rtems/optman/no-rtmon.c +++ b/c/src/exec/rtems/optman/no-rtmon.c @@ -26,7 +26,7 @@ void _Rate_monotonic_Manager_initialization( } rtems_status_code rtems_rate_monotonic_create( - Objects_Name name, + rtems_name name, Objects_Id *id ) { @@ -34,7 +34,7 @@ rtems_status_code rtems_rate_monotonic_create( } rtems_status_code rtems_rate_monotonic_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { diff --git a/c/src/exec/rtems/optman/no-sem.c b/c/src/exec/rtems/optman/no-sem.c index e7d27a6311..52f64c0aa5 100644 --- a/c/src/exec/rtems/optman/no-sem.c +++ b/c/src/exec/rtems/optman/no-sem.c @@ -31,7 +31,7 @@ void _Semaphore_Manager_initialization( } rtems_status_code rtems_semaphore_create( - Objects_Name name, + rtems_name name, unsigned32 count, rtems_attribute attribute_set, Objects_Id *id @@ -41,7 +41,7 @@ rtems_status_code rtems_semaphore_create( } rtems_status_code rtems_semaphore_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) diff --git a/c/src/exec/rtems/optman/no-timer.c b/c/src/exec/rtems/optman/no-timer.c index 9fc29e9b6d..1f6deb2e4f 100644 --- a/c/src/exec/rtems/optman/no-timer.c +++ b/c/src/exec/rtems/optman/no-timer.c @@ -27,7 +27,7 @@ void _Timer_Manager_initialization( } rtems_status_code rtems_timer_create( - Objects_Name name, + rtems_name name, Objects_Id *id ) { @@ -35,7 +35,7 @@ rtems_status_code rtems_timer_create( } rtems_status_code rtems_timer_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { diff --git a/c/src/exec/rtems/src/dpmem.c b/c/src/exec/rtems/src/dpmem.c index b594ecd00e..ea2469f4c5 100644 --- a/c/src/exec/rtems/src/dpmem.c +++ b/c/src/exec/rtems/src/dpmem.c @@ -13,6 +13,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/address.h> #include <rtems/dpmem.h> #include <rtems/object.h> @@ -36,11 +37,13 @@ void _Dual_ported_memory_Manager_initialization( ) { _Objects_Initialize_information( - &_Dual_ported_memory_Information, - OBJECTS_RTEMS_PORTS, - FALSE, - maximum_ports, - sizeof( Dual_ported_memory_Control ) + &_Dual_ported_memory_Information, + OBJECTS_RTEMS_PORTS, + FALSE, + maximum_ports, + sizeof( Dual_ported_memory_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -64,7 +67,7 @@ void _Dual_ported_memory_Manager_initialization( */ rtems_status_code rtems_port_create( - Objects_Name name, + rtems_name name, void *internal_start, void *external_start, unsigned32 length, @@ -73,7 +76,7 @@ rtems_status_code rtems_port_create( { register Dual_ported_memory_Control *the_port; - if ( !_Objects_Is_name_valid( name) ) + if ( !rtems_is_name_valid( name) ) return ( RTEMS_INVALID_NAME ); if ( !_Addresses_Is_aligned( internal_start ) || @@ -93,8 +96,12 @@ rtems_status_code rtems_port_create( the_port->external_base = external_start; the_port->length = length - 1; - _Objects_Open( &_Dual_ported_memory_Information, - &the_port->Object, name ); + _Objects_Open( + &_Dual_ported_memory_Information, + &the_port->Object, + &name + ); + *id = the_port->Object.id; _Thread_Enable_dispatch(); return( RTEMS_SUCCESSFUL ); @@ -118,14 +125,14 @@ rtems_status_code rtems_port_create( */ rtems_status_code rtems_port_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { return( _Objects_Name_to_id( &_Dual_ported_memory_Information, - name, + &name, RTEMS_SEARCH_ALL_NODES, id ) diff --git a/c/src/exec/rtems/src/msg.c b/c/src/exec/rtems/src/msg.c index 49d7d0b3f3..d7c456f90a 100644 --- a/c/src/exec/rtems/src/msg.c +++ b/c/src/exec/rtems/src/msg.c @@ -22,6 +22,7 @@ #include <rtems/object.h> #include <rtems/options.h> #include <rtems/states.h> +#include <rtems/support.h> #include <rtems/thread.h> #include <rtems/wkspace.h> #include <rtems/mpci.h> @@ -48,7 +49,9 @@ void _Message_queue_Manager_initialization( OBJECTS_RTEMS_MESSAGE_QUEUES, TRUE, maximum_message_queues, - sizeof( Message_queue_Control ) + sizeof( Message_queue_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -130,7 +133,7 @@ failed: */ rtems_status_code rtems_message_queue_create( - Objects_Name name, + rtems_name name, unsigned32 count, unsigned32 max_message_size, rtems_attribute attribute_set, @@ -139,7 +142,7 @@ rtems_status_code rtems_message_queue_create( { register Message_queue_Control *the_message_queue; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); if ( _Attributes_Is_global( attribute_set ) && @@ -194,8 +197,11 @@ rtems_status_code rtems_message_queue_create( _Thread_queue_Initialize( &the_message_queue->Wait_queue, attribute_set, STATES_WAITING_FOR_MESSAGE ); - _Objects_Open( &_Message_queue_Information, - &the_message_queue->Object, name ); + _Objects_Open( + &_Message_queue_Information, + &the_message_queue->Object, + &name + ); *id = the_message_queue->Object.id; @@ -230,13 +236,17 @@ rtems_status_code rtems_message_queue_create( */ rtems_status_code rtems_message_queue_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) { - return( _Objects_Name_to_id( &_Message_queue_Information, name, - node, id ) ); + return _Objects_Name_to_id( + &_Message_queue_Information, + &name, + node, + id + ); } /*PAGE diff --git a/c/src/exec/rtems/src/msgmp.c b/c/src/exec/rtems/src/msgmp.c index 75e83b5bf8..37ce2c9453 100644 --- a/c/src/exec/rtems/src/msgmp.c +++ b/c/src/exec/rtems/src/msgmp.c @@ -32,7 +32,7 @@ void _Message_queue_MP_Send_process_packet ( Message_queue_MP_Remote_operations operation, Objects_Id message_queue_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ) { @@ -434,7 +434,7 @@ void _Message_queue_MP_Send_extract_proxy ( _Message_queue_MP_Send_process_packet( MESSAGE_QUEUE_MP_EXTRACT_PROXY, the_thread->Wait.id, - (Objects_Name) 0, + (rtems_name) 0, the_thread->Object.id ); } diff --git a/c/src/exec/rtems/src/part.c b/c/src/exec/rtems/src/part.c index 7cf0fe691c..b1e284c669 100644 --- a/c/src/exec/rtems/src/part.c +++ b/c/src/exec/rtems/src/part.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/address.h> #include <rtems/config.h> #include <rtems/object.h> @@ -42,7 +43,9 @@ void _Partition_Manager_initialization( OBJECTS_RTEMS_PARTITIONS, TRUE, maximum_partitions, - sizeof( Partition_Control ) + sizeof( Partition_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -69,7 +72,7 @@ void _Partition_Manager_initialization( */ rtems_status_code rtems_partition_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 buffer_size, @@ -79,7 +82,7 @@ rtems_status_code rtems_partition_create( { register Partition_Control *the_partition; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); if ( length == 0 || buffer_size == 0 || length < buffer_size || @@ -118,7 +121,7 @@ rtems_status_code rtems_partition_create( _Chain_Initialize( &the_partition->Memory, starting_address, length / buffer_size, buffer_size ); - _Objects_Open( &_Partition_Information, &the_partition->Object, name ); + _Objects_Open( &_Partition_Information, &the_partition->Object, &name ); *id = the_partition->Object.id; if ( _Attributes_Is_global( attribute_set ) ) @@ -152,12 +155,12 @@ rtems_status_code rtems_partition_create( */ rtems_status_code rtems_partition_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) { - return( _Objects_Name_to_id( &_Partition_Information, name, node, id ) ); + return _Objects_Name_to_id( &_Partition_Information, &name, node, id ); } /*PAGE diff --git a/c/src/exec/rtems/src/partmp.c b/c/src/exec/rtems/src/partmp.c index 9cc1723106..074165777b 100644 --- a/c/src/exec/rtems/src/partmp.c +++ b/c/src/exec/rtems/src/partmp.c @@ -30,7 +30,7 @@ void _Partition_MP_Send_process_packet ( Partition_MP_Remote_operations operation, Objects_Id partition_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ) { @@ -280,7 +280,7 @@ void _Partition_MP_Send_extract_proxy ( _Partition_MP_Send_process_packet( PARTITION_MP_EXTRACT_PROXY, the_thread->Wait.id, - (Objects_Name) 0, + (rtems_name) 0, the_thread->Object.id ); diff --git a/c/src/exec/rtems/src/ratemon.c b/c/src/exec/rtems/src/ratemon.c index 86f1534d98..6e84c56fb3 100644 --- a/c/src/exec/rtems/src/ratemon.c +++ b/c/src/exec/rtems/src/ratemon.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/isr.h> #include <rtems/object.h> #include <rtems/ratemon.h> @@ -40,11 +41,13 @@ void _Rate_monotonic_Manager_initialization( ) { _Objects_Initialize_information( - &_Rate_monotonic_Information, - OBJECTS_RTEMS_PERIODS, - FALSE, - maximum_periods, - sizeof( Rate_monotonic_Control ) + &_Rate_monotonic_Information, + OBJECTS_RTEMS_PERIODS, + FALSE, + maximum_periods, + sizeof( Rate_monotonic_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -66,13 +69,13 @@ void _Rate_monotonic_Manager_initialization( */ rtems_status_code rtems_rate_monotonic_create( - Objects_Name name, + rtems_name name, Objects_Id *id ) { Rate_monotonic_Control *the_period; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return( RTEMS_INVALID_NAME ); _Thread_Disable_dispatch(); /* to prevent deletion */ @@ -87,7 +90,7 @@ rtems_status_code rtems_rate_monotonic_create( the_period->owner = _Thread_Executing; the_period->state = RATE_MONOTONIC_INACTIVE; - _Objects_Open( &_Rate_monotonic_Information, &the_period->Object, name ); + _Objects_Open( &_Rate_monotonic_Information, &the_period->Object, &name ); *id = the_period->Object.id; _Thread_Enable_dispatch(); @@ -112,13 +115,13 @@ rtems_status_code rtems_rate_monotonic_create( */ rtems_status_code rtems_rate_monotonic_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { return _Objects_Name_to_id( &_Rate_monotonic_Information, - name, + &name, RTEMS_SEARCH_LOCAL_NODE, id ); diff --git a/c/src/exec/rtems/src/region.c b/c/src/exec/rtems/src/region.c index 40bd7ffa26..90916dcc3a 100644 --- a/c/src/exec/rtems/src/region.c +++ b/c/src/exec/rtems/src/region.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/config.h> #include <rtems/object.h> #include <rtems/options.h> @@ -38,12 +39,14 @@ void _Region_Manager_initialization( ) { _Objects_Initialize_information( - &_Region_Information, - OBJECTS_RTEMS_REGIONS, - FALSE, - maximum_regions, - sizeof( Region_Control ) - ); + &_Region_Information, + OBJECTS_RTEMS_REGIONS, + FALSE, + maximum_regions, + sizeof( Region_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH + ); } /*PAGE @@ -68,7 +71,7 @@ void _Region_Manager_initialization( */ rtems_status_code rtems_region_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 page_size, @@ -78,7 +81,7 @@ rtems_status_code rtems_region_create( { Region_Control *the_region; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); if ( !_Addresses_Is_aligned( starting_address ) ) @@ -111,7 +114,7 @@ rtems_status_code rtems_region_create( _Thread_queue_Initialize( &the_region->Wait_queue, attribute_set, STATES_WAITING_FOR_SEGMENT ); - _Objects_Open( &_Region_Information, &the_region->Object, name ); + _Objects_Open( &_Region_Information, &the_region->Object, &name ); *id = the_region->Object.id; _Thread_Enable_dispatch(); @@ -136,13 +139,13 @@ rtems_status_code rtems_region_create( */ rtems_status_code rtems_region_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { return _Objects_Name_to_id( &_Region_Information, - name, + &name, RTEMS_SEARCH_LOCAL_NODE, id ); diff --git a/c/src/exec/rtems/src/regionmp.c b/c/src/exec/rtems/src/regionmp.c index 558ae1639a..07de556acc 100644 --- a/c/src/exec/rtems/src/regionmp.c +++ b/c/src/exec/rtems/src/regionmp.c @@ -30,7 +30,7 @@ void _Region_MP_Send_process_packet ( Region_MP_Remote_operations operation, Objects_Id region_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ) { @@ -289,7 +289,7 @@ void _Region_MP_Send_extract_proxy ( _Region_MP_Send_process_packet( REGION_MP_EXTRACT_PROXY, the_thread->Wait.id, - (Objects_Name) 0, + (rtems_name) 0, the_thread->Object.id ); } diff --git a/c/src/exec/rtems/src/rtemstimer.c b/c/src/exec/rtems/src/rtemstimer.c index ec55c3eaf9..2aad758269 100644 --- a/c/src/exec/rtems/src/rtemstimer.c +++ b/c/src/exec/rtems/src/rtemstimer.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/object.h> #include <rtems/thread.h> #include <rtems/timer.h> @@ -37,11 +38,13 @@ void _Timer_Manager_initialization( ) { _Objects_Initialize_information( - &_Timer_Information, - OBJECTS_RTEMS_TIMERS, - FALSE, - maximum_timers, - sizeof( Timer_Control ) + &_Timer_Information, + OBJECTS_RTEMS_TIMERS, + FALSE, + maximum_timers, + sizeof( Timer_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -62,13 +65,13 @@ void _Timer_Manager_initialization( */ rtems_status_code rtems_timer_create( - Objects_Name name, + rtems_name name, Objects_Id *id ) { Timer_Control *the_timer; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); _Thread_Disable_dispatch(); /* to prevent deletion */ @@ -82,7 +85,7 @@ rtems_status_code rtems_timer_create( the_timer->the_class = TIMER_DORMANT; - _Objects_Open( &_Timer_Information, &the_timer->Object, name ); + _Objects_Open( &_Timer_Information, &the_timer->Object, &name ); *id = the_timer->Object.id; _Thread_Enable_dispatch(); @@ -107,13 +110,13 @@ rtems_status_code rtems_timer_create( */ rtems_status_code rtems_timer_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { return _Objects_Name_to_id( &_Timer_Information, - name, + &name, RTEMS_SEARCH_LOCAL_NODE, id ); diff --git a/c/src/exec/rtems/src/sem.c b/c/src/exec/rtems/src/sem.c index 340a4fa947..46dff9cdd7 100644 --- a/c/src/exec/rtems/src/sem.c +++ b/c/src/exec/rtems/src/sem.c @@ -27,6 +27,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/attr.h> #include <rtems/config.h> #include <rtems/isr.h> @@ -56,10 +57,12 @@ void _Semaphore_Manager_initialization( { _Objects_Initialize_information( &_Semaphore_Information, - OBJECTS_RTEMS_SEMAPHORES, + OBJECTS_RTEMS_SEMAPHORES, TRUE, maximum_semaphores, - sizeof( Semaphore_Control ) + sizeof( Semaphore_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -83,7 +86,7 @@ void _Semaphore_Manager_initialization( */ rtems_status_code rtems_semaphore_create( - Objects_Name name, + rtems_name name, unsigned32 count, rtems_attribute attribute_set, Objects_Id *id @@ -91,7 +94,7 @@ rtems_status_code rtems_semaphore_create( { register Semaphore_Control *the_semaphore; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); if ( _Attributes_Is_global( attribute_set ) ) { @@ -147,7 +150,7 @@ rtems_status_code rtems_semaphore_create( _Thread_queue_Initialize( &the_semaphore->Wait_queue, attribute_set, STATES_WAITING_FOR_SEMAPHORE ); - _Objects_Open( &_Semaphore_Information, &the_semaphore->Object, name ); + _Objects_Open( &_Semaphore_Information, &the_semaphore->Object, &name ); *id = the_semaphore->Object.id; @@ -181,12 +184,12 @@ rtems_status_code rtems_semaphore_create( */ rtems_status_code rtems_semaphore_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) { - return( _Objects_Name_to_id( &_Semaphore_Information, name, node, id ) ); + return( _Objects_Name_to_id( &_Semaphore_Information, &name, node, id ) ); } /*PAGE diff --git a/c/src/exec/rtems/src/semmp.c b/c/src/exec/rtems/src/semmp.c index d131d48150..3be9fafb5f 100644 --- a/c/src/exec/rtems/src/semmp.c +++ b/c/src/exec/rtems/src/semmp.c @@ -31,7 +31,7 @@ void _Semaphore_MP_Send_process_packet ( Semaphore_MP_Remote_operations operation, Objects_Id semaphore_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ) { @@ -286,7 +286,7 @@ void _Semaphore_MP_Send_extract_proxy ( _Semaphore_MP_Send_process_packet( SEMAPHORE_MP_EXTRACT_PROXY, the_thread->Wait.id, - (Objects_Name) 0, + (rtems_name) 0, the_thread->Object.id ); diff --git a/c/src/exec/rtems/src/taskmp.c b/c/src/exec/rtems/src/taskmp.c index b938c60c53..17b08011ef 100644 --- a/c/src/exec/rtems/src/taskmp.c +++ b/c/src/exec/rtems/src/taskmp.c @@ -31,7 +31,7 @@ void _RTEMS_tasks_MP_Send_process_packet ( RTEMS_tasks_MP_Remote_operations operation, Objects_Id task_id, - Objects_Name name + rtems_name name ) { RTEMS_tasks_MP_Packet *the_packet; diff --git a/c/src/exec/rtems/src/tasks.c b/c/src/exec/rtems/src/tasks.c index e900df0ab8..9cabbc50e9 100644 --- a/c/src/exec/rtems/src/tasks.c +++ b/c/src/exec/rtems/src/tasks.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/modes.h> #include <rtems/object.h> #include <rtems/stack.h> @@ -48,7 +49,7 @@ */ rtems_status_code rtems_task_create( - Objects_Name name, + rtems_name name, rtems_task_priority initial_priority, unsigned32 stack_size, rtems_mode initial_modes, @@ -62,7 +63,7 @@ rtems_status_code rtems_task_create( void *memory; rtems_attribute the_attribute_set; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); #if 0 @@ -156,7 +157,7 @@ rtems_status_code rtems_task_create( _ASR_Initialize( &the_thread->Signal ); - _Objects_Open( &_Thread_Information, &the_thread->Object, name ); + _Objects_Open( &_Thread_Information, &the_thread->Object, &name ); *id = the_thread->Object.id; @@ -192,13 +193,13 @@ rtems_status_code rtems_task_create( */ rtems_status_code rtems_task_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) { if ( name != OBJECTS_ID_OF_SELF ) - return( _Objects_Name_to_id( &_Thread_Information, name, node, id ) ); + return( _Objects_Name_to_id( &_Thread_Information, &name, node, id ) ); *id = _Thread_Executing->Object.id; return( RTEMS_SUCCESSFUL ); diff --git a/c/src/exec/rtems/src/timer.c b/c/src/exec/rtems/src/timer.c index ec55c3eaf9..2aad758269 100644 --- a/c/src/exec/rtems/src/timer.c +++ b/c/src/exec/rtems/src/timer.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/object.h> #include <rtems/thread.h> #include <rtems/timer.h> @@ -37,11 +38,13 @@ void _Timer_Manager_initialization( ) { _Objects_Initialize_information( - &_Timer_Information, - OBJECTS_RTEMS_TIMERS, - FALSE, - maximum_timers, - sizeof( Timer_Control ) + &_Timer_Information, + OBJECTS_RTEMS_TIMERS, + FALSE, + maximum_timers, + sizeof( Timer_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -62,13 +65,13 @@ void _Timer_Manager_initialization( */ rtems_status_code rtems_timer_create( - Objects_Name name, + rtems_name name, Objects_Id *id ) { Timer_Control *the_timer; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); _Thread_Disable_dispatch(); /* to prevent deletion */ @@ -82,7 +85,7 @@ rtems_status_code rtems_timer_create( the_timer->the_class = TIMER_DORMANT; - _Objects_Open( &_Timer_Information, &the_timer->Object, name ); + _Objects_Open( &_Timer_Information, &the_timer->Object, &name ); *id = the_timer->Object.id; _Thread_Enable_dispatch(); @@ -107,13 +110,13 @@ rtems_status_code rtems_timer_create( */ rtems_status_code rtems_timer_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { return _Objects_Name_to_id( &_Timer_Information, - name, + &name, RTEMS_SEARCH_LOCAL_NODE, id ); diff --git a/c/src/exec/sapi/headers/config.h b/c/src/exec/sapi/headers/config.h index c2001c8074..766ea4a4a8 100644 --- a/c/src/exec/sapi/headers/config.h +++ b/c/src/exec/sapi/headers/config.h @@ -21,6 +21,7 @@ extern "C" { #endif +#include <rtems/types.h> #include <rtems/object.h> #include <rtems/thread.h> @@ -32,7 +33,7 @@ extern "C" { */ typedef struct { - Objects_Name name; /* task name */ + rtems_name name; /* task name */ unsigned32 stack_size; /* task stack size */ rtems_task_priority initial_priority; /* task priority */ rtems_attribute attribute_set; /* task attributes */ diff --git a/c/src/exec/sapi/headers/extension.h b/c/src/exec/sapi/headers/extension.h index 1e20fe6470..b447cc43fe 100644 --- a/c/src/exec/sapi/headers/extension.h +++ b/c/src/exec/sapi/headers/extension.h @@ -28,6 +28,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/userext.h> @@ -72,7 +73,7 @@ void _Extension_Manager_initialization( */ rtems_status_code rtems_extension_create( - Objects_Name name, + rtems_name name, rtems_extensions_table *extension_table, Objects_Id *id ); @@ -89,7 +90,7 @@ rtems_status_code rtems_extension_create( */ rtems_status_code rtems_extension_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/c/src/exec/sapi/headers/init.h b/c/src/exec/sapi/headers/init.h index a5ed1688b7..8c6e34d2c3 100644 --- a/c/src/exec/sapi/headers/init.h +++ b/c/src/exec/sapi/headers/init.h @@ -30,6 +30,7 @@ extern "C" { #endif +#include <rtems/types.h> #include <rtems/config.h> #include <rtems/intr.h> diff --git a/c/src/exec/sapi/include/rtems/config.h b/c/src/exec/sapi/include/rtems/config.h index c2001c8074..766ea4a4a8 100644 --- a/c/src/exec/sapi/include/rtems/config.h +++ b/c/src/exec/sapi/include/rtems/config.h @@ -21,6 +21,7 @@ extern "C" { #endif +#include <rtems/types.h> #include <rtems/object.h> #include <rtems/thread.h> @@ -32,7 +33,7 @@ extern "C" { */ typedef struct { - Objects_Name name; /* task name */ + rtems_name name; /* task name */ unsigned32 stack_size; /* task stack size */ rtems_task_priority initial_priority; /* task priority */ rtems_attribute attribute_set; /* task attributes */ diff --git a/c/src/exec/sapi/include/rtems/extension.h b/c/src/exec/sapi/include/rtems/extension.h index 1e20fe6470..b447cc43fe 100644 --- a/c/src/exec/sapi/include/rtems/extension.h +++ b/c/src/exec/sapi/include/rtems/extension.h @@ -28,6 +28,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/userext.h> @@ -72,7 +73,7 @@ void _Extension_Manager_initialization( */ rtems_status_code rtems_extension_create( - Objects_Name name, + rtems_name name, rtems_extensions_table *extension_table, Objects_Id *id ); @@ -89,7 +90,7 @@ rtems_status_code rtems_extension_create( */ rtems_status_code rtems_extension_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/c/src/exec/sapi/include/rtems/init.h b/c/src/exec/sapi/include/rtems/init.h index a5ed1688b7..8c6e34d2c3 100644 --- a/c/src/exec/sapi/include/rtems/init.h +++ b/c/src/exec/sapi/include/rtems/init.h @@ -30,6 +30,7 @@ extern "C" { #endif +#include <rtems/types.h> #include <rtems/config.h> #include <rtems/intr.h> diff --git a/c/src/exec/sapi/optman/no-ext.c b/c/src/exec/sapi/optman/no-ext.c index 4d707c3a49..db1df3624f 100644 --- a/c/src/exec/sapi/optman/no-ext.c +++ b/c/src/exec/sapi/optman/no-ext.c @@ -25,7 +25,7 @@ void _Extension_Manager_initialization( } rtems_status_code rtems_extension_create( - Objects_Name name, + rtems_name name, rtems_extensions_table *extension_table, Objects_Id *id ) @@ -34,7 +34,7 @@ rtems_status_code rtems_extension_create( } rtems_status_code rtems_extension_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { diff --git a/c/src/exec/sapi/src/extension.c b/c/src/exec/sapi/src/extension.c index 4cae903a34..8f5f5d998a 100644 --- a/c/src/exec/sapi/src/extension.c +++ b/c/src/exec/sapi/src/extension.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/object.h> #include <rtems/thread.h> #include <rtems/extension.h> @@ -35,11 +36,13 @@ void _Extension_Manager_initialization( ) { _Objects_Initialize_information( - &_Extension_Information, - OBJECTS_RTEMS_EXTENSIONS, - FALSE, - maximum_extensions, - sizeof( Extension_Control ) + &_Extension_Information, + OBJECTS_RTEMS_EXTENSIONS, + FALSE, + maximum_extensions, + sizeof( Extension_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -61,14 +64,14 @@ void _Extension_Manager_initialization( */ rtems_status_code rtems_extension_create( - Objects_Name name, + rtems_name name, rtems_extensions_table *extension_table, Objects_Id *id ) { Extension_Control *the_extension; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); _Thread_Disable_dispatch(); /* to prevent deletion */ @@ -82,7 +85,7 @@ rtems_status_code rtems_extension_create( _User_extensions_Add_set( &the_extension->Extension, extension_table ); - _Objects_Open( &_Extension_Information, &the_extension->Object, name ); + _Objects_Open( &_Extension_Information, &the_extension->Object, &name ); *id = the_extension->Object.id; _Thread_Enable_dispatch(); @@ -107,13 +110,13 @@ rtems_status_code rtems_extension_create( */ rtems_status_code rtems_extension_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { return _Objects_Name_to_id( &_Extension_Information, - name, + &name, RTEMS_SEARCH_LOCAL_NODE, id ); diff --git a/c/src/exec/score/headers/object.h b/c/src/exec/score/headers/object.h index 7f4c01c53d..c5226302d6 100644 --- a/c/src/exec/score/headers/object.h +++ b/c/src/exec/score/headers/object.h @@ -29,7 +29,25 @@ extern "C" { * object names. */ -typedef unsigned32 Objects_Name; +typedef void * Objects_Name; + +/* + * Space for object names is allocated in multiples of this. + * + * NOTE: Must be a power of 2. Matches the name manipulation routines. + */ + +#define OBJECTS_NAME_ALIGNMENT 4 + +/* + * Functions which compare names are prototyped like this. + */ + +typedef boolean (*Objects_Name_comparators)( + void * /* name_1 */, + void * /* name_2 */, + unsigned32 /* length */ +); /* * The following type defines the control block used to manage @@ -91,7 +109,7 @@ typedef enum { typedef struct { Chain_Node Node; Objects_Id id; - Objects_Name *name; + Objects_Name name; } Objects_Control; /* @@ -108,6 +126,8 @@ typedef struct { Objects_Name *name_table; /* table of local object names */ Chain_Control *global_table; /* pointer to global table */ Chain_Control Inactive; /* chain of inactive ctl blocks */ + boolean is_string; /* TRUE if names are strings */ + unsigned32 name_length; /* maximum length of names */ } Objects_Information; /* @@ -179,10 +199,79 @@ void _Objects_Initialize_information ( Objects_Classes the_class, boolean supports_global, unsigned32 maximum, - unsigned32 size + unsigned32 size, + boolean is_string, + unsigned32 maximum_name_length +); + +/* + * _Objects_Clear_name + * + * DESCRIPTION: + * + * XXX + */ + +void _Objects_Clear_name( + void *name, + unsigned32 length +); + +/* + * _Objects_Copy_name_string + * + * DESCRIPTION: + * + * XXX + */ + +void _Objects_Copy_name_string( + void *source, + void *destination +); + +/* + * _Objects_Copy_name_raw + * + * DESCRIPTION: + * + * XXX + */ + +void _Objects_Copy_name_raw( + void *source, + void *destination, + unsigned32 length +); + +/* + * _Objects_Compare_name_string + * + * DESCRIPTION: + * + * XXX + */ + +boolean _Objects_Compare_name_string( + void *name_1, + void *name_2, + unsigned32 length ); /* + * _Objects_Compare_name_raw + * + * DESCRIPTION: + * + * XXX + */ + +boolean _Objects_Compare_name_raw( + void *name_1, + void *name_2, + unsigned32 length +); +/* * _Objects_Name_to_id * * DESCRIPTION: @@ -244,53 +333,6 @@ Objects_Control *_Objects_Get_next( ); /* - * _Objects_Is_name_valid - * - * DESCRIPTION: - * - * This function returns TRUE if the name is valid, and FALSE otherwise. - */ - -STATIC INLINE boolean _Objects_Is_name_valid ( - Objects_Name name -); - -/* - * rtems_build_name - * - * DESCRIPTION: - * - * This function returns an object name composed of the four characters - * C1, C2, C3, and C4. - * - * NOTE: - * - * This must be implemented as a macro for use in Configuration Tables. - * - */ - -#define rtems_build_name( _C1, _C2, _C3, _C4 ) \ - ( (_C1) << 24 | (_C2) << 16 | (_C3) << 8 | (_C4) ) - -/* - * rtems_name_to_characters - * - * DESCRIPTION: - * - * This function breaks the object name into the four component - * characters C1, C2, C3, and C4. - * - */ - -STATIC INLINE void rtems_name_to_characters( - Objects_Name name, - char *c1, - char *c2, - char *c3, - char *c4 -); - -/* * _Objects_Build_id * * DESCRIPTION: diff --git a/c/src/exec/score/headers/objectmp.h b/c/src/exec/score/headers/objectmp.h index 0d29fda753..6ec5ed1781 100644 --- a/c/src/exec/score/headers/objectmp.h +++ b/c/src/exec/score/headers/objectmp.h @@ -28,7 +28,8 @@ extern "C" { typedef struct { Objects_Control Object; - Objects_Name name; + unsigned32 name; /* XXX broken but works */ + /* XXX If any API is MP with variable length names .. BOOM!!!! */ } Objects_MP_Control; /* @@ -93,7 +94,7 @@ STATIC INLINE boolean _Objects_MP_Is_null_global_object ( boolean _Objects_MP_Open ( Objects_Information *information, - Objects_Name the_name, + unsigned32 the_name, /* XXX -- wrong for variable length */ Objects_Id the_id, boolean is_fatal_error ); diff --git a/c/src/exec/score/headers/system.h b/c/src/exec/score/headers/system.h index 96b0abfff8..5f627c1a7c 100644 --- a/c/src/exec/score/headers/system.h +++ b/c/src/exec/score/headers/system.h @@ -127,6 +127,12 @@ extern const void * _Entry_points[ RTEMS_NUMBER_OF_ENTRY_POINTS ]; EXTERN rtems_cpu_table _CPU_Table; /* CPU dependent info */ +/* + * XXX weird RTEMS stuff + */ + +#define RTEMS_MAXIMUM_NAME_LENGTH 4 + #ifdef __cplusplus } #endif diff --git a/c/src/exec/score/include/rtems/score/object.h b/c/src/exec/score/include/rtems/score/object.h index 7f4c01c53d..c5226302d6 100644 --- a/c/src/exec/score/include/rtems/score/object.h +++ b/c/src/exec/score/include/rtems/score/object.h @@ -29,7 +29,25 @@ extern "C" { * object names. */ -typedef unsigned32 Objects_Name; +typedef void * Objects_Name; + +/* + * Space for object names is allocated in multiples of this. + * + * NOTE: Must be a power of 2. Matches the name manipulation routines. + */ + +#define OBJECTS_NAME_ALIGNMENT 4 + +/* + * Functions which compare names are prototyped like this. + */ + +typedef boolean (*Objects_Name_comparators)( + void * /* name_1 */, + void * /* name_2 */, + unsigned32 /* length */ +); /* * The following type defines the control block used to manage @@ -91,7 +109,7 @@ typedef enum { typedef struct { Chain_Node Node; Objects_Id id; - Objects_Name *name; + Objects_Name name; } Objects_Control; /* @@ -108,6 +126,8 @@ typedef struct { Objects_Name *name_table; /* table of local object names */ Chain_Control *global_table; /* pointer to global table */ Chain_Control Inactive; /* chain of inactive ctl blocks */ + boolean is_string; /* TRUE if names are strings */ + unsigned32 name_length; /* maximum length of names */ } Objects_Information; /* @@ -179,10 +199,79 @@ void _Objects_Initialize_information ( Objects_Classes the_class, boolean supports_global, unsigned32 maximum, - unsigned32 size + unsigned32 size, + boolean is_string, + unsigned32 maximum_name_length +); + +/* + * _Objects_Clear_name + * + * DESCRIPTION: + * + * XXX + */ + +void _Objects_Clear_name( + void *name, + unsigned32 length +); + +/* + * _Objects_Copy_name_string + * + * DESCRIPTION: + * + * XXX + */ + +void _Objects_Copy_name_string( + void *source, + void *destination +); + +/* + * _Objects_Copy_name_raw + * + * DESCRIPTION: + * + * XXX + */ + +void _Objects_Copy_name_raw( + void *source, + void *destination, + unsigned32 length +); + +/* + * _Objects_Compare_name_string + * + * DESCRIPTION: + * + * XXX + */ + +boolean _Objects_Compare_name_string( + void *name_1, + void *name_2, + unsigned32 length ); /* + * _Objects_Compare_name_raw + * + * DESCRIPTION: + * + * XXX + */ + +boolean _Objects_Compare_name_raw( + void *name_1, + void *name_2, + unsigned32 length +); +/* * _Objects_Name_to_id * * DESCRIPTION: @@ -244,53 +333,6 @@ Objects_Control *_Objects_Get_next( ); /* - * _Objects_Is_name_valid - * - * DESCRIPTION: - * - * This function returns TRUE if the name is valid, and FALSE otherwise. - */ - -STATIC INLINE boolean _Objects_Is_name_valid ( - Objects_Name name -); - -/* - * rtems_build_name - * - * DESCRIPTION: - * - * This function returns an object name composed of the four characters - * C1, C2, C3, and C4. - * - * NOTE: - * - * This must be implemented as a macro for use in Configuration Tables. - * - */ - -#define rtems_build_name( _C1, _C2, _C3, _C4 ) \ - ( (_C1) << 24 | (_C2) << 16 | (_C3) << 8 | (_C4) ) - -/* - * rtems_name_to_characters - * - * DESCRIPTION: - * - * This function breaks the object name into the four component - * characters C1, C2, C3, and C4. - * - */ - -STATIC INLINE void rtems_name_to_characters( - Objects_Name name, - char *c1, - char *c2, - char *c3, - char *c4 -); - -/* * _Objects_Build_id * * DESCRIPTION: diff --git a/c/src/exec/score/include/rtems/score/objectmp.h b/c/src/exec/score/include/rtems/score/objectmp.h index 0d29fda753..6ec5ed1781 100644 --- a/c/src/exec/score/include/rtems/score/objectmp.h +++ b/c/src/exec/score/include/rtems/score/objectmp.h @@ -28,7 +28,8 @@ extern "C" { typedef struct { Objects_Control Object; - Objects_Name name; + unsigned32 name; /* XXX broken but works */ + /* XXX If any API is MP with variable length names .. BOOM!!!! */ } Objects_MP_Control; /* @@ -93,7 +94,7 @@ STATIC INLINE boolean _Objects_MP_Is_null_global_object ( boolean _Objects_MP_Open ( Objects_Information *information, - Objects_Name the_name, + unsigned32 the_name, /* XXX -- wrong for variable length */ Objects_Id the_id, boolean is_fatal_error ); diff --git a/c/src/exec/score/include/rtems/system.h b/c/src/exec/score/include/rtems/system.h index 96b0abfff8..5f627c1a7c 100644 --- a/c/src/exec/score/include/rtems/system.h +++ b/c/src/exec/score/include/rtems/system.h @@ -127,6 +127,12 @@ extern const void * _Entry_points[ RTEMS_NUMBER_OF_ENTRY_POINTS ]; EXTERN rtems_cpu_table _CPU_Table; /* CPU dependent info */ +/* + * XXX weird RTEMS stuff + */ + +#define RTEMS_MAXIMUM_NAME_LENGTH 4 + #ifdef __cplusplus } #endif diff --git a/c/src/exec/score/inline/object.inl b/c/src/exec/score/inline/object.inl index da65807aa1..687ffd923b 100644 --- a/c/src/exec/score/inline/object.inl +++ b/c/src/exec/score/inline/object.inl @@ -19,39 +19,6 @@ /*PAGE * - * _Objects_Is_name_valid - * - */ - -STATIC INLINE boolean _Objects_Is_name_valid ( - Objects_Name name -) -{ - return ( name != 0 ); -} - -/*PAGE - * - * rtems_name_to_characters - * - */ - -STATIC INLINE void rtems_name_to_characters( - Objects_Name name, - char *c1, - char *c2, - char *c3, - char *c4 -) -{ - *c1 = (name >> 24) & 0xff; - *c2 = (name >> 16) & 0xff; - *c3 = (name >> 8) & 0xff; - *c4 = name & 0xff; -} - -/*PAGE - * * _Objects_Build_id * */ @@ -186,12 +153,15 @@ STATIC INLINE void _Objects_Open( Objects_Name name ) { - unsigned32 index; + unsigned32 index; index = rtems_get_index( the_object->id ); information->local_table[ index ] = the_object; - information->name_table[ index ] = name; - the_object->name = &information->name_table[ index ]; + + if ( information->is_string ) + _Objects_Copy_name_string( name, the_object->name ); + else + _Objects_Copy_name_raw( name, the_object->name, information->name_length ); } /*PAGE @@ -209,8 +179,7 @@ STATIC INLINE void _Objects_Close( index = rtems_get_index( the_object->id ); information->local_table[ index ] = NULL; - information->name_table[ index ] = 0; - the_object->name = 0; + _Objects_Clear_name( the_object->name, information->name_length ); } #endif diff --git a/c/src/exec/score/inline/rtems/score/object.inl b/c/src/exec/score/inline/rtems/score/object.inl index da65807aa1..687ffd923b 100644 --- a/c/src/exec/score/inline/rtems/score/object.inl +++ b/c/src/exec/score/inline/rtems/score/object.inl @@ -19,39 +19,6 @@ /*PAGE * - * _Objects_Is_name_valid - * - */ - -STATIC INLINE boolean _Objects_Is_name_valid ( - Objects_Name name -) -{ - return ( name != 0 ); -} - -/*PAGE - * - * rtems_name_to_characters - * - */ - -STATIC INLINE void rtems_name_to_characters( - Objects_Name name, - char *c1, - char *c2, - char *c3, - char *c4 -) -{ - *c1 = (name >> 24) & 0xff; - *c2 = (name >> 16) & 0xff; - *c3 = (name >> 8) & 0xff; - *c4 = name & 0xff; -} - -/*PAGE - * * _Objects_Build_id * */ @@ -186,12 +153,15 @@ STATIC INLINE void _Objects_Open( Objects_Name name ) { - unsigned32 index; + unsigned32 index; index = rtems_get_index( the_object->id ); information->local_table[ index ] = the_object; - information->name_table[ index ] = name; - the_object->name = &information->name_table[ index ]; + + if ( information->is_string ) + _Objects_Copy_name_string( name, the_object->name ); + else + _Objects_Copy_name_raw( name, the_object->name, information->name_length ); } /*PAGE @@ -209,8 +179,7 @@ STATIC INLINE void _Objects_Close( index = rtems_get_index( the_object->id ); information->local_table[ index ] = NULL; - information->name_table[ index ] = 0; - the_object->name = 0; + _Objects_Clear_name( the_object->name, information->name_length ); } #endif diff --git a/c/src/exec/score/macros/object.inl b/c/src/exec/score/macros/object.inl index 6c7caa383a..27675b19bf 100644 --- a/c/src/exec/score/macros/object.inl +++ b/c/src/exec/score/macros/object.inl @@ -19,28 +19,6 @@ /*PAGE * - * _Objects_Is_name_valid - * - */ - -#define _Objects_Is_name_valid( _name ) \ - ( (_name) != 0 ) - -/* - * rtems_name_to_characters - * - */ - -#define rtems_name_to_characters( _name, _c1, _c2, _c3, _c4 ) \ - { \ - (*(_c1) = ((_name) >> 24) & 0xff; \ - (*(_c2) = ((_name) >> 16) & 0xff; \ - (*(_c3) = ((_name) >> 8) & 0xff; \ - (*(_c4) = ((_name)) & 0xff; \ - } - -/*PAGE - * * _Objects_Build_id * */ @@ -134,8 +112,12 @@ \ _index = rtems_get_index( (_the_object)->id ); \ (_information)->local_table[ _index ] = (_the_object); \ - (_information)->name_table[ _index ] = (_name); \ - (_the_object)->name = &(_information)->name_table[ _index ]; \ + \ + if ( (_information)->is_string ) \ + _Objects_Copy_name_string( (_name), (_the_object)->name ); \ + else \ + _Objects_Copy_name_raw( \ + (_name), (_the_object)->name, (_information)->name_length ); \ } /*PAGE @@ -150,8 +132,7 @@ \ _index = rtems_get_index( (_the_object)->id ); \ (_information)->local_table[ _index ] = NULL; \ - (_information)->name_table[ _index ] = 0; \ - (_the_object)->name = 0; \ + _Objects_Clear_name( (_the_object)->name, (_information)->name_length ); \ } #endif diff --git a/c/src/exec/score/macros/rtems/score/object.inl b/c/src/exec/score/macros/rtems/score/object.inl index 6c7caa383a..27675b19bf 100644 --- a/c/src/exec/score/macros/rtems/score/object.inl +++ b/c/src/exec/score/macros/rtems/score/object.inl @@ -19,28 +19,6 @@ /*PAGE * - * _Objects_Is_name_valid - * - */ - -#define _Objects_Is_name_valid( _name ) \ - ( (_name) != 0 ) - -/* - * rtems_name_to_characters - * - */ - -#define rtems_name_to_characters( _name, _c1, _c2, _c3, _c4 ) \ - { \ - (*(_c1) = ((_name) >> 24) & 0xff; \ - (*(_c2) = ((_name) >> 16) & 0xff; \ - (*(_c3) = ((_name) >> 8) & 0xff; \ - (*(_c4) = ((_name)) & 0xff; \ - } - -/*PAGE - * * _Objects_Build_id * */ @@ -134,8 +112,12 @@ \ _index = rtems_get_index( (_the_object)->id ); \ (_information)->local_table[ _index ] = (_the_object); \ - (_information)->name_table[ _index ] = (_name); \ - (_the_object)->name = &(_information)->name_table[ _index ]; \ + \ + if ( (_information)->is_string ) \ + _Objects_Copy_name_string( (_name), (_the_object)->name ); \ + else \ + _Objects_Copy_name_raw( \ + (_name), (_the_object)->name, (_information)->name_length ); \ } /*PAGE @@ -150,8 +132,7 @@ \ _index = rtems_get_index( (_the_object)->id ); \ (_information)->local_table[ _index ] = NULL; \ - (_information)->name_table[ _index ] = 0; \ - (_the_object)->name = 0; \ + _Objects_Clear_name( (_the_object)->name, (_information)->name_length ); \ } #endif diff --git a/c/src/exec/score/src/object.c b/c/src/exec/score/src/object.c index 0181903647..5b64ea8802 100644 --- a/c/src/exec/score/src/object.c +++ b/c/src/exec/score/src/object.c @@ -55,6 +55,7 @@ void _Objects_Handler_initialization( * the_class - object class * supports_global - TRUE if this is a global object class * maximum - maximum objects of this class + * is_string - TRUE if names for this object are strings * size - size of this object's control block * * Output parameters: NONE @@ -65,15 +66,24 @@ void _Objects_Initialize_information( Objects_Classes the_class, boolean supports_global, unsigned32 maximum, - unsigned32 size + unsigned32 size, + boolean is_string, + unsigned32 maximum_name_length ) { unsigned32 minimum_index; unsigned32 index; Objects_Control *the_object; + unsigned32 name_length; + void *name_area; information->maximum = maximum; information->the_class = the_class; + information->is_string = is_string; + + /* + * Calculate minimum and maximum Id's + */ if ( maximum == 0 ) minimum_index = 0; else minimum_index = 1; @@ -84,24 +94,45 @@ void _Objects_Initialize_information( information->maximum_id = _Objects_Build_id( the_class, _Objects_Local_node, maximum ); + /* + * Allocate local pointer table + */ + information->local_table = _Workspace_Allocate_or_fatal_error( (maximum + 1) * sizeof(Objects_Control *) ); - information->name_table = _Workspace_Allocate_or_fatal_error( - (maximum + 1) * sizeof(Objects_Name) - ); + /* + * Allocate name table + */ + + name_length = maximum_name_length; + + if (name_length & (OBJECTS_NAME_ALIGNMENT-1)) + name_length = (name_length + OBJECTS_NAME_ALIGNMENT) & + ~(OBJECTS_NAME_ALIGNMENT-1); + + information->name_length = name_length; + + name_area = _Workspace_Allocate_or_fatal_error( (maximum + 1) * name_length ); + information->name_table = name_area; + + /* + * Initialize local pointer table + */ - for ( index=0 ; index < maximum ; index++ ) { + for ( index=0 ; index <= maximum ; index++ ) { information->local_table[ index ] = NULL; - information->name_table[ index ] = 0; } + /* + * Initialize objects .. if there are any + */ + if ( maximum == 0 ) { _Chain_Initialize_empty( &information->Inactive ); } else { - _Chain_Initialize( &information->Inactive, _Workspace_Allocate_or_fatal_error( maximum * size ), @@ -110,31 +141,151 @@ void _Objects_Initialize_information( ); the_object = (Objects_Control *) information->Inactive.first; - for ( index=1; - index <= maximum ; - index++ ) { + for ( index=1; index <= maximum ; index++ ) { the_object->id = _Objects_Build_id( the_class, _Objects_Local_node, index ); + + the_object->name = (void *) name_area; + + name_area = _Addresses_Add_offset( name_area, name_length ); + the_object = (Objects_Control *) the_object->Node.next; } } - if ( supports_global == TRUE && _Configuration_Is_multiprocessing() ) { + /* + * Take care of multiprocessing + */ - information->global_table = _Workspace_Allocate_or_fatal_error( - (_Configuration_MP_table->maximum_nodes + 1) * sizeof(Chain_Control) - ); + if ( supports_global == TRUE && _Configuration_Is_multiprocessing() ) { - for ( index=1; - index <= _Configuration_MP_table->maximum_nodes ; - index++ ) - _Chain_Initialize_empty( &information->global_table[ index ] ); - } - else - information->global_table = NULL; + information->global_table = _Workspace_Allocate_or_fatal_error( + (_Configuration_MP_table->maximum_nodes + 1) * sizeof(Chain_Control) + ); + + for ( index=1; + index <= _Configuration_MP_table->maximum_nodes ; + index++ ) + _Chain_Initialize_empty( &information->global_table[ index ] ); + } + else + information->global_table = NULL; +} + +/*PAGE + * + * _Objects_Clear_name + * + * XXX + */ + +void _Objects_Clear_name( + void *name, + unsigned32 length +) +{ + unsigned32 index; + unsigned32 maximum = length / OBJECTS_NAME_ALIGNMENT; + unsigned32 *name_ptr = name; + + for ( index=0 ; index < maximum ; index++ ) + *name_ptr++ = 0; +} + +/*PAGE + * + * _Objects_Copy_name_string + * + * XXX + */ + +void _Objects_Copy_name_string( + void *source, + void *destination +) +{ + unsigned8 *source_p = source; + unsigned8 *destination_p = destination; + + do { + *destination_p++ = *source_p; + } while ( *source_p++ ); +} + +/*PAGE + * + * _Objects_Copy_name_raw + * + * XXX + */ + +void _Objects_Copy_name_raw( + void *source, + void *destination, + unsigned32 length +) +{ + unsigned32 *source_p = source; + unsigned32 *destination_p = destination; + unsigned32 tmp_length = length / OBJECTS_NAME_ALIGNMENT; + + while ( tmp_length-- ) + *destination_p++ = *source_p++; +} + +/*PAGE + * + * _Objects_Compare_name_string + * + * XXX + */ + +boolean _Objects_Compare_name_string( + void *name_1, + void *name_2, + unsigned32 length +) +{ + unsigned8 *name_1_p = name_1; + unsigned8 *name_2_p = name_2; + unsigned32 tmp_length = length; + + do { + if ( *name_1_p++ != *name_2_p++ ) + return FALSE; + if ( !tmp_length-- ) + return FALSE; + } while ( *name_1_p ); + + return TRUE; +} + +/*PAGE + * + * _Objects_Compare_name_raw + * + * XXX + */ + +boolean _Objects_Compare_name_raw( + void *name_1, + void *name_2, + unsigned32 length +) +{ + unsigned32 *name_1_p = name_1; + unsigned32 *name_2_p = name_2; + unsigned32 tmp_length = length / OBJECTS_NAME_ALIGNMENT; + + while ( tmp_length-- ) + if ( *name_1_p++ != *name_2_p++ ) + return FALSE; + + return TRUE; } + /*PAGE * * _Objects_Name_to_id @@ -156,15 +307,17 @@ void _Objects_Initialize_information( rtems_status_code _Objects_Name_to_id( Objects_Information *information, - Objects_Name name, - unsigned32 node, - Objects_Id *id + Objects_Name name, + unsigned32 node, + Objects_Id *id ) { - boolean search_local_node; - Objects_Control **objects; - Objects_Control *the_object; - unsigned32 index; + boolean search_local_node; + Objects_Control **objects; + Objects_Control *the_object; + unsigned32 index; + unsigned32 name_length; + Objects_Name_comparators compare_them; if ( name == 0 ) return( RTEMS_INVALID_NAME ); @@ -179,6 +332,11 @@ rtems_status_code _Objects_Name_to_id( if ( search_local_node ) { objects = information->local_table; + name_length = information->name_length; + + if ( information->is_string ) compare_them = _Objects_Compare_name_string; + else compare_them = _Objects_Compare_name_raw; + for ( index = 1; index <= information->maximum; index++ ) { the_object = objects[ index ]; @@ -186,7 +344,7 @@ rtems_status_code _Objects_Name_to_id( if ( !the_object || !the_object->name ) continue; - if ( name == *the_object->name ) { + if ( (*compare_them)( name, the_object->name, name_length ) ) { *id = the_object->id; return( RTEMS_SUCCESSFUL ); } diff --git a/c/src/exec/score/src/objectmp.c b/c/src/exec/score/src/objectmp.c index d75a34b150..a8b067020d 100644 --- a/c/src/exec/score/src/objectmp.c +++ b/c/src/exec/score/src/objectmp.c @@ -53,12 +53,12 @@ void _Objects_MP_Handler_initialization ( boolean _Objects_MP_Open ( Objects_Information *information, - Objects_Name the_name, + unsigned32 the_name, /* XXX -- wrong for variable */ Objects_Id the_id, boolean is_fatal_error ) { - Objects_MP_Control *the_global_object; + Objects_MP_Control *the_global_object; the_global_object = _Objects_MP_Allocate_global_object(); if ( _Objects_MP_Is_null_global_object( the_global_object ) ) { @@ -139,6 +139,7 @@ rtems_status_code _Objects_MP_Global_name_search ( Chain_Control *the_chain; Chain_Node *the_node; Objects_MP_Control *the_object; + unsigned32 name_to_use = *(unsigned32 *)the_name; /* XXX variable */ if ( nodes_to_search > _Configuration_MP_table->maximum_nodes ) @@ -174,7 +175,7 @@ rtems_status_code _Objects_MP_Global_name_search ( the_object = (Objects_MP_Control *) the_node; - if ( the_object->name == the_name ) { + if ( the_object->name == name_to_use ) { *the_id = the_object->Object.id; _Thread_Enable_dispatch(); return ( RTEMS_SUCCESSFUL ); diff --git a/c/src/exec/score/src/thread.c b/c/src/exec/score/src/thread.c index 92c882d749..9793792b44 100644 --- a/c/src/exec/score/src/thread.c +++ b/c/src/exec/score/src/thread.c @@ -58,11 +58,13 @@ void _Thread_Handler_initialization( _Thread_Ticks_per_timeslice = ticks_per_timeslice; _Objects_Initialize_information( - &_Thread_Information, - OBJECTS_RTEMS_TASKS, - TRUE, - maximum_tasks, - sizeof( Thread_Control ) + &_Thread_Information, + OBJECTS_RTEMS_TASKS, + TRUE, + maximum_tasks, + sizeof( Thread_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); _Thread_Ready_chain = _Workspace_Allocate_or_fatal_error( diff --git a/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h b/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h new file mode 100644 index 0000000000..a18ca343bd --- /dev/null +++ b/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h @@ -0,0 +1,114 @@ +/* bsp.h + * + * This include file contains all Papyrus board IO definitions. + * + * Author: Andrew Bray <andy@i-cubed.demon.co.uk> + * + * COPYRIGHT (c) 1995 by i-cubed ltd. + * + * To anyone who acknowledges that this file is provided "AS IS" + * without any express or implied warranty: + * permission to use, copy, modify, and distribute this file + * for any purpose is hereby granted without fee, provided that + * the above copyright notice and this notice appears in all + * copies, and that the name of i-cubed limited not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * i-cubed limited makes no representations about the suitability + * of this software for any purpose. + * + * Derived from c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h + * + * 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. + * + * bsp.h,v 1.2 1995/05/31 16:56:13 joel Exp + */ + +#ifndef __PAPYRUS_h +#define __PAPYRUS_h + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef ASM +/* Definition of where to store registers in alignment handler */ +#define ALIGN_REGS 0x0140 + +#else +#include <rtems.h> + +/* + * Define the time limits for RTEMS Test Suite test durations. + * Long test and short test duration limits are provided. These + * values are in seconds and need to be converted to ticks for the + * application. + * + */ + +#define MAX_LONG_TEST_DURATION 300 /* 5 minutes = 300 seconds */ +#define MAX_SHORT_TEST_DURATION 3 /* 3 seconds */ + +/* + * Stuff for Time Test 27 + */ + +#define MUST_WAIT_FOR_INTERRUPT 0 + +#define Install_tm27_vector( handler ) set_vector( (handler), PPC_IRQ_SCALL, 1 ) + +#define Cause_tm27_intr() asm volatile ("sc") + +#define Clear_tm27_intr() + +#define Lower_tm27_intr() + +/* + * Simple spin delay in microsecond units for device drivers. + * This is very dependent on the clock speed of the target. + */ + +#define delay( microseconds ) \ + { \ + unsigned32 start, ticks, now; \ + asm volatile ("mftblo %0" : "=r" (start)); \ + ticks = (microseconds) * Cpu_table.clicks_per_usec; \ + do \ + asm volatile ("mftblo %0" : "=r" (now)); \ + while (now - start < ticks); \ + } + +/* Constants */ + +#define RAM_START 0 +#define RAM_END 0x00200000 + +/* miscellaneous stuff assumed to exist */ + +extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ +extern rtems_cpu_table Cpu_table; /* owned by BSP */ + +/* functions */ + +void bsp_start( void ); +void bsp_cleanup( void ); + +rtems_isr_entry set_vector( /* returns old vector */ + rtems_isr_entry handler, /* isr routine */ + rtems_vector_number vector, /* vector number */ + int type /* RTEMS or RAW intr */ +); +#endif /* ASM */ + +#ifdef __cplusplus +} +#endif + +#endif +/* end of include file */ diff --git a/c/src/lib/libbsp/powerpc/papyrus/include/coverhd.h b/c/src/lib/libbsp/powerpc/papyrus/include/coverhd.h new file mode 100644 index 0000000000..fa419147bd --- /dev/null +++ b/c/src/lib/libbsp/powerpc/papyrus/include/coverhd.h @@ -0,0 +1,135 @@ +/* coverhd.h + * + * This include file has defines to represent the overhead associated + * with calling a particular directive from C. These are used in the + * Timing Test Suite to ignore the overhead required to pass arguments + * to directives. On some CPUs and/or target boards, this overhead + * is significant and makes it difficult to distinguish internal + * RTEMS execution time from that used to call the directive. + * This file should be updated after running the C overhead timing + * test. Once this update has been performed, the RTEMS Time Test + * Suite should be rebuilt to account for these overhead times in the + * timing results. + * + * NOTE: If these are all zero, then the times reported include all + * all calling overhead including passing of arguments. + * + * 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. + * + * coverhd.h,v 1.2 1995/05/31 16:56:15 joel Exp + */ + +/* + * Updated for a 25MHz Papyrus by Andrew Bray <andy@i-cubed.demon.co.uk> + * + * Units are 100ns. + * + * These numbers are of questionable use, as they are developed by calling + * the routine many times, thus getting its entry veneer into the (small) + * cache on the 403GA. This in general is not true of the RTEMS timing + * tests, which usually call a routine only once, thus having no cache loaded + * advantage. + * + * Whether the directive times are useful after deducting the function call + * overhead is also questionable. The user is more interested generally + * in the total cost of a directive, not the cost if the procedure call + * is inlined! (In general this is not true). + * + * Andrew Bray 18/08/1995 + * + */ + +#ifndef __COVERHD_h +#define __COVERHD_h + +#ifdef __cplusplus +extern "C" { +#endif + +#define CALLING_OVERHEAD_INITIALIZE_EXECUTIVE 1 +#define CALLING_OVERHEAD_SHUTDOWN_EXECUTIVE 1 +#define CALLING_OVERHEAD_TASK_CREATE 3 +#define CALLING_OVERHEAD_TASK_IDENT 1 +#define CALLING_OVERHEAD_TASK_START 1 +#define CALLING_OVERHEAD_TASK_RESTART 1 +#define CALLING_OVERHEAD_TASK_DELETE 1 +#define CALLING_OVERHEAD_TASK_SUSPEND 1 +#define CALLING_OVERHEAD_TASK_RESUME 1 +#define CALLING_OVERHEAD_TASK_SET_PRIORITY 1 +#define CALLING_OVERHEAD_TASK_MODE 1 +#define CALLING_OVERHEAD_TASK_GET_NOTE 1 +#define CALLING_OVERHEAD_TASK_SET_NOTE 1 +#define CALLING_OVERHEAD_TASK_WAKE_WHEN 4 +#define CALLING_OVERHEAD_TASK_WAKE_AFTER 1 +#define CALLING_OVERHEAD_INTERRUPT_CATCH 1 +#define CALLING_OVERHEAD_CLOCK_GET 4 +#define CALLING_OVERHEAD_CLOCK_SET 3 +#define CALLING_OVERHEAD_CLOCK_TICK 1 + +#define CALLING_OVERHEAD_TIMER_CREATE 1 +#define CALLING_OVERHEAD_TIMER_IDENT 1 +#define CALLING_OVERHEAD_TIMER_DELETE 1 +#define CALLING_OVERHEAD_TIMER_FIRE_AFTER 2 +#define CALLING_OVERHEAD_TIMER_FIRE_WHEN 5 +#define CALLING_OVERHEAD_TIMER_RESET 1 +#define CALLING_OVERHEAD_TIMER_CANCEL 1 +#define CALLING_OVERHEAD_SEMAPHORE_CREATE 2 +#define CALLING_OVERHEAD_SEMAPHORE_IDENT 1 +#define CALLING_OVERHEAD_SEMAPHORE_DELETE 1 +#define CALLING_OVERHEAD_SEMAPHORE_OBTAIN 1 +#define CALLING_OVERHEAD_SEMAPHORE_RELEASE 1 +#define CALLING_OVERHEAD_MESSAGE_QUEUE_CREATE 2 +#define CALLING_OVERHEAD_MESSAGE_QUEUE_IDENT 1 +#define CALLING_OVERHEAD_MESSAGE_QUEUE_DELETE 1 +#define CALLING_OVERHEAD_MESSAGE_QUEUE_SEND 1 +#define CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT 1 +#define CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST 1 +#define CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE 2 +#define CALLING_OVERHEAD_MESSAGE_QUEUE_FLUSH 1 + +#define CALLING_OVERHEAD_EVENT_SEND 1 +#define CALLING_OVERHEAD_EVENT_RECEIVE 2 +#define CALLING_OVERHEAD_SIGNAL_CATCH 1 +#define CALLING_OVERHEAD_SIGNAL_SEND 1 +#define CALLING_OVERHEAD_PARTITION_CREATE 3 +#define CALLING_OVERHEAD_PARTITION_IDENT 1 +#define CALLING_OVERHEAD_PARTITION_DELETE 1 +#define CALLING_OVERHEAD_PARTITION_GET_BUFFER 1 +#define CALLING_OVERHEAD_PARTITION_RETURN_BUFFER 1 +#define CALLING_OVERHEAD_REGION_CREATE 3 +#define CALLING_OVERHEAD_REGION_IDENT 1 +#define CALLING_OVERHEAD_REGION_DELETE 1 +#define CALLING_OVERHEAD_REGION_GET_SEGMENT 2 +#define CALLING_OVERHEAD_REGION_RETURN_SEGMENT 1 +#define CALLING_OVERHEAD_PORT_CREATE 2 +#define CALLING_OVERHEAD_PORT_IDENT 1 +#define CALLING_OVERHEAD_PORT_DELETE 1 +#define CALLING_OVERHEAD_PORT_EXTERNAL_TO_INTERNAL 1 +#define CALLING_OVERHEAD_PORT_INTERNAL_TO_EXTERNAL 2 + +#define CALLING_OVERHEAD_IO_INITIALIZE 2 +#define CALLING_OVERHEAD_IO_OPEN 2 +#define CALLING_OVERHEAD_IO_CLOSE 2 +#define CALLING_OVERHEAD_IO_READ 2 +#define CALLING_OVERHEAD_IO_WRITE 2 +#define CALLING_OVERHEAD_IO_CONTROL 2 +#define CALLING_OVERHEAD_FATAL_ERROR_OCCURRED 1 +#define CALLING_OVERHEAD_RATE_MONOTONIC_CREATE 1 +#define CALLING_OVERHEAD_RATE_MONOTONIC_IDENT 1 +#define CALLING_OVERHEAD_RATE_MONOTONIC_DELETE 1 +#define CALLING_OVERHEAD_RATE_MONOTONIC_CANCEL 1 +#define CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD 1 +#define CALLING_OVERHEAD_MULTIPROCESSING_ANNOUNCE 1 + +#ifdef __cplusplus +} +#endif + +#endif +/* end of include file */ diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/bspclean.c b/c/src/lib/libbsp/powerpc/papyrus/startup/bspclean.c new file mode 100644 index 0000000000..876ed1b659 --- /dev/null +++ b/c/src/lib/libbsp/powerpc/papyrus/startup/bspclean.c @@ -0,0 +1,44 @@ +/* bsp_cleanup() + * + * This routine normally is part of start.s and usually returns + * control to a monitor. + * + * INPUT: NONE + * + * OUTPUT: NONE + * + * Author: Andrew Bray <andy@i-cubed.demon.co.uk> + * + * COPYRIGHT (c) 1995 by i-cubed ltd. + * + * To anyone who acknowledges that this file is provided "AS IS" + * without any express or implied warranty: + * permission to use, copy, modify, and distribute this file + * for any purpose is hereby granted without fee, provided that + * the above copyright notice and this notice appears in all + * copies, and that the name of i-cubed limited not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * i-cubed limited makes no representations about the suitability + * of this software for any purpose. + * + * Derived from c/src/lib/libbsp/no_cpu/no_bsp/startup/bspclean.c: + * + * 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. + * + * bspclean.c,v 1.2 1995/05/31 16:56:27 joel Exp + */ + +#include <rtems.h> +#include <bsp.h> + +void bsp_cleanup( void ) +{ + rtems_fatal_error_occurred(0); +} diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c new file mode 100644 index 0000000000..a018c4cbfb --- /dev/null +++ b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c @@ -0,0 +1,194 @@ +/* bsp_start() + * + * This routine starts the application. It includes application, + * board, and monitor specific initialization and configuration. + * The generic CPU dependent initialization has been performed + * before this routine is invoked. + * + * INPUT: NONE + * + * OUTPUT: NONE + * + * Author: Andrew Bray <andy@i-cubed.demon.co.uk> + * + * COPYRIGHT (c) 1995 by i-cubed ltd. + * + * To anyone who acknowledges that this file is provided "AS IS" + * without any express or implied warranty: + * permission to use, copy, modify, and distribute this file + * for any purpose is hereby granted without fee, provided that + * the above copyright notice and this notice appears in all + * copies, and that the name of i-cubed limited not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * i-cubed limited makes no representations about the suitability + * of this software for any purpose. + * + * Derived from c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c: + * + * 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. + * + * bspstart.c,v 1.2 1995/05/31 16:56:29 joel Exp + */ + +#include <rtems.h> +#include <bsp.h> +#include <shm.h> +#include <libcsupport.h> + +/* + * The original table from the application and our copy of it with + * some changes. + */ + +extern rtems_configuration_table Configuration; + +rtems_configuration_table BSP_Configuration; + +rtems_cpu_table Cpu_table; + +/* Initialize whatever libc we are using + * called from postdriver hook + */ + +void bsp_libc_init() +{ + extern int _end; + rtems_unsigned32 heap_start; + + heap_start = (rtems_unsigned32) &_end; + if (heap_start & (CPU_ALIGNMENT-1)) + heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); + + /* + * The last parameter to RTEMS_Malloc_Initialize is the "chunk" + * size which a multiple of will be requested on each sbrk() + * call by malloc(). A value of 0 indicates that sbrk() should + * not be called to extend the heap. + */ + + RTEMS_Malloc_Initialize((void *) heap_start, 64 * 1024, 0); + + /* + * Set up for the libc handling. + */ + + if (BSP_Configuration.ticks_per_timeslice > 0) + libc_init(1); /* reentrant if possible */ + else + libc_init(0); /* non-reentrant */ + + /* + * Initialize the stack bounds checker + */ + +#ifdef STACK_CHECKER_ON + Stack_check_Initialize(); +#endif +} + +void bsp_start(void) +{ + /* + * Allocate the memory for the RTEMS Work Space. This can come from + * a variety of places: hard coded address, malloc'ed from outside + * RTEMS world (e.g. simulator or primitive memory manager), or (as + * typically done by stock BSPs) by subtracting the required amount + * of work space from the last physical address on the CPU board. + */ + + /* + * Copy the Configuration Table .. so we can change it + */ + + BSP_Configuration = Configuration; + + /* + * Add 1 region for the RTEMS Malloc + */ + + BSP_Configuration.maximum_regions++; + + /* + * Add 1 extension for newlib libc + */ + +#ifdef RTEMS_NEWLIB + BSP_Configuration.maximum_extensions++; +#endif + + /* + * Add 1 extension for stack checker + */ + +#ifdef STACK_CHECKER_ON + BSP_Configuration.maximum_extensions++; +#endif + + /* + * Need to "allocate" the memory for the RTEMS Workspace and + * tell the RTEMS configuration where it is. This memory is + * not malloc'ed. It is just "pulled from the air". + */ + +/*BSP_Configuration.work_space_size *= 4;*/ + + BSP_Configuration.work_space_start = (void *) + RAM_END - BSP_Configuration.work_space_size; + + /* + * initialize the CPU table for this BSP + */ + + /* + * we do not use the pretasking_hook + */ + + Cpu_table.pretasking_hook = NULL; + + Cpu_table.predriver_hook = bsp_libc_init; /* RTEMS resources available */ + + Cpu_table.postdriver_hook = NULL; + + Cpu_table.idle_task = NULL; /* do not override system IDLE task */ + + Cpu_table.do_zero_of_workspace = TRUE; + + Cpu_table.interrupt_stack_size = 4 * 1024; + + Cpu_table.extra_system_initialization_stack = 0; + + /* + * Don't forget the other CPU Table entries. + */ + + Cpu_table.clicks_per_usec = 10; + + Cpu_table.serial_per_sec = 10000000; + + Cpu_table.serial_external_clock = 1; + + Cpu_table.serial_xon_xoff = 0; + + Cpu_table.serial_cts_rts = 1; + + Cpu_table.serial_rate = 9600; + + Cpu_table.timer_average_overhead = 2; + + Cpu_table.timer_least_valid = 3; + + /* + * Start RTEMS + */ + + rtems_initialize_executive( &BSP_Configuration, &Cpu_table ); + + bsp_cleanup(); +} diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/setvec.c b/c/src/lib/libbsp/powerpc/papyrus/startup/setvec.c new file mode 100644 index 0000000000..73752d9b47 --- /dev/null +++ b/c/src/lib/libbsp/powerpc/papyrus/startup/setvec.c @@ -0,0 +1,58 @@ +/* set_vector + * + * This routine installs an interrupt vector on the target Board/CPU. + * This routine is allowed to be as board dependent as necessary. + * + * INPUT: + * handler - interrupt handler entry point + * vector - vector number + * type - 0 indicates raw hardware connect + * 1 indicates RTEMS interrupt connect + * + * RETURNS: + * address of previous interrupt handler + * + * Author: Andrew Bray <andy@i-cubed.demon.co.uk> + * + * COPYRIGHT (c) 1995 by i-cubed ltd. + * + * To anyone who acknowledges that this file is provided "AS IS" + * without any express or implied warranty: + * permission to use, copy, modify, and distribute this file + * for any purpose is hereby granted without fee, provided that + * the above copyright notice and this notice appears in all + * copies, and that the name of i-cubed limited not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * i-cubed limited makes no representations about the suitability + * of this software for any purpose. + * + * Derived from c/src/lib/libbsp/no_cpu/no_bsp/startup/setvec.c: + * + * 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. + * + * setvec.c,v 1.2 1995/05/31 16:56:35 joel Exp + */ + +#include <rtems.h> +#include <bsp.h> + +rtems_isr_entry set_vector( /* returns old vector */ + rtems_isr_entry handler, /* isr routine */ + rtems_vector_number vector, /* vector number */ + int type /* RTEMS or RAW intr */ +) +{ + rtems_isr_entry previous_isr; + + rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr ); + + return previous_isr; +} + diff --git a/c/src/lib/libbsp/shmdr/shm.h b/c/src/lib/libbsp/shmdr/shm.h index c223055be6..2122873912 100644 --- a/c/src/lib/libbsp/shmdr/shm.h +++ b/c/src/lib/libbsp/shmdr/shm.h @@ -14,7 +14,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. * - * shm.h,v 1.2 1995/05/09 20:23:03 joel Exp + * $Id$ */ #ifndef __SHM_h diff --git a/c/src/lib/libbsp/shmdr/shm_driver.h b/c/src/lib/libbsp/shmdr/shm_driver.h index c223055be6..2122873912 100644 --- a/c/src/lib/libbsp/shmdr/shm_driver.h +++ b/c/src/lib/libbsp/shmdr/shm_driver.h @@ -14,7 +14,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. * - * shm.h,v 1.2 1995/05/09 20:23:03 joel Exp + * $Id$ */ #ifndef __SHM_h diff --git a/c/src/lib/libc/__brk.c b/c/src/lib/libc/__brk.c index 7c43ffa32b..5f256cb072 100644 --- a/c/src/lib/libc/__brk.c +++ b/c/src/lib/libc/__brk.c @@ -14,7 +14,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. * - * __brk.c,v 1.2 1995/05/09 20:24:28 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/c/src/lib/libc/__gettod.c b/c/src/lib/libc/__gettod.c index 6f8df8a65f..d01a85b4a4 100644 --- a/c/src/lib/libc/__gettod.c +++ b/c/src/lib/libc/__gettod.c @@ -11,7 +11,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. * - * __gettod.c,v 1.2 1995/05/09 20:24:31 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/c/src/lib/libc/newlibc.c b/c/src/lib/libc/newlibc.c index c3e886266d..4493b473da 100644 --- a/c/src/lib/libc/newlibc.c +++ b/c/src/lib/libc/newlibc.c @@ -35,7 +35,7 @@ * * NOTE: * - * newlibc.c,v 1.2 1995/05/09 20:24:37 joel Exp + * $Id$ * */ diff --git a/c/src/lib/libcpu/powerpc/README b/c/src/lib/libcpu/powerpc/README new file mode 100644 index 0000000000..861c3e2df6 --- /dev/null +++ b/c/src/lib/libcpu/powerpc/README @@ -0,0 +1,9 @@ +This hierachy contains support routines for the various +PowerPC processors. + +Since these routines can differ amongst different members +of the PowerPC family, an entry per CPU type is provided. + +Currently only the PPC403 is supported. + +Andrew Bray 18/8/1995 diff --git a/c/src/lib/libcpu/powerpc/ppc403/README b/c/src/lib/libcpu/powerpc/ppc403/README new file mode 100644 index 0000000000..f99e0533f7 --- /dev/null +++ b/c/src/lib/libcpu/powerpc/ppc403/README @@ -0,0 +1,18 @@ +Various non BSP dependant support routines. + +clock - Uses the 403 PIT (Programmable interval timer) to + generate RTEMS clock ticks. + +console - Uses the 403 Internal serial port to do RTEMS + console I/O. Not ALL memebers of the 403 family + have this. + +include - Currently empty + +timer - Uses the 403 timebase register for timing + tests. Other PowerPCs have slightly different + timebase register definitions. + +vectors - PowerPC 403 specific vector entry points. + Includes CPU dependant, application independant + handlres: alignment. diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c new file mode 100644 index 0000000000..fc17de4cc8 --- /dev/null +++ b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c @@ -0,0 +1,215 @@ +/* clock.c + * + * This routine initializes the interval timer on the + * PowerPC 403 CPU. The tick frequency is specified by the bsp. + * + * Author: Andrew Bray <andy@i-cubed.demon.co.uk> + * + * COPYRIGHT (c) 1995 by i-cubed ltd. + * + * To anyone who acknowledges that this file is provided "AS IS" + * without any express or implied warranty: + * permission to use, copy, modify, and distribute this file + * for any purpose is hereby granted without fee, provided that + * the above copyright notice and this notice appears in all + * copies, and that the name of i-cubed limited not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * i-cubed limited makes no representations about the suitability + * of this software for any purpose. + * + * Derived from c/src/lib/libcpu/hppa1_1/clock/clock.c: + * + * 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. + * + * clock.c,v 1.2 1995/05/31 16:59:06 joel Exp + */ + +#include <bsp.h> +#include <clockdrv.h> + +#include <stdlib.h> /* for atexit() */ + +extern rtems_cpu_table Cpu_table; /* owned by BSP */ + +volatile rtems_unsigned32 Clock_driver_ticks; +static rtems_unsigned32 pit_value, tick_time; +static rtems_boolean auto_restart; + +rtems_device_driver Clock_initialize( + rtems_device_major_number major, + rtems_device_minor_number minor, + void *pargp, + rtems_id tid, + rtems_unsigned32 *rval +) +{ + Install_clock(Clock_isr); +} + + +void +ReInstall_clock(rtems_isr_entry new_clock_isr) +{ + rtems_isr_entry previous_isr; + rtems_unsigned32 isrlevel = 0; + + rtems_interrupt_disable(isrlevel); + + rtems_interrupt_catch(new_clock_isr, PPC_IRQ_PIT, + &previous_isr); + + rtems_interrupt_enable(isrlevel); +} + +static INLINE rtems_unsigned32 get_itimer(void) +{ + register rtems_unsigned32 rc; + + asm volatile ("mftblo %0" : "=r" ((rc))); + + return rc; +} + +void Install_clock(rtems_isr_entry clock_isr) +{ + rtems_isr_entry previous_isr; + rtems_unsigned32 pvr, iocr; + + Clock_driver_ticks = 0; + + asm volatile ("mfiocr %0" : "=r" (iocr)); + iocr &= ~4; + iocr |= 4; /* Select external timer clock */ + asm volatile ("mtiocr %0" : "=r" (iocr) : "0" (iocr)); + + asm volatile ("mfpvr %0" : "=r" ((pvr))); + + if (((pvr & 0xffff0000) >> 16) != 0x0020) + return; /* Not a ppc403 */ + + if ((pvr & 0xff00) == 0x0000) /* 403GA */ + auto_restart = (pvr & 0x00f0) > 0x0000 ? 1 : 0; + else if ((pvr & 0xff00) == 0x0100) /* 403GB */ + auto_restart = 1; + + pit_value = BSP_Configuration.microseconds_per_tick * + Cpu_table.clicks_per_usec; + + if (BSP_Configuration.ticks_per_timeslice) + { + register rtems_unsigned32 tcr; + /* + * initialize the interval here + * First tick is set to right amount of time in the future + * Future ticks will be incremented over last value set + * in order to provide consistent clicks in the face of + * interrupt overhead + */ + + rtems_interrupt_catch(clock_isr, PPC_IRQ_PIT, + &previous_isr); + + asm volatile ("mtpit %0" : : "r" (pit_value)); + + asm volatile ("mftcr %0" : "=r" ((tcr))); + + tcr &= ~ 0x04400000; + + tcr |= (auto_restart ? 0x04400000 : 0x04000000); + + tick_time = get_itimer() + pit_value; + + asm volatile ("mttcr %0" : "=r" ((tcr)) : "0" ((tcr))); + } + atexit(Clock_exit); +} + + +rtems_isr +Clock_isr(rtems_vector_number vector) +{ + if (!auto_restart) + { + rtems_unsigned32 clicks_til_next_interrupt; + rtems_unsigned32 itimer_value; + + /* + * setup for next interrupt; making sure the new value is reasonably + * in the future.... in case we lost out on an interrupt somehow + */ + + itimer_value = get_itimer(); + tick_time += pit_value; + + /* + * how far away is next interrupt *really* + * It may be a long time; this subtraction works even if + * Clock_clicks_interrupt < Clock_clicks_low_order via + * the miracle of unsigned math. + */ + clicks_til_next_interrupt = tick_time - itimer_value; + + /* + * If it is too soon then bump it up. + * This should only happen if CPU_HPPA_CLICKS_PER_TICK is too small. + * But setting it low is useful for debug, so... + */ + + if (clicks_til_next_interrupt < 400) + { + tick_time = itimer_value + 1000; + clicks_til_next_interrupt = 1000; + /* XXX: count these! this should be rare */ + } + + /* + * If it is too late, that means we missed the interrupt somehow. + * Rather than wait 35-50s for a wrap, we just fudge it here. + */ + + if (clicks_til_next_interrupt > pit_value) + { + tick_time = itimer_value + 1000; + clicks_til_next_interrupt = 1000; + /* XXX: count these! this should never happen :-) */ + } + + asm volatile ("mtpit %0" :: "r" (clicks_til_next_interrupt)); + } + + asm volatile ( "mttsr %0" :: "r" (0x08000000)); + + Clock_driver_ticks++; + + rtems_clock_tick(); +} + +/* + * Called via atexit() + * Remove the clock interrupt handler by setting handler to NULL + */ + +void +Clock_exit(void) +{ + if ( BSP_Configuration.ticks_per_timeslice ) + { + register rtems_unsigned32 tcr; + + asm volatile ("mftcr %0" : "=r" ((tcr))); + + tcr &= ~ 0x04400000; + + asm volatile ("mttcr %0" : "=r" ((tcr)) : "0" ((tcr))); + + (void) set_vector(0, PPC_IRQ_PIT, 1); + } +} + diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/console.c b/c/src/lib/libcpu/powerpc/ppc403/console/console.c new file mode 100644 index 0000000000..6a451bb7ec --- /dev/null +++ b/c/src/lib/libcpu/powerpc/ppc403/console/console.c @@ -0,0 +1,327 @@ +/* + * This file contains the PowerPC 403GA console IO package. + * + * Author: Andrew Bray <andy@i-cubed.demon.co.uk> + * + * COPYRIGHT (c) 1995 by i-cubed ltd. + * + * To anyone who acknowledges that this file is provided "AS IS" + * without any express or implied warranty: + * permission to use, copy, modify, and distribute this file + * for any purpose is hereby granted without fee, provided that + * the above copyright notice and this notice appears in all + * copies, and that the name of i-cubed limited not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * i-cubed limited makes no representations about the suitability + * of this software for any purpose. + * + * Derived from c/src/lib/libbsp/no_cpu/no_bsp/console/console.c: + * + * 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. + * + * console.c,v 1.2 1995/05/31 16:56:07 joel Exp + */ + +#define NO_BSP_INIT + +#include <rtems.h> +#include "console.h" +#include "bsp.h" + +extern rtems_cpu_table Cpu_table; /* owned by BSP */ + +struct async { +/*-----------------------------------------------------------------------------+ +| Line Status Register. ++-----------------------------------------------------------------------------*/ + unsigned char SPLS; + unsigned char SPLSset; +#define LSRDataReady 0x80 +#define LSRFramingError 0x40 +#define LSROverrunError 0x20 +#define LSRParityError 0x10 +#define LSRBreakInterrupt 0x08 +#define LSRTxHoldEmpty 0x04 +#define LSRTxShiftEmpty 0x02 + +/*-----------------------------------------------------------------------------+ +| Handshake Status Register. ++-----------------------------------------------------------------------------*/ + unsigned char SPHS; + unsigned char SPHSset; +#define HSRDsr 0x80 +#define HSRCts 0x40 + +/*-----------------------------------------------------------------------------+ +| Baud rate divisor registers ++-----------------------------------------------------------------------------*/ + unsigned char BRDH; + unsigned char BRDL; + +/*-----------------------------------------------------------------------------+ +| Control Register. ++-----------------------------------------------------------------------------*/ + unsigned char SPCTL; +#define CRNormal 0x00 +#define CRLoopback 0x40 +#define CRAutoEcho 0x80 +#define CRDtr 0x20 +#define CRRts 0x10 +#define CRWordLength7 0x00 +#define CRWordLength8 0x08 +#define CRParityDisable 0x00 +#define CRParityEnable 0x04 +#define CREvenParity 0x00 +#define CROddParity 0x02 +#define CRStopBitsOne 0x00 +#define CRStopBitsTwo 0x01 +#define CRDisableDtrRts 0x00 + +/*-----------------------------------------------------------------------------+ +| Receiver Command Register. ++-----------------------------------------------------------------------------*/ + unsigned char SPRC; +#define RCRDisable 0x00 +#define RCREnable 0x80 +#define RCRIntDisable 0x00 +#define RCRIntEnabled 0x20 +#define RCRDMACh2 0x40 +#define RCRDMACh3 0x60 +#define RCRErrorInt 0x10 +#define RCRPauseEnable 0x08 + +/*-----------------------------------------------------------------------------+ +| Transmitter Command Register. ++-----------------------------------------------------------------------------*/ + unsigned char SPTC; +#define TCRDisable 0x00 +#define TCREnable 0x80 +#define TCRIntDisable 0x00 +#define TCRIntEnabled 0x20 +#define TCRDMACh2 0x40 +#define TCRDMACh3 0x60 +#define TCRTxEmpty 0x10 +#define TCRErrorInt 0x08 +#define TCRStopPause 0x04 +#define TCRBreakGen 0x02 + +/*-----------------------------------------------------------------------------+ +| Miscellanies defines. ++-----------------------------------------------------------------------------*/ + unsigned char SPTB; +#define SPRB SPTB +}; + +#define XOFFchar 0x13 +#define XONchar 0x11 + +typedef volatile struct async *pasync; +static const pasync port = (pasync)0x40000000; + +/* console_initialize + * + * This routine initializes the console IO driver. + * + * Input parameters: NONE + * + * Output parameters: NONE + * + * Return values: + */ + +rtems_device_driver console_initialize( + rtems_device_major_number major, + rtems_device_minor_number minor, + void *arg, + rtems_id self, + rtems_unsigned32 *status +) +{ + register unsigned tmp; + + /* Initialise the serial port */ + asm volatile ("mfiocr %0" : "=r" (tmp)); + tmp &= ~3; + tmp |= (Cpu_table.serial_external_clock ? 2 : 0) | + (Cpu_table.serial_cts_rts ? 1 : 0); + asm volatile ("mtiocr %0" : "=r" (tmp) : "0" (tmp)); + port->SPLS = (LSRDataReady | LSRFramingError | LSROverrunError | + LSRParityError | LSRBreakInterrupt); + tmp = Cpu_table.serial_per_sec / Cpu_table.serial_rate; + tmp = ((tmp + 8) >> 4) - 1; + port->BRDL = tmp & 0x255; + port->BRDH = tmp >> 8; + port->SPCTL = (CRNormal | CRDtr | CRRts | CRWordLength8 | CRParityDisable | + CRStopBitsOne); + port->SPRC = (RCREnable | RCRIntDisable | RCRPauseEnable); + port->SPTC = (TCREnable | TCRIntDisable); + port->SPHS = (HSRDsr | HSRCts); + + *status = RTEMS_SUCCESSFUL; +} + + +/* is_character_ready + * + * This routine returns TRUE if a character is available. + * + * Input parameters: NONE + * + * Output parameters: NONE + * + * Return values: + */ + +rtems_boolean is_character_ready( + char *ch +) +{ + unsigned char status; + + if ((status = port->SPLS) & LSRDataReady) + { + *ch = port->SPRB; + return(TRUE); + } + + /* Clean any dodgy status */ + if ((status & (LSRFramingError | LSROverrunError | LSRParityError | + LSRBreakInterrupt)) != 0) + { + port->SPLS = (LSRFramingError | LSROverrunError | LSRParityError | + LSRBreakInterrupt); + } + + return FALSE; +} + +/* inbyte + * + * This routine reads a character from the SOURCE. + * + * Input parameters: NONE + * + * Output parameters: NONE + * + * Return values: + * character read from SOURCE + */ + +char inbyte( void ) +{ + unsigned char status; + + while (1) + { + if ((status = port->SPLS) & LSRDataReady) + break; + + /* Clean any dodgy status */ + if ((status & (LSRFramingError | LSROverrunError | LSRParityError | + LSRBreakInterrupt)) != 0) + { + port->SPLS = (LSRFramingError | LSROverrunError | LSRParityError | + LSRBreakInterrupt); + } + } + + return port->SPRB; +} + +/* outbyte + * + * This routine transmits a character out the SOURCE. It may support + * XON/XOFF flow control. + * + * Input parameters: + * ch - character to be transmitted + * + * Output parameters: NONE + */ + +void outbyte( + char ch +) +{ + unsigned char status; + + while (port->SPHS) + port->SPHS = (HSRDsr | HSRCts); + + while (1) + { + status = port->SPLS; + + if (port->SPHS) + port->SPHS = (HSRDsr | HSRCts); + else if (status & LSRTxHoldEmpty) + break; + } + + if (Cpu_table.serial_xon_xoff) + while (is_character_ready(&status)) + { + if (status == XOFFchar) + do + { + while (!is_character_ready(&status)); + } + while (status != XONchar); + } + + port->SPTB = ch; +} + +/* + * __read -- read bytes from the serial port. Ignore fd, since + * we only have stdin. + */ + +int __read( + int fd, + char *buf, + int nbytes +) +{ + int i = 0; + + for (i = 0; i < nbytes; i++) { + *(buf + i) = inbyte(); + if ((*(buf + i) == '\n') || (*(buf + i) == '\r')) { + (*(buf + i++)) = '\n'; + (*(buf + i)) = 0; + break; + } + } + return (i); +} + +/* + * __write -- write bytes to the serial port. Ignore fd, since + * stdout and stderr are the same. Since we have no filesystem, + * open will only return an error. + */ + +int __write( + int fd, + char *buf, + int nbytes +) +{ + int i; + + for (i = 0; i < nbytes; i++) { + if (*(buf + i) == '\n') { + outbyte ('\r'); + } + outbyte (*(buf + i)); + } + return (nbytes); +} diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c b/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c new file mode 100644 index 0000000000..f351a9109d --- /dev/null +++ b/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c @@ -0,0 +1,98 @@ +/* timer.c + * + * This file manages the interval timer on the PowerPC 403*. + * We shall use the bottom 32 bits of the timebase register, + * + * NOTE: It is important that the timer start/stop overhead be + * determined when porting or modifying this code. + * + * Author: Andrew Bray <andy@i-cubed.demon.co.uk> + * + * COPYRIGHT (c) 1995 by i-cubed ltd. + * + * To anyone who acknowledges that this file is provided "AS IS" + * without any express or implied warranty: + * permission to use, copy, modify, and distribute this file + * for any purpose is hereby granted without fee, provided that + * the above copyright notice and this notice appears in all + * copies, and that the name of i-cubed limited not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * i-cubed limited makes no representations about the suitability + * of this software for any purpose. + * + * Derived from c/src/lib/libcpu/hppa1_1/timer/timer.c: + * + * 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. + * + * timer.c,v 1.2 1995/05/31 16:59:23 joel Exp + */ + +#include <bsp.h> +#include <rtems.h> + +extern rtems_cpu_table Cpu_table; /* owned by BSP */ + +static volatile rtems_unsigned32 Timer_starting; +static rtems_boolean Timer_driver_Find_average_overhead; + +/* + * This is so small that this code will be reproduced where needed. + */ +static INLINE rtems_unsigned32 get_itimer(void) +{ + rtems_unsigned32 ret; + + asm volatile ("mftblo %0" : "=r" ((ret))); + + return ret; +} + +void Timer_initialize() +{ + rtems_unsigned32 iocr; + + asm volatile ("mfiocr %0" : "=r" (iocr)); + iocr &= ~4; + iocr |= 4; /* Select external timer clock */ + asm volatile ("mtiocr %0" : "=r" (iocr) : "0" (iocr)); + + Timer_starting = get_itimer(); +} + +int Read_timer() +{ + rtems_unsigned32 clicks; + rtems_unsigned32 total; + + clicks = get_itimer(); + + total = clicks - Timer_starting; + + if ( Timer_driver_Find_average_overhead == 1 ) + return total; /* in XXX microsecond units */ + + else { + if ( total < Cpu_table.timer_least_valid ) + return 0; /* below timer resolution */ + return (total - Cpu_table.timer_average_overhead); + } +} + +rtems_status_code Empty_function( void ) +{ + return RTEMS_SUCCESSFUL; +} + +void Set_find_average_overhead( + rtems_boolean find_flag +) +{ + Timer_driver_Find_average_overhead = find_flag; +} diff --git a/c/src/lib/libcpu/powerpc/ppc403/vectors/README b/c/src/lib/libcpu/powerpc/ppc403/vectors/README new file mode 100644 index 0000000000..02ab163dfd --- /dev/null +++ b/c/src/lib/libcpu/powerpc/ppc403/vectors/README @@ -0,0 +1,21 @@ +The location of the vectors file object is critical. + +From the comments at the head of vectors.s: + + The issue with this file is getting it loaded at the right place. + The first vector MUST be at address 0x????0100. + How this is achieved is dependant on the tool chain. + + However the basic mechanism for ELF assemblers is to create a + section called ".vectors", which will be loaded to an address + between 0x????0000 and 0x????0100 (inclusive) via a link script. + + The basic mechanism for XCOFF assemblers is to place it in the + normal text section, and arrange for this file to be located + at an appropriate position on the linker command line. + + The variable 'PPC_VECTOR_FILE_BASE' must be defined to be the + offset from 0x????0000 to the first location in the file. This + will usually be 0x0000 or 0x0100. + +Andrew Bray 18/8/1995 diff --git a/c/src/lib/libcpu/powerpc/ppc403/vectors/vectors.s b/c/src/lib/libcpu/powerpc/ppc403/vectors/vectors.s new file mode 100644 index 0000000000..ea08a5156d --- /dev/null +++ b/c/src/lib/libcpu/powerpc/ppc403/vectors/vectors.s @@ -0,0 +1,332 @@ +/* vectors.s 1.0 - 95/08/08 + * + * This file contains the assembly code for the PowerPC 403 + * interrupt veneers for RTEMS. + * + * Author: Andrew Bray <andy@i-cubed.demon.co.uk> + * + * COPYRIGHT (c) 1995 by i-cubed ltd. + * + * To anyone who acknowledges that this file is provided "AS IS" + * without any express or implied warranty: + * permission to use, copy, modify, and distribute this file + * for any purpose is hereby granted without fee, provided that + * the above copyright notice and this notice appears in all + * copies, and that the name of i-cubed limited not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * i-cubed limited makes no representations about the suitability + * of this software for any purpose. + * + */ + +/* + * The issue with this file is getting it loaded at the right place. + * The first vector MUST be at address 0x????0100. + * How this is achieved is dependant on the tool chain. + * + * However the basic mechanism for ELF assemblers is to create a + * section called ".vectors", which will be loaded to an address + * between 0x????0000 and 0x????0100 (inclusive) via a link script. + * + * The basic mechanism for XCOFF assemblers is to place it in the + * normal text section, and arrange for this file to be located + * at an appropriate position on the linker command line. + * + * The variable 'PPC_VECTOR_FILE_BASE' must be defined to be the + * offset from 0x????0000 to the first location in the file. This + * will usually be 0x0000 or 0x0100. + */ + +#include "asm.h" + +#ifndef PPC_VECTOR_FILE_BASE +#error "PPC_VECTOR_FILE_BASE is not defined." +#endif + + /* Where this file will be loaded */ + .set file_base, PPC_VECTOR_FILE_BASE + + /* Offset to store reg 0 */ + + .set IP_LINK, 0 +#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) + .set IP_0, (IP_LINK + 56) +#else + .set IP_0, (IP_LINK + 8) +#endif + .set IP_2, (IP_0 + 4) + + .set IP_3, (IP_2 + 4) + .set IP_4, (IP_3 + 4) + .set IP_5, (IP_4 + 4) + .set IP_6, (IP_5 + 4) + + .set IP_7, (IP_6 + 4) + .set IP_8, (IP_7 + 4) + .set IP_9, (IP_8 + 4) + .set IP_10, (IP_9 + 4) + + .set IP_11, (IP_10 + 4) + .set IP_12, (IP_11 + 4) + .set IP_13, (IP_12 + 4) + .set IP_28, (IP_13 + 4) + + .set IP_29, (IP_28 + 4) + .set IP_30, (IP_29 + 4) + .set IP_31, (IP_30 + 4) + .set IP_CR, (IP_31 + 4) + + .set IP_CTR, (IP_CR + 4) + .set IP_XER, (IP_CTR + 4) + .set IP_LR, (IP_XER + 4) + .set IP_PC, (IP_LR + 4) + + .set IP_MSR, (IP_PC + 4) + + .set IP_END, (IP_MSR + 16) + + /* Vector offsets */ + .set begin_vector,0x0000 + .set crit_vector,0x0100 + .set mach_vector,0x0200 + .set prot_vector,0x0300 + .set ext_vector,0x0500 + .set align_vector,0x0600 + .set prog_vector,0x0700 + .set sys_vector,0x0C00 + .set pit_vector,0x1000 + .set fit_vector,0x1010 + .set wadt_vector,0x1020 + .set debug_vector,0x2000 + +/* Go to the right section */ +#if PPC_ASM == PPC_ASM_ELF + .section .vectors,"awx",@progbits +#elif PPC_ASM == PPC_ASM_XCOFF + .csect .text[PR] +#endif + + PUBLIC_VAR (__vectors) +SYM (__vectors): + +/* Critical error handling */ + .org crit_vector - file_base + mtsprg1 r0 + mfsprg2 r0 + mtmsr r0 +#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_HAS_FPU) + stwu r1, -(20*4 + 18*8 + IP_END)(r1) +#else + stwu r1, -(20*4 + IP_END)(r1) +#endif +#else + stwu r1, -(IP_END)(r1) +#endif + mfsprg1 r0 + stw r0, IP_0(r1) + + li r0, PPC_IRQ_CRIT + b PROC (_ISR_HandlerC) + +/* Machine check exception */ + .org mach_vector - file_base + mtsprg1 r0 + mfsprg2 r0 + mtmsr r0 +#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_HAS_FPU) + stwu r1, -(20*4 + 18*8 + IP_END)(r1) +#else + stwu r1, -(20*4 + IP_END)(r1) +#endif +#else + stwu r1, -(IP_END)(r1) +#endif + mfsprg1 r0 + stw r0, IP_0(r1) + + li r0, PPC_IRQ_MCHECK + b PROC (_ISR_HandlerC) + +/* Protection exception */ + .org prot_vector - file_base + mtsprg0 r0 + mfsprg2 r0 + mtmsr r0 +#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_HAS_FPU) + stwu r1, -(20*4 + 18*8 + IP_END)(r1) +#else + stwu r1, -(20*4 + IP_END)(r1) +#endif +#else + stwu r1, -(IP_END)(r1) +#endif + mfsprg0 r0 + stw r0, IP_0(r1) + + li r0, PPC_IRQ_PROTECT + b PROC (_ISR_Handler) + +/* External interrupt */ + .org ext_vector - file_base + mtsprg0 r0 + mfsprg2 r0 + mtmsr r0 +#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_HAS_FPU) + stwu r1, -(20*4 + 18*8 + IP_END)(r1) +#else + stwu r1, -(20*4 + IP_END)(r1) +#endif +#else + stwu r1, -(IP_END)(r1) +#endif + mfsprg0 r0 + stw r0, IP_0(r1) + + li r0, PPC_IRQ_EXTERNAL + b PROC (_ISR_Handler) + +/* Align exception */ + .org align_vector - file_base + .extern align_h + b align_h + +/* Program exception */ + .org prog_vector - file_base + mtsprg0 r0 + mfsprg2 r0 + mtmsr r0 +#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_HAS_FPU) + stwu r1, -(20*4 + 18*8 + IP_END)(r1) +#else + stwu r1, -(20*4 + IP_END)(r1) +#endif +#else + stwu r1, -(IP_END)(r1) +#endif + mfsprg0 r0 + stw r0, IP_0(r1) + + li r0, PPC_IRQ_PROGRAM + b PROC (_ISR_Handler) + +/* System call */ + .org sys_vector - file_base + mtsprg0 r0 + mfsprg2 r0 + mtmsr r0 +#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_HAS_FPU) + stwu r1, -(20*4 + 18*8 + IP_END)(r1) +#else + stwu r1, -(20*4 + IP_END)(r1) +#endif +#else + stwu r1, -(IP_END)(r1) +#endif + mfsprg0 r0 + stw r0, IP_0(r1) + + li r0, PPC_IRQ_SCALL + b PROC (_ISR_Handler) + +/* PIT interrupt */ + .org pit_vector - file_base + b pit + +/* FIT interrupt */ + .org fit_vector - file_base + b fit + +/* Watchdog interrupt */ + .org wadt_vector - file_base + b watch + +/* PIT interrupt */ +pit: + mtsprg0 r0 + mfsprg2 r0 + mtmsr r0 +#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_HAS_FPU) + stwu r1, -(20*4 + 18*8 + IP_END)(r1) +#else + stwu r1, -(20*4 + IP_END)(r1) +#endif +#else + stwu r1, -(IP_END)(r1) +#endif + mfsprg0 r0 + stw r0, IP_0(r1) + + li r0, PPC_IRQ_PIT + b PROC (_ISR_Handler) + +/* FIT interrupt */ +fit: + mtsprg0 r0 + mfsprg2 r0 + mtmsr r0 +#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_HAS_FPU) + stwu r1, -(20*4 + 18*8 + IP_END)(r1) +#else + stwu r1, -(20*4 + IP_END)(r1) +#endif +#else + stwu r1, -(IP_END)(r1) +#endif + mfsprg0 r0 + stw r0, IP_0(r1) + + li r0, PPC_IRQ_FIT + b PROC (_ISR_Handler) + +/* Watchdog interrupt */ +watch: + mtsprg1 r0 + mfsprg2 r0 + mtmsr r0 +#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_HAS_FPU) + stwu r1, -(20*4 + 18*8 + IP_END)(r1) +#else + stwu r1, -(20*4 + IP_END)(r1) +#endif +#else + stwu r1, -(IP_END)(r1) +#endif + mfsprg1 r0 + stw r0, IP_0(r1) + + li r0, PPC_IRQ_WATCHDOG + b PROC (_ISR_HandlerC) + +/* Debug exception */ +debug: + mtsprg1 r0 + mfsprg2 r0 + mtmsr r0 +#if (PPC_ABI == PPC_ABI_POWEROPEN || PPC_ABI == PPC_ABI_GCC27) +#if (PPC_HAS_FPU) + stwu r1, -(20*4 + 18*8 + IP_END)(r1) +#else + stwu r1, -(20*4 + IP_END)(r1) +#endif +#else + stwu r1, -(IP_END)(r1) +#endif + mfsprg1 r0 + stw r0, IP_0(r1) + + li r0, PPC_IRQ_DEBUG + b PROC (_ISR_HandlerC) + +/* Debug exception */ + .org debug_vector - file_base + b debug diff --git a/c/src/lib/libmisc/stackchk/check.c b/c/src/lib/libmisc/stackchk/check.c index d843c07b2d..f5e64efd33 100644 --- a/c/src/lib/libmisc/stackchk/check.c +++ b/c/src/lib/libmisc/stackchk/check.c @@ -250,7 +250,7 @@ void Stack_check_report_blown_task(void) "BLOWN STACK!!! Offending task(%p): id=0x%08x; name=0x%08x", running, running->Object.id, - *running->Object.name + *(unsigned32 *)running->Object.name ); fflush(stderr); @@ -387,7 +387,7 @@ void Stack_check_Dump_threads_usage( printf( "0x%08x 0x%08x 0x%08x 0x%08x %8d %8d\n", the_thread ? the_thread->Object.id : ~0, - the_thread ? *the_thread->Object.name : + the_thread ? *(unsigned32 *)the_thread->Object.name : rtems_build_name('I', 'N', 'T', 'R'), (unsigned32) stack->area, (unsigned32) stack->area + (unsigned32) stack->size - 1, diff --git a/c/src/libchip/shmdr/shm_driver.h b/c/src/libchip/shmdr/shm_driver.h index c223055be6..2122873912 100644 --- a/c/src/libchip/shmdr/shm_driver.h +++ b/c/src/libchip/shmdr/shm_driver.h @@ -14,7 +14,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. * - * shm.h,v 1.2 1995/05/09 20:23:03 joel Exp + * $Id$ */ #ifndef __SHM_h diff --git a/c/src/libmisc/stackchk/check.c b/c/src/libmisc/stackchk/check.c index d843c07b2d..f5e64efd33 100644 --- a/c/src/libmisc/stackchk/check.c +++ b/c/src/libmisc/stackchk/check.c @@ -250,7 +250,7 @@ void Stack_check_report_blown_task(void) "BLOWN STACK!!! Offending task(%p): id=0x%08x; name=0x%08x", running, running->Object.id, - *running->Object.name + *(unsigned32 *)running->Object.name ); fflush(stderr); @@ -387,7 +387,7 @@ void Stack_check_Dump_threads_usage( printf( "0x%08x 0x%08x 0x%08x 0x%08x %8d %8d\n", the_thread ? the_thread->Object.id : ~0, - the_thread ? *the_thread->Object.name : + the_thread ? *(unsigned32 *)the_thread->Object.name : rtems_build_name('I', 'N', 'T', 'R'), (unsigned32) stack->area, (unsigned32) stack->area + (unsigned32) stack->size - 1, diff --git a/c/src/optman/rtems/no-dpmem.c b/c/src/optman/rtems/no-dpmem.c index 4d4cc4cdbc..40f343eef4 100644 --- a/c/src/optman/rtems/no-dpmem.c +++ b/c/src/optman/rtems/no-dpmem.c @@ -25,7 +25,7 @@ void _Dual_ported_memory_Manager_initialization( } rtems_status_code rtems_port_create( - Objects_Name name, + rtems_name name, void *internal_start, void *external_start, unsigned32 length, @@ -36,7 +36,7 @@ rtems_status_code rtems_port_create( } rtems_status_code rtems_port_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { diff --git a/c/src/optman/rtems/no-msg.c b/c/src/optman/rtems/no-msg.c index bee0295df5..6e8503ee32 100644 --- a/c/src/optman/rtems/no-msg.c +++ b/c/src/optman/rtems/no-msg.c @@ -32,7 +32,7 @@ void _Message_queue_Manager_initialization( } rtems_status_code rtems_message_queue_create( - Objects_Name name, + rtems_name name, unsigned32 count, unsigned32 max_message_size, rtems_attribute attribute_set, @@ -43,7 +43,7 @@ rtems_status_code rtems_message_queue_create( } rtems_status_code rtems_message_queue_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) diff --git a/c/src/optman/rtems/no-part.c b/c/src/optman/rtems/no-part.c index d51b62cfb8..0b0e51329f 100644 --- a/c/src/optman/rtems/no-part.c +++ b/c/src/optman/rtems/no-part.c @@ -27,7 +27,7 @@ void _Partition_Manager_initialization( } rtems_status_code rtems_partition_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 buffer_size, @@ -39,7 +39,7 @@ rtems_status_code rtems_partition_create( } rtems_status_code rtems_partition_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) diff --git a/c/src/optman/rtems/no-region.c b/c/src/optman/rtems/no-region.c index 4ebdda6aa1..490d1371c0 100644 --- a/c/src/optman/rtems/no-region.c +++ b/c/src/optman/rtems/no-region.c @@ -28,7 +28,7 @@ void _Region_Manager_initialization( } rtems_status_code rtems_region_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 page_size, @@ -40,7 +40,7 @@ rtems_status_code rtems_region_create( } rtems_status_code rtems_region_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { diff --git a/c/src/optman/rtems/no-rtmon.c b/c/src/optman/rtems/no-rtmon.c index 1799cc7533..8371f19a7f 100644 --- a/c/src/optman/rtems/no-rtmon.c +++ b/c/src/optman/rtems/no-rtmon.c @@ -26,7 +26,7 @@ void _Rate_monotonic_Manager_initialization( } rtems_status_code rtems_rate_monotonic_create( - Objects_Name name, + rtems_name name, Objects_Id *id ) { @@ -34,7 +34,7 @@ rtems_status_code rtems_rate_monotonic_create( } rtems_status_code rtems_rate_monotonic_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { diff --git a/c/src/optman/rtems/no-sem.c b/c/src/optman/rtems/no-sem.c index e7d27a6311..52f64c0aa5 100644 --- a/c/src/optman/rtems/no-sem.c +++ b/c/src/optman/rtems/no-sem.c @@ -31,7 +31,7 @@ void _Semaphore_Manager_initialization( } rtems_status_code rtems_semaphore_create( - Objects_Name name, + rtems_name name, unsigned32 count, rtems_attribute attribute_set, Objects_Id *id @@ -41,7 +41,7 @@ rtems_status_code rtems_semaphore_create( } rtems_status_code rtems_semaphore_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) diff --git a/c/src/optman/rtems/no-timer.c b/c/src/optman/rtems/no-timer.c index 9fc29e9b6d..1f6deb2e4f 100644 --- a/c/src/optman/rtems/no-timer.c +++ b/c/src/optman/rtems/no-timer.c @@ -27,7 +27,7 @@ void _Timer_Manager_initialization( } rtems_status_code rtems_timer_create( - Objects_Name name, + rtems_name name, Objects_Id *id ) { @@ -35,7 +35,7 @@ rtems_status_code rtems_timer_create( } rtems_status_code rtems_timer_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { diff --git a/c/src/optman/sapi/no-ext.c b/c/src/optman/sapi/no-ext.c index 4d707c3a49..db1df3624f 100644 --- a/c/src/optman/sapi/no-ext.c +++ b/c/src/optman/sapi/no-ext.c @@ -25,7 +25,7 @@ void _Extension_Manager_initialization( } rtems_status_code rtems_extension_create( - Objects_Name name, + rtems_name name, rtems_extensions_table *extension_table, Objects_Id *id ) @@ -34,7 +34,7 @@ rtems_status_code rtems_extension_create( } rtems_status_code rtems_extension_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { diff --git a/c/src/tests/mptests/mp01/system.h b/c/src/tests/mptests/mp01/system.h index 1a29db3f02..1110c1574f 100644 --- a/c/src/tests/mptests/mp01/system.h +++ b/c/src/tests/mptests/mp01/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:00:40 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp01/task1.c b/c/src/tests/mptests/mp01/task1.c index 465ae7063e..7f90bb3165 100644 --- a/c/src/tests/mptests/mp01/task1.c +++ b/c/src/tests/mptests/mp01/task1.c @@ -21,7 +21,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. * - * task1.c,v 1.2 1995/05/09 20:26:24 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp02/system.h b/c/src/tests/mptests/mp02/system.h index 74117b8f9b..0bf193dad9 100644 --- a/c/src/tests/mptests/mp02/system.h +++ b/c/src/tests/mptests/mp02/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:01:00 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp03/system.h b/c/src/tests/mptests/mp03/system.h index 2fa8e248e6..0bf193dad9 100644 --- a/c/src/tests/mptests/mp03/system.h +++ b/c/src/tests/mptests/mp03/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:01:22 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp04/system.h b/c/src/tests/mptests/mp04/system.h index 870bcbe907..0bf193dad9 100644 --- a/c/src/tests/mptests/mp04/system.h +++ b/c/src/tests/mptests/mp04/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:01:40 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp05/system.h b/c/src/tests/mptests/mp05/system.h index ff93a698c1..0bf193dad9 100644 --- a/c/src/tests/mptests/mp05/system.h +++ b/c/src/tests/mptests/mp05/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:02:00 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp06/system.h b/c/src/tests/mptests/mp06/system.h index 8c78ceda10..416af01a5d 100644 --- a/c/src/tests/mptests/mp06/system.h +++ b/c/src/tests/mptests/mp06/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:02:18 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp07/system.h b/c/src/tests/mptests/mp07/system.h index a04174d538..96286ca802 100644 --- a/c/src/tests/mptests/mp07/system.h +++ b/c/src/tests/mptests/mp07/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:02:38 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp08/system.h b/c/src/tests/mptests/mp08/system.h index df425fa221..0bf193dad9 100644 --- a/c/src/tests/mptests/mp08/system.h +++ b/c/src/tests/mptests/mp08/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:02:55 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp09/init.c b/c/src/tests/mptests/mp09/init.c index b63a4e0e88..cbd612a267 100644 --- a/c/src/tests/mptests/mp09/init.c +++ b/c/src/tests/mptests/mp09/init.c @@ -19,7 +19,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. * - * init.c,v 1.2 1995/05/31 17:03:11 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp09/recvmsg.c b/c/src/tests/mptests/mp09/recvmsg.c index 7eff6f8af0..fcdb75e966 100644 --- a/c/src/tests/mptests/mp09/recvmsg.c +++ b/c/src/tests/mptests/mp09/recvmsg.c @@ -15,7 +15,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. * - * recvmsg.c,v 1.2 1995/05/31 17:03:14 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp09/sendmsg.c b/c/src/tests/mptests/mp09/sendmsg.c index 94e004dfdb..ee555af67c 100644 --- a/c/src/tests/mptests/mp09/sendmsg.c +++ b/c/src/tests/mptests/mp09/sendmsg.c @@ -15,7 +15,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. * - * sendmsg.c,v 1.2 1995/05/31 17:03:16 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp09/system.h b/c/src/tests/mptests/mp09/system.h index 8b834cda70..0bf193dad9 100644 --- a/c/src/tests/mptests/mp09/system.h +++ b/c/src/tests/mptests/mp09/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:03:17 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp09/task1.c b/c/src/tests/mptests/mp09/task1.c index cd6cb90041..c4818af23a 100644 --- a/c/src/tests/mptests/mp09/task1.c +++ b/c/src/tests/mptests/mp09/task1.c @@ -16,7 +16,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. * - * task1.c,v 1.2 1995/05/31 17:03:19 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp10/init.c b/c/src/tests/mptests/mp10/init.c index 645250dddb..c5fe62e099 100644 --- a/c/src/tests/mptests/mp10/init.c +++ b/c/src/tests/mptests/mp10/init.c @@ -25,7 +25,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. * - * init.c,v 1.2 1995/05/31 17:03:33 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp10/system.h b/c/src/tests/mptests/mp10/system.h index 43804fb080..0bf193dad9 100644 --- a/c/src/tests/mptests/mp10/system.h +++ b/c/src/tests/mptests/mp10/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:03:35 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp10/task1.c b/c/src/tests/mptests/mp10/task1.c index 984c2ddfd4..1c72c34b58 100644 --- a/c/src/tests/mptests/mp10/task1.c +++ b/c/src/tests/mptests/mp10/task1.c @@ -16,7 +16,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. * - * task1.c,v 1.2 1995/05/31 17:03:37 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp11/init.c b/c/src/tests/mptests/mp11/init.c index 1f9f0f68d7..c2837a7fc2 100644 --- a/c/src/tests/mptests/mp11/init.c +++ b/c/src/tests/mptests/mp11/init.c @@ -22,7 +22,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. * - * init.c,v 1.2 1995/05/31 17:03:55 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp11/system.h b/c/src/tests/mptests/mp11/system.h index 6ec1b4186c..0bf193dad9 100644 --- a/c/src/tests/mptests/mp11/system.h +++ b/c/src/tests/mptests/mp11/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:03:57 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp12/system.h b/c/src/tests/mptests/mp12/system.h index dbb66d2516..0bf193dad9 100644 --- a/c/src/tests/mptests/mp12/system.h +++ b/c/src/tests/mptests/mp12/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:04:13 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp13/init.c b/c/src/tests/mptests/mp13/init.c index c6411f8106..eb2de9733c 100644 --- a/c/src/tests/mptests/mp13/init.c +++ b/c/src/tests/mptests/mp13/init.c @@ -19,7 +19,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. * - * init.c,v 1.2 1995/05/31 17:04:29 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp13/system.h b/c/src/tests/mptests/mp13/system.h index d7ed76d4e0..0bf193dad9 100644 --- a/c/src/tests/mptests/mp13/system.h +++ b/c/src/tests/mptests/mp13/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:04:31 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/mptests/mp13/task1.c b/c/src/tests/mptests/mp13/task1.c index 95da90f431..6b599f971a 100644 --- a/c/src/tests/mptests/mp13/task1.c +++ b/c/src/tests/mptests/mp13/task1.c @@ -17,7 +17,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. * - * task1.c,v 1.2 1995/05/31 17:04:33 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp14/init.c b/c/src/tests/mptests/mp14/init.c index d7bc7c9706..99891d50ba 100644 --- a/c/src/tests/mptests/mp14/init.c +++ b/c/src/tests/mptests/mp14/init.c @@ -19,7 +19,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. * - * init.c,v 1.2 1995/05/31 17:04:55 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp14/msgtask1.c b/c/src/tests/mptests/mp14/msgtask1.c index a4f9fd4bf7..78430a80ef 100644 --- a/c/src/tests/mptests/mp14/msgtask1.c +++ b/c/src/tests/mptests/mp14/msgtask1.c @@ -18,7 +18,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. * - * msgtask1.c,v 1.2 1995/05/31 17:04:58 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/mptests/mp14/system.h b/c/src/tests/mptests/mp14/system.h index eaf933a819..d825e0ef69 100644 --- a/c/src/tests/mptests/mp14/system.h +++ b/c/src/tests/mptests/mp14/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:05:03 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/samples/base_mp/apptask.c b/c/src/tests/samples/base_mp/apptask.c index cee3b88bf5..4f0bc72c74 100644 --- a/c/src/tests/samples/base_mp/apptask.c +++ b/c/src/tests/samples/base_mp/apptask.c @@ -17,7 +17,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. * - * apptask.c,v 1.2 1995/05/31 17:05:14 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/samples/base_mp/system.h b/c/src/tests/samples/base_mp/system.h index 25738a5d4c..38b20afb5c 100644 --- a/c/src/tests/samples/base_mp/system.h +++ b/c/src/tests/samples/base_mp/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:05:21 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/c/src/tests/samples/base_sp/apptask.c b/c/src/tests/samples/base_sp/apptask.c index 0f05a177fc..03c406f9ff 100644 --- a/c/src/tests/samples/base_sp/apptask.c +++ b/c/src/tests/samples/base_sp/apptask.c @@ -16,7 +16,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. * - * apptask.c,v 1.2 1995/05/31 17:05:28 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/samples/cdtest/init.c b/c/src/tests/samples/cdtest/init.c index eaafd431b8..00bdd647ba 100644 --- a/c/src/tests/samples/cdtest/init.c +++ b/c/src/tests/samples/cdtest/init.c @@ -18,7 +18,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. * - * init.c,v 1.2 1995/05/31 17:05:45 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/samples/cdtest/system.h b/c/src/tests/samples/cdtest/system.h index 95a58472d1..11e00f018a 100644 --- a/c/src/tests/samples/cdtest/system.h +++ b/c/src/tests/samples/cdtest/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:05:49 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/c/src/tests/samples/hello/init.c b/c/src/tests/samples/hello/init.c index 60ba06dd20..9c56c4edda 100644 --- a/c/src/tests/samples/hello/init.c +++ b/c/src/tests/samples/hello/init.c @@ -18,7 +18,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. * - * init.c,v 1.2 1995/05/31 17:05:58 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/samples/hello/system.h b/c/src/tests/samples/hello/system.h index c4a8598d0c..49deb52d4a 100644 --- a/c/src/tests/samples/hello/system.h +++ b/c/src/tests/samples/hello/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:06:00 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/c/src/tests/samples/paranoia/init.c b/c/src/tests/samples/paranoia/init.c index e847892cb9..947fdfd28f 100644 --- a/c/src/tests/samples/paranoia/init.c +++ b/c/src/tests/samples/paranoia/init.c @@ -18,7 +18,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. * - * init.c,v 1.2 1995/05/31 17:06:07 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/samples/paranoia/paranoia.c b/c/src/tests/samples/paranoia/paranoia.c index 8e435f3100..3b860c3b4a 100644 --- a/c/src/tests/samples/paranoia/paranoia.c +++ b/c/src/tests/samples/paranoia/paranoia.c @@ -1,5 +1,5 @@ /* - * RTEMS RCS Id: paranoia.c,v 1.2 1995/05/31 17:06:09 joel Exp + * $Id$ * * A C version of Kahan's Floating Point Test "Paranoia" * diff --git a/c/src/tests/samples/paranoia/system.h b/c/src/tests/samples/paranoia/system.h index 91d3451a6f..11e00f018a 100644 --- a/c/src/tests/samples/paranoia/system.h +++ b/c/src/tests/samples/paranoia/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:06:13 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/c/src/tests/samples/ticker/system.h b/c/src/tests/samples/ticker/system.h index 582c05f377..0bf193dad9 100644 --- a/c/src/tests/samples/ticker/system.h +++ b/c/src/tests/samples/ticker/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:06:23 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp01/system.h b/c/src/tests/sptests/sp01/system.h index de19ed92d5..0bf193dad9 100644 --- a/c/src/tests/sptests/sp01/system.h +++ b/c/src/tests/sptests/sp01/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:06:37 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp02/system.h b/c/src/tests/sptests/sp02/system.h index 1cb0c72f71..9bb3a13c81 100644 --- a/c/src/tests/sptests/sp02/system.h +++ b/c/src/tests/sptests/sp02/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:06:54 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp03/system.h b/c/src/tests/sptests/sp03/system.h index 1325ac0671..0bf193dad9 100644 --- a/c/src/tests/sptests/sp03/system.h +++ b/c/src/tests/sptests/sp03/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:07:10 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp04/system.h b/c/src/tests/sptests/sp04/system.h index 3f300b8e74..0bf193dad9 100644 --- a/c/src/tests/sptests/sp04/system.h +++ b/c/src/tests/sptests/sp04/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:07:24 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp04/task1.c b/c/src/tests/sptests/sp04/task1.c index a200dc6f4e..117f5eaa80 100644 --- a/c/src/tests/sptests/sp04/task1.c +++ b/c/src/tests/sptests/sp04/task1.c @@ -16,7 +16,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. * - * task1.c,v 1.2 1995/05/31 17:07:26 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp04/tswitch.c b/c/src/tests/sptests/sp04/tswitch.c index 250ec5c9a7..766d09e93b 100644 --- a/c/src/tests/sptests/sp04/tswitch.c +++ b/c/src/tests/sptests/sp04/tswitch.c @@ -18,7 +18,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. * - * tswitch.c,v 1.2 1995/05/09 20:32:43 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp05/system.h b/c/src/tests/sptests/sp05/system.h index 93593fb521..0bf193dad9 100644 --- a/c/src/tests/sptests/sp05/system.h +++ b/c/src/tests/sptests/sp05/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:07:40 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp06/system.h b/c/src/tests/sptests/sp06/system.h index f3342fb23c..0bf193dad9 100644 --- a/c/src/tests/sptests/sp06/system.h +++ b/c/src/tests/sptests/sp06/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:07:56 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp07/system.h b/c/src/tests/sptests/sp07/system.h index 0f2ec35aa4..c9246a0c07 100644 --- a/c/src/tests/sptests/sp07/system.h +++ b/c/src/tests/sptests/sp07/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:08:12 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp08/system.h b/c/src/tests/sptests/sp08/system.h index 17b39f6214..bbc6669a61 100644 --- a/c/src/tests/sptests/sp08/system.h +++ b/c/src/tests/sptests/sp08/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:08:40 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp09/screen05.c b/c/src/tests/sptests/sp09/screen05.c index b036468562..2ba984aba2 100644 --- a/c/src/tests/sptests/sp09/screen05.c +++ b/c/src/tests/sptests/sp09/screen05.c @@ -14,7 +14,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. * - * screen05.c,v 1.2 1995/05/31 17:08:59 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp09/screen07.c b/c/src/tests/sptests/sp09/screen07.c index 0fa8b5c27b..2c58160edd 100644 --- a/c/src/tests/sptests/sp09/screen07.c +++ b/c/src/tests/sptests/sp09/screen07.c @@ -14,7 +14,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. * - * screen07.c,v 1.2 1995/05/31 17:09:03 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp09/screen08.c b/c/src/tests/sptests/sp09/screen08.c index 2431dbbd0e..cc80bd2635 100644 --- a/c/src/tests/sptests/sp09/screen08.c +++ b/c/src/tests/sptests/sp09/screen08.c @@ -14,7 +14,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. * - * screen08.c,v 1.2 1995/05/31 17:09:05 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp09/screen09.c b/c/src/tests/sptests/sp09/screen09.c index 444ead79a2..5c6eece679 100644 --- a/c/src/tests/sptests/sp09/screen09.c +++ b/c/src/tests/sptests/sp09/screen09.c @@ -14,7 +14,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. * - * screen09.c,v 1.2 1995/05/31 17:09:07 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp09/screen13.c b/c/src/tests/sptests/sp09/screen13.c index 6e09d7196c..f58f42998d 100644 --- a/c/src/tests/sptests/sp09/screen13.c +++ b/c/src/tests/sptests/sp09/screen13.c @@ -14,7 +14,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. * - * screen13.c,v 1.2 1995/05/31 17:09:14 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp09/system.h b/c/src/tests/sptests/sp09/system.h index b46c6c992d..0bf193dad9 100644 --- a/c/src/tests/sptests/sp09/system.h +++ b/c/src/tests/sptests/sp09/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:09:17 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp09/task3.c b/c/src/tests/sptests/sp09/task3.c index 7a953e2e26..3ec1b0162c 100644 --- a/c/src/tests/sptests/sp09/task3.c +++ b/c/src/tests/sptests/sp09/task3.c @@ -17,7 +17,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. * - * task3.c,v 1.2 1995/05/31 17:09:22 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp11/system.h b/c/src/tests/sptests/sp11/system.h index 64ee01f47b..0bf193dad9 100644 --- a/c/src/tests/sptests/sp11/system.h +++ b/c/src/tests/sptests/sp11/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:09:35 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp12/system.h b/c/src/tests/sptests/sp12/system.h index b73a2bea97..0bf193dad9 100644 --- a/c/src/tests/sptests/sp12/system.h +++ b/c/src/tests/sptests/sp12/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:09:55 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp13/init.c b/c/src/tests/sptests/sp13/init.c index 121a8c9f3a..30834550d0 100644 --- a/c/src/tests/sptests/sp13/init.c +++ b/c/src/tests/sptests/sp13/init.c @@ -19,7 +19,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. * - * init.c,v 1.2 1995/05/31 17:10:13 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp13/putbuff.c b/c/src/tests/sptests/sp13/putbuff.c index 8105c19167..ed75a54fa4 100644 --- a/c/src/tests/sptests/sp13/putbuff.c +++ b/c/src/tests/sptests/sp13/putbuff.c @@ -16,7 +16,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. * - * putbuff.c,v 1.2 1995/05/31 17:10:15 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp13/system.h b/c/src/tests/sptests/sp13/system.h index c523829168..0bf193dad9 100644 --- a/c/src/tests/sptests/sp13/system.h +++ b/c/src/tests/sptests/sp13/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:10:19 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp13/task1.c b/c/src/tests/sptests/sp13/task1.c index 7ba54eabbf..f203c85ac6 100644 --- a/c/src/tests/sptests/sp13/task1.c +++ b/c/src/tests/sptests/sp13/task1.c @@ -15,7 +15,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. * - * task1.c,v 1.2 1995/05/31 17:10:20 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp13/task2.c b/c/src/tests/sptests/sp13/task2.c index 5be1f473cf..1541d6c8bd 100644 --- a/c/src/tests/sptests/sp13/task2.c +++ b/c/src/tests/sptests/sp13/task2.c @@ -16,7 +16,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. * - * task2.c,v 1.2 1995/05/31 17:10:22 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp13/task3.c b/c/src/tests/sptests/sp13/task3.c index 85e17cad32..f86f91a463 100644 --- a/c/src/tests/sptests/sp13/task3.c +++ b/c/src/tests/sptests/sp13/task3.c @@ -16,7 +16,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. * - * task3.c,v 1.2 1995/05/31 17:10:24 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp14/system.h b/c/src/tests/sptests/sp14/system.h index 2d4fe5d093..0bf193dad9 100644 --- a/c/src/tests/sptests/sp14/system.h +++ b/c/src/tests/sptests/sp14/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:10:37 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp15/system.h b/c/src/tests/sptests/sp15/system.h index 101bc4d9a4..0bf193dad9 100644 --- a/c/src/tests/sptests/sp15/system.h +++ b/c/src/tests/sptests/sp15/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:10:52 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp16/system.h b/c/src/tests/sptests/sp16/system.h index 22bf9a18c8..3d83632f61 100644 --- a/c/src/tests/sptests/sp16/system.h +++ b/c/src/tests/sptests/sp16/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:11:05 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp17/system.h b/c/src/tests/sptests/sp17/system.h index 97cfc263da..0bf193dad9 100644 --- a/c/src/tests/sptests/sp17/system.h +++ b/c/src/tests/sptests/sp17/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:11:26 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp19/fptest.h b/c/src/tests/sptests/sp19/fptest.h index dd45012e66..a8f3a925cb 100644 --- a/c/src/tests/sptests/sp19/fptest.h +++ b/c/src/tests/sptests/sp19/fptest.h @@ -22,7 +22,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. * - * fptest.h,v 1.2 1995/05/31 17:11:39 joel Exp + * $Id$ */ diff --git a/c/src/tests/sptests/sp19/inttest.h b/c/src/tests/sptests/sp19/inttest.h index 3b5fffee69..5dfb0af636 100644 --- a/c/src/tests/sptests/sp19/inttest.h +++ b/c/src/tests/sptests/sp19/inttest.h @@ -23,7 +23,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. * - * inttest.h,v 1.2 1995/05/31 17:11:44 joel Exp + * $Id$ */ diff --git a/c/src/tests/sptests/sp19/system.h b/c/src/tests/sptests/sp19/system.h index d3368f5c7c..0bf193dad9 100644 --- a/c/src/tests/sptests/sp19/system.h +++ b/c/src/tests/sptests/sp19/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:11:47 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp20/system.h b/c/src/tests/sptests/sp20/system.h index bdb09d6bfe..3d8bac50b8 100644 --- a/c/src/tests/sptests/sp20/system.h +++ b/c/src/tests/sptests/sp20/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:12:02 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp21/system.h b/c/src/tests/sptests/sp21/system.h index 0e1a3d02dd..0bf193dad9 100644 --- a/c/src/tests/sptests/sp21/system.h +++ b/c/src/tests/sptests/sp21/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:12:14 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp21/task1.c b/c/src/tests/sptests/sp21/task1.c index d77ad7d501..03bde1db75 100644 --- a/c/src/tests/sptests/sp21/task1.c +++ b/c/src/tests/sptests/sp21/task1.c @@ -15,7 +15,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. * - * task1.c,v 1.3 1995/05/31 17:37:05 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/sptests/sp22/system.h b/c/src/tests/sptests/sp22/system.h index 077b16d38e..0bf193dad9 100644 --- a/c/src/tests/sptests/sp22/system.h +++ b/c/src/tests/sptests/sp22/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:12:31 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp23/system.h b/c/src/tests/sptests/sp23/system.h index f940c951d6..0bf193dad9 100644 --- a/c/src/tests/sptests/sp23/system.h +++ b/c/src/tests/sptests/sp23/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:12:45 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp24/system.h b/c/src/tests/sptests/sp24/system.h index fc8b351107..0bf193dad9 100644 --- a/c/src/tests/sptests/sp24/system.h +++ b/c/src/tests/sptests/sp24/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:13:00 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/sp25/system.h b/c/src/tests/sptests/sp25/system.h index 828f99e934..3d83632f61 100644 --- a/c/src/tests/sptests/sp25/system.h +++ b/c/src/tests/sptests/sp25/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:13:11 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/spfatal/system.h b/c/src/tests/sptests/spfatal/system.h index 47da6eaf13..0bf193dad9 100644 --- a/c/src/tests/sptests/spfatal/system.h +++ b/c/src/tests/sptests/spfatal/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:13:28 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/c/src/tests/sptests/spsize/size.c b/c/src/tests/sptests/spsize/size.c index fb957e49ff..012b8570ef 100644 --- a/c/src/tests/sptests/spsize/size.c +++ b/c/src/tests/sptests/spsize/size.c @@ -11,7 +11,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. * - * size.c,v 1.4 1995/07/12 19:47:25 joel Exp + * $Id$ */ #include <rtems/system.h> diff --git a/c/src/tests/support/include/tmacros.h b/c/src/tests/support/include/tmacros.h index 18560451be..c4cda870c5 100644 --- a/c/src/tests/support/include/tmacros.h +++ b/c/src/tests/support/include/tmacros.h @@ -11,7 +11,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. * - * tmacros.h,v 1.2 1995/05/31 17:00:10 joel Exp + * $Id$ */ #ifndef __TMACROS_h diff --git a/c/src/tests/tmtests/include/timesys.h b/c/src/tests/tmtests/include/timesys.h index 85f2040db2..3b61d7b42d 100644 --- a/c/src/tests/tmtests/include/timesys.h +++ b/c/src/tests/tmtests/include/timesys.h @@ -11,7 +11,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. * - * timesys.h,v 1.2 1995/05/31 17:13:45 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm01/system.h b/c/src/tests/tmtests/tm01/system.h index b69cef78bc..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm01/system.h +++ b/c/src/tests/tmtests/tm01/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:01 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm02/system.h b/c/src/tests/tmtests/tm02/system.h index bd1c0e3394..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm02/system.h +++ b/c/src/tests/tmtests/tm02/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:12 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm03/system.h b/c/src/tests/tmtests/tm03/system.h index 27d7dd5f6c..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm03/system.h +++ b/c/src/tests/tmtests/tm03/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:23 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm04/system.h b/c/src/tests/tmtests/tm04/system.h index 8db59433a2..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm04/system.h +++ b/c/src/tests/tmtests/tm04/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:33 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm05/system.h b/c/src/tests/tmtests/tm05/system.h index 7f9525e54e..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm05/system.h +++ b/c/src/tests/tmtests/tm05/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:43 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm06/system.h b/c/src/tests/tmtests/tm06/system.h index a8fa305480..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm06/system.h +++ b/c/src/tests/tmtests/tm06/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:54 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm07/system.h b/c/src/tests/tmtests/tm07/system.h index a7d6538a7d..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm07/system.h +++ b/c/src/tests/tmtests/tm07/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:05 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm08/system.h b/c/src/tests/tmtests/tm08/system.h index 26418252be..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm08/system.h +++ b/c/src/tests/tmtests/tm08/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:15 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm09/system.h b/c/src/tests/tmtests/tm09/system.h index 8756e04ca2..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm09/system.h +++ b/c/src/tests/tmtests/tm09/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:26 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm09/task1.c b/c/src/tests/tmtests/tm09/task1.c index d23967a3b1..f1aab28241 100644 --- a/c/src/tests/tmtests/tm09/task1.c +++ b/c/src/tests/tmtests/tm09/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:15:28 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/tmtests/tm10/system.h b/c/src/tests/tmtests/tm10/system.h index 9c59593710..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm10/system.h +++ b/c/src/tests/tmtests/tm10/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:37 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm10/task1.c b/c/src/tests/tmtests/tm10/task1.c index 9ed9fc129e..3717022063 100644 --- a/c/src/tests/tmtests/tm10/task1.c +++ b/c/src/tests/tmtests/tm10/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:15:39 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/tmtests/tm11/system.h b/c/src/tests/tmtests/tm11/system.h index 49eeeefc67..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm11/system.h +++ b/c/src/tests/tmtests/tm11/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:48 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm11/task1.c b/c/src/tests/tmtests/tm11/task1.c index f7d518613f..ade5d849dd 100644 --- a/c/src/tests/tmtests/tm11/task1.c +++ b/c/src/tests/tmtests/tm11/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:15:50 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/tmtests/tm12/system.h b/c/src/tests/tmtests/tm12/system.h index 0ba9d98e96..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm12/system.h +++ b/c/src/tests/tmtests/tm12/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:59 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm12/task1.c b/c/src/tests/tmtests/tm12/task1.c index 149c356a50..6801ffb86a 100644 --- a/c/src/tests/tmtests/tm12/task1.c +++ b/c/src/tests/tmtests/tm12/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:16:00 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/tmtests/tm13/system.h b/c/src/tests/tmtests/tm13/system.h index c56c1b133e..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm13/system.h +++ b/c/src/tests/tmtests/tm13/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:16:11 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm13/task1.c b/c/src/tests/tmtests/tm13/task1.c index 32ca67c785..45df61e2b1 100644 --- a/c/src/tests/tmtests/tm13/task1.c +++ b/c/src/tests/tmtests/tm13/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:16:13 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/tmtests/tm14/system.h b/c/src/tests/tmtests/tm14/system.h index 66fcd71c55..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm14/system.h +++ b/c/src/tests/tmtests/tm14/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:16:22 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm14/task1.c b/c/src/tests/tmtests/tm14/task1.c index b4b2e1eabf..be27545d31 100644 --- a/c/src/tests/tmtests/tm14/task1.c +++ b/c/src/tests/tmtests/tm14/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:16:24 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/tmtests/tm15/system.h b/c/src/tests/tmtests/tm15/system.h index 189c611505..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm15/system.h +++ b/c/src/tests/tmtests/tm15/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:16:33 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm16/system.h b/c/src/tests/tmtests/tm16/system.h index d4418f1722..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm16/system.h +++ b/c/src/tests/tmtests/tm16/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:16:45 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm17/system.h b/c/src/tests/tmtests/tm17/system.h index 80209a3ee8..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm17/system.h +++ b/c/src/tests/tmtests/tm17/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:16:57 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm18/system.h b/c/src/tests/tmtests/tm18/system.h index a4d3b338c0..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm18/system.h +++ b/c/src/tests/tmtests/tm18/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:17:15 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm19/system.h b/c/src/tests/tmtests/tm19/system.h index d785e54f8c..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm19/system.h +++ b/c/src/tests/tmtests/tm19/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:17:35 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm20/system.h b/c/src/tests/tmtests/tm20/system.h index 16aff61444..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm20/system.h +++ b/c/src/tests/tmtests/tm20/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:17:56 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm20/task1.c b/c/src/tests/tmtests/tm20/task1.c index 97c1a13e0b..fdd44d510c 100644 --- a/c/src/tests/tmtests/tm20/task1.c +++ b/c/src/tests/tmtests/tm20/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:18:00 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/tmtests/tm21/system.h b/c/src/tests/tmtests/tm21/system.h index 478208437f..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm21/system.h +++ b/c/src/tests/tmtests/tm21/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:18:16 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm21/task1.c b/c/src/tests/tmtests/tm21/task1.c index 4cdf738d09..9b8715aa83 100644 --- a/c/src/tests/tmtests/tm21/task1.c +++ b/c/src/tests/tmtests/tm21/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:18:19 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/tmtests/tm22/system.h b/c/src/tests/tmtests/tm22/system.h index 236315dac7..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm22/system.h +++ b/c/src/tests/tmtests/tm22/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:18:37 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm22/task1.c b/c/src/tests/tmtests/tm22/task1.c index 981093efe1..21983d8818 100644 --- a/c/src/tests/tmtests/tm22/task1.c +++ b/c/src/tests/tmtests/tm22/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:18:40 joel Exp + * $Id$ */ #include "system.h" diff --git a/c/src/tests/tmtests/tm23/system.h b/c/src/tests/tmtests/tm23/system.h index fff94be073..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm23/system.h +++ b/c/src/tests/tmtests/tm23/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:18:54 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm24/system.h b/c/src/tests/tmtests/tm24/system.h index 6b3aaa8393..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm24/system.h +++ b/c/src/tests/tmtests/tm24/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:19:07 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm25/system.h b/c/src/tests/tmtests/tm25/system.h index fe378e711b..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm25/system.h +++ b/c/src/tests/tmtests/tm25/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:19:17 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm26/fptest.h b/c/src/tests/tmtests/tm26/fptest.h index 2001bcaca9..39b8438ef9 100644 --- a/c/src/tests/tmtests/tm26/fptest.h +++ b/c/src/tests/tmtests/tm26/fptest.h @@ -22,7 +22,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. * - * fptest.h,v 1.2 1995/05/31 17:19:26 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm26/system.h b/c/src/tests/tmtests/tm26/system.h index c46f55b939..f76f6855b5 100644 --- a/c/src/tests/tmtests/tm26/system.h +++ b/c/src/tests/tmtests/tm26/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:19:30 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm26/task1.c b/c/src/tests/tmtests/tm26/task1.c index b3962b07e8..6442017101 100644 --- a/c/src/tests/tmtests/tm26/task1.c +++ b/c/src/tests/tmtests/tm26/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.3 1995/06/05 23:55:00 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/c/src/tests/tmtests/tm27/system.h b/c/src/tests/tmtests/tm27/system.h index 25e9ac5656..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm27/system.h +++ b/c/src/tests/tmtests/tm27/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:19:41 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm28/system.h b/c/src/tests/tmtests/tm28/system.h index 0f8d12b27a..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm28/system.h +++ b/c/src/tests/tmtests/tm28/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:19:51 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tm29/system.h b/c/src/tests/tmtests/tm29/system.h index 2da585d5a1..4444a53c4c 100644 --- a/c/src/tests/tmtests/tm29/system.h +++ b/c/src/tests/tmtests/tm29/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:20:02 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tmck/system.h b/c/src/tests/tmtests/tmck/system.h index 4a8601897a..4444a53c4c 100644 --- a/c/src/tests/tmtests/tmck/system.h +++ b/c/src/tests/tmtests/tmck/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:20:12 joel Exp + * $Id$ */ diff --git a/c/src/tests/tmtests/tmoverhd/dumrtems.h b/c/src/tests/tmtests/tmoverhd/dumrtems.h index e90c5cef7f..d0492c1014 100644 --- a/c/src/tests/tmtests/tmoverhd/dumrtems.h +++ b/c/src/tests/tmtests/tmoverhd/dumrtems.h @@ -11,7 +11,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. * - * dumrtems.h,v 1.2 1995/05/31 17:20:21 joel Exp + * $Id$ */ #ifndef __DUMRTEMS_h diff --git a/c/src/tests/tmtests/tmoverhd/system.h b/c/src/tests/tmtests/tmoverhd/system.h index 8dc2b305b7..4444a53c4c 100644 --- a/c/src/tests/tmtests/tmoverhd/system.h +++ b/c/src/tests/tmtests/tmoverhd/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:20:26 joel Exp + * $Id$ */ diff --git a/cpukit/libcsupport/src/__brk.c b/cpukit/libcsupport/src/__brk.c index 7c43ffa32b..5f256cb072 100644 --- a/cpukit/libcsupport/src/__brk.c +++ b/cpukit/libcsupport/src/__brk.c @@ -14,7 +14,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. * - * __brk.c,v 1.2 1995/05/09 20:24:28 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/cpukit/libcsupport/src/__gettod.c b/cpukit/libcsupport/src/__gettod.c index 6f8df8a65f..d01a85b4a4 100644 --- a/cpukit/libcsupport/src/__gettod.c +++ b/cpukit/libcsupport/src/__gettod.c @@ -11,7 +11,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. * - * __gettod.c,v 1.2 1995/05/09 20:24:31 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/cpukit/libcsupport/src/newlibc.c b/cpukit/libcsupport/src/newlibc.c index c3e886266d..4493b473da 100644 --- a/cpukit/libcsupport/src/newlibc.c +++ b/cpukit/libcsupport/src/newlibc.c @@ -35,7 +35,7 @@ * * NOTE: * - * newlibc.c,v 1.2 1995/05/09 20:24:37 joel Exp + * $Id$ * */ diff --git a/cpukit/libmisc/stackchk/check.c b/cpukit/libmisc/stackchk/check.c index d843c07b2d..f5e64efd33 100644 --- a/cpukit/libmisc/stackchk/check.c +++ b/cpukit/libmisc/stackchk/check.c @@ -250,7 +250,7 @@ void Stack_check_report_blown_task(void) "BLOWN STACK!!! Offending task(%p): id=0x%08x; name=0x%08x", running, running->Object.id, - *running->Object.name + *(unsigned32 *)running->Object.name ); fflush(stderr); @@ -387,7 +387,7 @@ void Stack_check_Dump_threads_usage( printf( "0x%08x 0x%08x 0x%08x 0x%08x %8d %8d\n", the_thread ? the_thread->Object.id : ~0, - the_thread ? *the_thread->Object.name : + the_thread ? *(unsigned32 *)the_thread->Object.name : rtems_build_name('I', 'N', 'T', 'R'), (unsigned32) stack->area, (unsigned32) stack->area + (unsigned32) stack->size - 1, diff --git a/cpukit/rtems/include/rtems.h b/cpukit/rtems/include/rtems.h index d0ab705f57..d1e1e6b406 100644 --- a/cpukit/rtems/include/rtems.h +++ b/cpukit/rtems/include/rtems.h @@ -24,6 +24,8 @@ extern "C" { #endif #include <rtems/system.h> +#include <rtems/types.h> + #include <rtems/init.h> #include <rtems/tasks.h> #include <rtems/intr.h> @@ -43,31 +45,7 @@ extern "C" { #include <rtems/ratemon.h> #include <rtems/mp.h> -/* - * RTEMS basic type definitions - */ - -typedef unsigned8 rtems_unsigned8; /* unsigned 8-bit value */ -typedef unsigned16 rtems_unsigned16; /* unsigned 16-bit value */ -typedef unsigned32 rtems_unsigned32; /* unsigned 32-bit value */ -typedef unsigned64 rtems_unsigned64; /* unsigned 64-bit value */ - -typedef signed8 rtems_signed8; /* signed 8-bit value */ -typedef signed16 rtems_signed16; /* signed 16-bit value */ -typedef signed32 rtems_signed32; /* signed 32-bit value */ -typedef signed64 rtems_signed64; /* signed 64-bit value */ - -typedef single_precision rtems_single; /* single precision float */ -typedef double_precision rtems_double; /* double precision float */ - -typedef boolean rtems_boolean; - -typedef Objects_Name rtems_name; -typedef Objects_Id rtems_id; - -typedef Context_Control rtems_context; -typedef Context_Control_fp rtems_context_fp; -typedef CPU_Interrupt_frame rtems_interrupt_frame; +#include <rtems/support.h> #define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP diff --git a/cpukit/rtems/include/rtems/rtems/dpmem.h b/cpukit/rtems/include/rtems/rtems/dpmem.h index 669eb394d8..2b6016a842 100644 --- a/cpukit/rtems/include/rtems/rtems/dpmem.h +++ b/cpukit/rtems/include/rtems/rtems/dpmem.h @@ -32,6 +32,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> /* @@ -78,7 +79,7 @@ void _Dual_ported_memory_Manager_initialization( */ rtems_status_code rtems_port_create( - Objects_Name name, + rtems_name name, void *internal_start, void *external_start, unsigned32 length, @@ -96,7 +97,7 @@ rtems_status_code rtems_port_create( */ rtems_status_code rtems_port_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/cpukit/rtems/include/rtems/rtems/eventmp.h b/cpukit/rtems/include/rtems/rtems/eventmp.h index f192ea7f77..4b42cf791e 100644 --- a/cpukit/rtems/include/rtems/rtems/eventmp.h +++ b/cpukit/rtems/include/rtems/rtems/eventmp.h @@ -43,9 +43,9 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - Event_MP_Remote_operations operation; - rtems_event_set event_in; + rtems_packet_prefix Prefix; + Event_MP_Remote_operations operation; + rtems_event_set event_in; } Event_MP_Packet; /* diff --git a/cpukit/rtems/include/rtems/rtems/message.h b/cpukit/rtems/include/rtems/rtems/message.h index 04aa6dfb16..25188044be 100644 --- a/cpukit/rtems/include/rtems/rtems/message.h +++ b/cpukit/rtems/include/rtems/rtems/message.h @@ -34,6 +34,7 @@ extern "C" { #endif +#include <rtems/types.h> #include <rtems/chain.h> #include <rtems/object.h> #include <rtems/threadq.h> @@ -129,7 +130,7 @@ void _Message_queue_Manager_initialization( */ rtems_status_code rtems_message_queue_create( - Objects_Name name, + rtems_name name, unsigned32 count, unsigned32 max_message_size, rtems_attribute attribute_set, @@ -151,7 +152,7 @@ rtems_status_code rtems_message_queue_create( */ rtems_status_code rtems_message_queue_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/cpukit/rtems/include/rtems/rtems/msgmp.h b/cpukit/rtems/include/rtems/rtems/msgmp.h index d3e40fe123..ff84e83ed3 100644 --- a/cpukit/rtems/include/rtems/rtems/msgmp.h +++ b/cpukit/rtems/include/rtems/rtems/msgmp.h @@ -57,7 +57,7 @@ typedef enum { typedef struct { rtems_packet_prefix Prefix; Message_queue_MP_Remote_operations operation; - Objects_Name name; + rtems_name name; rtems_option option_set; Objects_Id proxy_id; unsigned32 count; @@ -78,7 +78,7 @@ typedef struct { void _Message_queue_MP_Send_process_packet ( Message_queue_MP_Remote_operations operation, Objects_Id message_queue_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/cpukit/rtems/include/rtems/rtems/part.h b/cpukit/rtems/include/rtems/rtems/part.h index e639029dc8..230cf029f7 100644 --- a/cpukit/rtems/include/rtems/rtems/part.h +++ b/cpukit/rtems/include/rtems/rtems/part.h @@ -31,6 +31,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/address.h> #include <rtems/attr.h> #include <rtems/object.h> @@ -83,7 +84,7 @@ void _Partition_Manager_initialization( */ rtems_status_code rtems_partition_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 buffer_size, @@ -106,7 +107,7 @@ rtems_status_code rtems_partition_create( */ rtems_status_code rtems_partition_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/cpukit/rtems/include/rtems/rtems/partmp.h b/cpukit/rtems/include/rtems/rtems/partmp.h index 9c551bd890..4b3bf876ff 100644 --- a/cpukit/rtems/include/rtems/rtems/partmp.h +++ b/cpukit/rtems/include/rtems/rtems/partmp.h @@ -48,9 +48,9 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; + rtems_packet_prefix Prefix; Partition_MP_Remote_operations operation; - Objects_Name name; + rtems_name name; void *buffer; Objects_Id proxy_id; } Partition_MP_Packet; @@ -67,7 +67,7 @@ typedef struct { void _Partition_MP_Send_process_packet ( Partition_MP_Remote_operations operation, Objects_Id partition_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/rtems/include/rtems/rtems/ratemon.h index 86acfb9a38..75a9963888 100644 --- a/cpukit/rtems/include/rtems/rtems/ratemon.h +++ b/cpukit/rtems/include/rtems/rtems/ratemon.h @@ -29,6 +29,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/thread.h> #include <rtems/watchdog.h> @@ -88,7 +89,7 @@ void _Rate_monotonic_Manager_initialization( */ rtems_status_code rtems_rate_monotonic_create( - Objects_Name name, + rtems_name name, Objects_Id *id ); @@ -104,7 +105,7 @@ rtems_status_code rtems_rate_monotonic_create( */ rtems_status_code rtems_rate_monotonic_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/rtems/include/rtems/rtems/region.h index c31e193c33..a5f6aa761c 100644 --- a/cpukit/rtems/include/rtems/rtems/region.h +++ b/cpukit/rtems/include/rtems/rtems/region.h @@ -30,6 +30,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/threadq.h> #include <rtems/heap.h> @@ -86,7 +87,7 @@ void _Region_Manager_initialization( */ rtems_status_code rtems_region_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 page_size, @@ -123,7 +124,7 @@ rtems_status_code rtems_region_extend( */ rtems_status_code rtems_region_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/cpukit/rtems/include/rtems/rtems/regionmp.h b/cpukit/rtems/include/rtems/rtems/regionmp.h index f414925e1f..9756103a60 100644 --- a/cpukit/rtems/include/rtems/rtems/regionmp.h +++ b/cpukit/rtems/include/rtems/rtems/regionmp.h @@ -48,10 +48,10 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; + rtems_packet_prefix Prefix; Region_MP_Remote_operations operation; - Objects_Name name; - rtems_option option_set; + rtems_name name; + rtems_option option_set; unsigned32 size; Objects_Id proxy_id; void *segment; @@ -69,7 +69,7 @@ typedef struct { void _Region_MP_Send_process_packet ( Region_MP_Remote_operations operation, Objects_Id region_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/cpukit/rtems/include/rtems/rtems/sem.h b/cpukit/rtems/include/rtems/rtems/sem.h index 66f5ab82b8..e70253dcb1 100644 --- a/cpukit/rtems/include/rtems/rtems/sem.h +++ b/cpukit/rtems/include/rtems/rtems/sem.h @@ -31,6 +31,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/attr.h> #include <rtems/object.h> #include <rtems/threadq.h> @@ -81,7 +82,7 @@ void _Semaphore_Manager_initialization( */ rtems_status_code rtems_semaphore_create( - Objects_Name name, + rtems_name name, unsigned32 count, rtems_attribute attribute_set, Objects_Id *id @@ -102,7 +103,7 @@ rtems_status_code rtems_semaphore_create( */ rtems_status_code rtems_semaphore_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/cpukit/rtems/include/rtems/rtems/semmp.h b/cpukit/rtems/include/rtems/rtems/semmp.h index 882812a457..915e18164c 100644 --- a/cpukit/rtems/include/rtems/rtems/semmp.h +++ b/cpukit/rtems/include/rtems/rtems/semmp.h @@ -49,11 +49,11 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - Semaphore_MP_Remote_operations operation; - Objects_Name name; - rtems_option option_set; - Objects_Id proxy_id; + rtems_packet_prefix Prefix; + Semaphore_MP_Remote_operations operation; + rtems_name name; + rtems_option option_set; + Objects_Id proxy_id; } Semaphore_MP_Packet; /* @@ -68,7 +68,7 @@ typedef struct { void _Semaphore_MP_Send_process_packet ( Semaphore_MP_Remote_operations operation, Objects_Id semaphore_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ); diff --git a/cpukit/rtems/include/rtems/rtems/signalmp.h b/cpukit/rtems/include/rtems/rtems/signalmp.h index 80aa3b7d60..b72f476bee 100644 --- a/cpukit/rtems/include/rtems/rtems/signalmp.h +++ b/cpukit/rtems/include/rtems/rtems/signalmp.h @@ -43,9 +43,9 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - Signal_MP_Remote_operations operation; - rtems_signal_set signal_in; + rtems_packet_prefix Prefix; + Signal_MP_Remote_operations operation; + rtems_signal_set signal_in; } Signal_MP_Packet; /* diff --git a/cpukit/rtems/include/rtems/rtems/support.h b/cpukit/rtems/include/rtems/rtems/support.h new file mode 100644 index 0000000000..c6452e0847 --- /dev/null +++ b/cpukit/rtems/include/rtems/rtems/support.h @@ -0,0 +1,80 @@ +/* support.h + * + * This include file contains information about support functions for + * the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_RTEMS_SUPPORT_h +#define __RTEMS_RTEMS_SUPPORT_h + +#ifdef __cplusplus +extern "C" { +#endif + +#include <rtems/types.h> + +/* + * rtems_is_name_valid + * + * DESCRIPTION: + * + * This function returns TRUE if the name is valid, and FALSE otherwise. + */ + +STATIC INLINE rtems_boolean rtems_is_name_valid ( + rtems_name name +); + +/* + * rtems_build_name + * + * DESCRIPTION: + * + * This function returns an object name composed of the four characters + * C1, C2, C3, and C4. + * + * NOTE: + * + * This must be implemented as a macro for use in Configuration Tables. + * + */ + +#define rtems_build_name( _C1, _C2, _C3, _C4 ) \ + ( (_C1) << 24 | (_C2) << 16 | (_C3) << 8 | (_C4) ) + +/* + * rtems_name_to_characters + * + * DESCRIPTION: + * + * This function breaks the object name into the four component + * characters C1, C2, C3, and C4. + * + */ + +STATIC INLINE void rtems_name_to_characters( + rtems_name name, + char *c1, + char *c2, + char *c3, + char *c4 +); + +#include <rtems/support.inl> + +#ifdef __cplusplus +} +#endif + +#endif +/* end of include file */ diff --git a/cpukit/rtems/include/rtems/rtems/taskmp.h b/cpukit/rtems/include/rtems/rtems/taskmp.h index a83723bd9f..d05277a69c 100644 --- a/cpukit/rtems/include/rtems/rtems/taskmp.h +++ b/cpukit/rtems/include/rtems/rtems/taskmp.h @@ -54,12 +54,12 @@ typedef enum { */ typedef struct { - rtems_packet_prefix Prefix; - RTEMS_tasks_MP_Remote_operations operation; - Objects_Name name; - rtems_task_priority the_priority; - unsigned32 notepad; - unsigned32 note; + rtems_packet_prefix Prefix; + RTEMS_tasks_MP_Remote_operations operation; + rtems_name name; + rtems_task_priority the_priority; + unsigned32 notepad; + unsigned32 note; } RTEMS_tasks_MP_Packet; /* @@ -74,7 +74,7 @@ typedef struct { void _RTEMS_tasks_MP_Send_process_packet ( RTEMS_tasks_MP_Remote_operations operation, Objects_Id task_id, - Objects_Name name + rtems_name name ); /* diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h index d92913548e..88bf8e0e65 100644 --- a/cpukit/rtems/include/rtems/rtems/tasks.h +++ b/cpukit/rtems/include/rtems/rtems/tasks.h @@ -38,6 +38,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/message.h> #include <rtems/object.h> #include <rtems/part.h> @@ -74,7 +75,7 @@ extern "C" { */ rtems_status_code rtems_task_create( - Objects_Name name, + rtems_name name, rtems_task_priority initial_priority, unsigned32 stack_size, rtems_mode initial_modes, @@ -97,7 +98,7 @@ rtems_status_code rtems_task_create( */ rtems_status_code rtems_task_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ); diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/cpukit/rtems/include/rtems/rtems/timer.h index f6ccb5f4a1..bab05378c7 100644 --- a/cpukit/rtems/include/rtems/rtems/timer.h +++ b/cpukit/rtems/include/rtems/rtems/timer.h @@ -33,6 +33,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/tod.h> #include <rtems/watchdog.h> @@ -95,7 +96,7 @@ void _Timer_Manager_initialization( */ rtems_status_code rtems_timer_create( - Objects_Name name, + rtems_name name, Objects_Id *id ); @@ -111,7 +112,7 @@ rtems_status_code rtems_timer_create( */ rtems_status_code rtems_timer_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/rtems/include/rtems/rtems/types.h new file mode 100644 index 0000000000..2a5cb6f4fd --- /dev/null +++ b/cpukit/rtems/include/rtems/rtems/types.h @@ -0,0 +1,56 @@ +/* types.h + * + * This include file defines the types used by the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_RTEMS_TYPES_h +#define __RTEMS_RTEMS_TYPES_h + +#ifdef __cplusplus +extern "C" { +#endif + +#include <rtems/object.h> + +/* + * RTEMS basic type definitions + */ + +typedef unsigned8 rtems_unsigned8; /* unsigned 8-bit value */ +typedef unsigned16 rtems_unsigned16; /* unsigned 16-bit value */ +typedef unsigned32 rtems_unsigned32; /* unsigned 32-bit value */ +typedef unsigned64 rtems_unsigned64; /* unsigned 64-bit value */ + +typedef signed8 rtems_signed8; /* signed 8-bit value */ +typedef signed16 rtems_signed16; /* signed 16-bit value */ +typedef signed32 rtems_signed32; /* signed 32-bit value */ +typedef signed64 rtems_signed64; /* signed 64-bit value */ + +typedef single_precision rtems_single; /* single precision float */ +typedef double_precision rtems_double; /* double precision float */ + +typedef boolean rtems_boolean; + +typedef unsigned32 rtems_name; +typedef Objects_Id rtems_id; + +typedef Context_Control rtems_context; +typedef Context_Control_fp rtems_context_fp; +typedef CPU_Interrupt_frame rtems_interrupt_frame; + +#ifdef __cplusplus +} +#endif + +#endif +/* end of include file */ diff --git a/cpukit/rtems/inline/rtems/rtems/support.inl b/cpukit/rtems/inline/rtems/rtems/support.inl new file mode 100644 index 0000000000..2f98a98ad0 --- /dev/null +++ b/cpukit/rtems/inline/rtems/rtems/support.inl @@ -0,0 +1,54 @@ +/* support.inl + * + * This include file contains the static inline implementation of all + * of the inlined routines specific to the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_SUPPORT_inl +#define __RTEMS_SUPPORT_inl + +/*PAGE + * + * rtems_is_name_valid + * + */ + +STATIC INLINE rtems_boolean rtems_is_name_valid ( + rtems_name name +) +{ + return ( name != 0 ); +} + +/*PAGE + * + * rtems_name_to_characters + * + */ + +STATIC INLINE void rtems_name_to_characters( + rtems_name name, + char *c1, + char *c2, + char *c3, + char *c4 +) +{ + *c1 = (name >> 24) & 0xff; + *c2 = (name >> 16) & 0xff; + *c3 = (name >> 8) & 0xff; + *c4 = name & 0xff; +} + +#endif +/* end of include file */ diff --git a/cpukit/rtems/inline/rtems/rtems/tasks.inl b/cpukit/rtems/inline/rtems/rtems/tasks.inl index d5df18831a..10d3e3c197 100644 --- a/cpukit/rtems/inline/rtems/rtems/tasks.inl +++ b/cpukit/rtems/inline/rtems/rtems/tasks.inl @@ -17,6 +17,11 @@ #ifndef __RTEMS_TASKS_inl #define __RTEMS_TASKS_inl +#include <rtems/msgmp.h> +#include <rtems/partmp.h> +#include <rtems/regionmp.h> +#include <rtems/semmp.h> + /*PAGE * * _RTEMS_tasks_Allocate diff --git a/cpukit/rtems/macros/rtems/rtems/support.inl b/cpukit/rtems/macros/rtems/rtems/support.inl new file mode 100644 index 0000000000..a25b445aff --- /dev/null +++ b/cpukit/rtems/macros/rtems/rtems/support.inl @@ -0,0 +1,44 @@ +/* support.inl + * + * This include file contains the macros implementation of all + * of the inlined routines specific to the RTEMS API. + * + * 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$ + */ + +#ifndef __RTEMS_SUPPORT_inl +#define __RTEMS_SUPPORT_inl + +/*PAGE + * + * rtems_is_name_valid + * + */ + +#define rtems_is_name_valid( _name ) \ + ( (_name) != 0 ) + +/*PAGE + * + * rtems_name_to_characters + * + */ + +#define rtems_name_to_characters( _name, _c1, _c2, _c3, _c4 ) \ + { \ + (*(_c1) = ((_name) >> 24) & 0xff; \ + (*(_c2) = ((_name) >> 16) & 0xff; \ + (*(_c3) = ((_name) >> 8) & 0xff; \ + (*(_c4) = ((_name)) & 0xff; \ + } + +#endif +/* end of include file */ diff --git a/cpukit/rtems/macros/rtems/rtems/tasks.inl b/cpukit/rtems/macros/rtems/rtems/tasks.inl index 7b40cbf7fd..8fec704ea4 100644 --- a/cpukit/rtems/macros/rtems/rtems/tasks.inl +++ b/cpukit/rtems/macros/rtems/rtems/tasks.inl @@ -17,6 +17,11 @@ #ifndef __RTEMS_TASKS_inl #define __RTEMS_TASKS_inl +#include <rtems/msgmp.h> +#include <rtems/partmp.h> +#include <rtems/regionmp.h> +#include <rtems/semmp.h> + /*PAGE * * _RTEMS_tasks_Allocate diff --git a/cpukit/rtems/src/dpmem.c b/cpukit/rtems/src/dpmem.c index b594ecd00e..ea2469f4c5 100644 --- a/cpukit/rtems/src/dpmem.c +++ b/cpukit/rtems/src/dpmem.c @@ -13,6 +13,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/address.h> #include <rtems/dpmem.h> #include <rtems/object.h> @@ -36,11 +37,13 @@ void _Dual_ported_memory_Manager_initialization( ) { _Objects_Initialize_information( - &_Dual_ported_memory_Information, - OBJECTS_RTEMS_PORTS, - FALSE, - maximum_ports, - sizeof( Dual_ported_memory_Control ) + &_Dual_ported_memory_Information, + OBJECTS_RTEMS_PORTS, + FALSE, + maximum_ports, + sizeof( Dual_ported_memory_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -64,7 +67,7 @@ void _Dual_ported_memory_Manager_initialization( */ rtems_status_code rtems_port_create( - Objects_Name name, + rtems_name name, void *internal_start, void *external_start, unsigned32 length, @@ -73,7 +76,7 @@ rtems_status_code rtems_port_create( { register Dual_ported_memory_Control *the_port; - if ( !_Objects_Is_name_valid( name) ) + if ( !rtems_is_name_valid( name) ) return ( RTEMS_INVALID_NAME ); if ( !_Addresses_Is_aligned( internal_start ) || @@ -93,8 +96,12 @@ rtems_status_code rtems_port_create( the_port->external_base = external_start; the_port->length = length - 1; - _Objects_Open( &_Dual_ported_memory_Information, - &the_port->Object, name ); + _Objects_Open( + &_Dual_ported_memory_Information, + &the_port->Object, + &name + ); + *id = the_port->Object.id; _Thread_Enable_dispatch(); return( RTEMS_SUCCESSFUL ); @@ -118,14 +125,14 @@ rtems_status_code rtems_port_create( */ rtems_status_code rtems_port_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { return( _Objects_Name_to_id( &_Dual_ported_memory_Information, - name, + &name, RTEMS_SEARCH_ALL_NODES, id ) diff --git a/cpukit/rtems/src/msg.c b/cpukit/rtems/src/msg.c index 49d7d0b3f3..d7c456f90a 100644 --- a/cpukit/rtems/src/msg.c +++ b/cpukit/rtems/src/msg.c @@ -22,6 +22,7 @@ #include <rtems/object.h> #include <rtems/options.h> #include <rtems/states.h> +#include <rtems/support.h> #include <rtems/thread.h> #include <rtems/wkspace.h> #include <rtems/mpci.h> @@ -48,7 +49,9 @@ void _Message_queue_Manager_initialization( OBJECTS_RTEMS_MESSAGE_QUEUES, TRUE, maximum_message_queues, - sizeof( Message_queue_Control ) + sizeof( Message_queue_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -130,7 +133,7 @@ failed: */ rtems_status_code rtems_message_queue_create( - Objects_Name name, + rtems_name name, unsigned32 count, unsigned32 max_message_size, rtems_attribute attribute_set, @@ -139,7 +142,7 @@ rtems_status_code rtems_message_queue_create( { register Message_queue_Control *the_message_queue; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); if ( _Attributes_Is_global( attribute_set ) && @@ -194,8 +197,11 @@ rtems_status_code rtems_message_queue_create( _Thread_queue_Initialize( &the_message_queue->Wait_queue, attribute_set, STATES_WAITING_FOR_MESSAGE ); - _Objects_Open( &_Message_queue_Information, - &the_message_queue->Object, name ); + _Objects_Open( + &_Message_queue_Information, + &the_message_queue->Object, + &name + ); *id = the_message_queue->Object.id; @@ -230,13 +236,17 @@ rtems_status_code rtems_message_queue_create( */ rtems_status_code rtems_message_queue_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) { - return( _Objects_Name_to_id( &_Message_queue_Information, name, - node, id ) ); + return _Objects_Name_to_id( + &_Message_queue_Information, + &name, + node, + id + ); } /*PAGE diff --git a/cpukit/rtems/src/msgmp.c b/cpukit/rtems/src/msgmp.c index 75e83b5bf8..37ce2c9453 100644 --- a/cpukit/rtems/src/msgmp.c +++ b/cpukit/rtems/src/msgmp.c @@ -32,7 +32,7 @@ void _Message_queue_MP_Send_process_packet ( Message_queue_MP_Remote_operations operation, Objects_Id message_queue_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ) { @@ -434,7 +434,7 @@ void _Message_queue_MP_Send_extract_proxy ( _Message_queue_MP_Send_process_packet( MESSAGE_QUEUE_MP_EXTRACT_PROXY, the_thread->Wait.id, - (Objects_Name) 0, + (rtems_name) 0, the_thread->Object.id ); } diff --git a/cpukit/rtems/src/part.c b/cpukit/rtems/src/part.c index 7cf0fe691c..b1e284c669 100644 --- a/cpukit/rtems/src/part.c +++ b/cpukit/rtems/src/part.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/address.h> #include <rtems/config.h> #include <rtems/object.h> @@ -42,7 +43,9 @@ void _Partition_Manager_initialization( OBJECTS_RTEMS_PARTITIONS, TRUE, maximum_partitions, - sizeof( Partition_Control ) + sizeof( Partition_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -69,7 +72,7 @@ void _Partition_Manager_initialization( */ rtems_status_code rtems_partition_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 buffer_size, @@ -79,7 +82,7 @@ rtems_status_code rtems_partition_create( { register Partition_Control *the_partition; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); if ( length == 0 || buffer_size == 0 || length < buffer_size || @@ -118,7 +121,7 @@ rtems_status_code rtems_partition_create( _Chain_Initialize( &the_partition->Memory, starting_address, length / buffer_size, buffer_size ); - _Objects_Open( &_Partition_Information, &the_partition->Object, name ); + _Objects_Open( &_Partition_Information, &the_partition->Object, &name ); *id = the_partition->Object.id; if ( _Attributes_Is_global( attribute_set ) ) @@ -152,12 +155,12 @@ rtems_status_code rtems_partition_create( */ rtems_status_code rtems_partition_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) { - return( _Objects_Name_to_id( &_Partition_Information, name, node, id ) ); + return _Objects_Name_to_id( &_Partition_Information, &name, node, id ); } /*PAGE diff --git a/cpukit/rtems/src/partmp.c b/cpukit/rtems/src/partmp.c index 9cc1723106..074165777b 100644 --- a/cpukit/rtems/src/partmp.c +++ b/cpukit/rtems/src/partmp.c @@ -30,7 +30,7 @@ void _Partition_MP_Send_process_packet ( Partition_MP_Remote_operations operation, Objects_Id partition_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ) { @@ -280,7 +280,7 @@ void _Partition_MP_Send_extract_proxy ( _Partition_MP_Send_process_packet( PARTITION_MP_EXTRACT_PROXY, the_thread->Wait.id, - (Objects_Name) 0, + (rtems_name) 0, the_thread->Object.id ); diff --git a/cpukit/rtems/src/ratemon.c b/cpukit/rtems/src/ratemon.c index 86f1534d98..6e84c56fb3 100644 --- a/cpukit/rtems/src/ratemon.c +++ b/cpukit/rtems/src/ratemon.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/isr.h> #include <rtems/object.h> #include <rtems/ratemon.h> @@ -40,11 +41,13 @@ void _Rate_monotonic_Manager_initialization( ) { _Objects_Initialize_information( - &_Rate_monotonic_Information, - OBJECTS_RTEMS_PERIODS, - FALSE, - maximum_periods, - sizeof( Rate_monotonic_Control ) + &_Rate_monotonic_Information, + OBJECTS_RTEMS_PERIODS, + FALSE, + maximum_periods, + sizeof( Rate_monotonic_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -66,13 +69,13 @@ void _Rate_monotonic_Manager_initialization( */ rtems_status_code rtems_rate_monotonic_create( - Objects_Name name, + rtems_name name, Objects_Id *id ) { Rate_monotonic_Control *the_period; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return( RTEMS_INVALID_NAME ); _Thread_Disable_dispatch(); /* to prevent deletion */ @@ -87,7 +90,7 @@ rtems_status_code rtems_rate_monotonic_create( the_period->owner = _Thread_Executing; the_period->state = RATE_MONOTONIC_INACTIVE; - _Objects_Open( &_Rate_monotonic_Information, &the_period->Object, name ); + _Objects_Open( &_Rate_monotonic_Information, &the_period->Object, &name ); *id = the_period->Object.id; _Thread_Enable_dispatch(); @@ -112,13 +115,13 @@ rtems_status_code rtems_rate_monotonic_create( */ rtems_status_code rtems_rate_monotonic_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { return _Objects_Name_to_id( &_Rate_monotonic_Information, - name, + &name, RTEMS_SEARCH_LOCAL_NODE, id ); diff --git a/cpukit/rtems/src/region.c b/cpukit/rtems/src/region.c index 40bd7ffa26..90916dcc3a 100644 --- a/cpukit/rtems/src/region.c +++ b/cpukit/rtems/src/region.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/config.h> #include <rtems/object.h> #include <rtems/options.h> @@ -38,12 +39,14 @@ void _Region_Manager_initialization( ) { _Objects_Initialize_information( - &_Region_Information, - OBJECTS_RTEMS_REGIONS, - FALSE, - maximum_regions, - sizeof( Region_Control ) - ); + &_Region_Information, + OBJECTS_RTEMS_REGIONS, + FALSE, + maximum_regions, + sizeof( Region_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH + ); } /*PAGE @@ -68,7 +71,7 @@ void _Region_Manager_initialization( */ rtems_status_code rtems_region_create( - Objects_Name name, + rtems_name name, void *starting_address, unsigned32 length, unsigned32 page_size, @@ -78,7 +81,7 @@ rtems_status_code rtems_region_create( { Region_Control *the_region; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); if ( !_Addresses_Is_aligned( starting_address ) ) @@ -111,7 +114,7 @@ rtems_status_code rtems_region_create( _Thread_queue_Initialize( &the_region->Wait_queue, attribute_set, STATES_WAITING_FOR_SEGMENT ); - _Objects_Open( &_Region_Information, &the_region->Object, name ); + _Objects_Open( &_Region_Information, &the_region->Object, &name ); *id = the_region->Object.id; _Thread_Enable_dispatch(); @@ -136,13 +139,13 @@ rtems_status_code rtems_region_create( */ rtems_status_code rtems_region_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { return _Objects_Name_to_id( &_Region_Information, - name, + &name, RTEMS_SEARCH_LOCAL_NODE, id ); diff --git a/cpukit/rtems/src/regionmp.c b/cpukit/rtems/src/regionmp.c index 558ae1639a..07de556acc 100644 --- a/cpukit/rtems/src/regionmp.c +++ b/cpukit/rtems/src/regionmp.c @@ -30,7 +30,7 @@ void _Region_MP_Send_process_packet ( Region_MP_Remote_operations operation, Objects_Id region_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ) { @@ -289,7 +289,7 @@ void _Region_MP_Send_extract_proxy ( _Region_MP_Send_process_packet( REGION_MP_EXTRACT_PROXY, the_thread->Wait.id, - (Objects_Name) 0, + (rtems_name) 0, the_thread->Object.id ); } diff --git a/cpukit/rtems/src/rtemstimer.c b/cpukit/rtems/src/rtemstimer.c index ec55c3eaf9..2aad758269 100644 --- a/cpukit/rtems/src/rtemstimer.c +++ b/cpukit/rtems/src/rtemstimer.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/object.h> #include <rtems/thread.h> #include <rtems/timer.h> @@ -37,11 +38,13 @@ void _Timer_Manager_initialization( ) { _Objects_Initialize_information( - &_Timer_Information, - OBJECTS_RTEMS_TIMERS, - FALSE, - maximum_timers, - sizeof( Timer_Control ) + &_Timer_Information, + OBJECTS_RTEMS_TIMERS, + FALSE, + maximum_timers, + sizeof( Timer_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -62,13 +65,13 @@ void _Timer_Manager_initialization( */ rtems_status_code rtems_timer_create( - Objects_Name name, + rtems_name name, Objects_Id *id ) { Timer_Control *the_timer; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); _Thread_Disable_dispatch(); /* to prevent deletion */ @@ -82,7 +85,7 @@ rtems_status_code rtems_timer_create( the_timer->the_class = TIMER_DORMANT; - _Objects_Open( &_Timer_Information, &the_timer->Object, name ); + _Objects_Open( &_Timer_Information, &the_timer->Object, &name ); *id = the_timer->Object.id; _Thread_Enable_dispatch(); @@ -107,13 +110,13 @@ rtems_status_code rtems_timer_create( */ rtems_status_code rtems_timer_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { return _Objects_Name_to_id( &_Timer_Information, - name, + &name, RTEMS_SEARCH_LOCAL_NODE, id ); diff --git a/cpukit/rtems/src/sem.c b/cpukit/rtems/src/sem.c index 340a4fa947..46dff9cdd7 100644 --- a/cpukit/rtems/src/sem.c +++ b/cpukit/rtems/src/sem.c @@ -27,6 +27,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/attr.h> #include <rtems/config.h> #include <rtems/isr.h> @@ -56,10 +57,12 @@ void _Semaphore_Manager_initialization( { _Objects_Initialize_information( &_Semaphore_Information, - OBJECTS_RTEMS_SEMAPHORES, + OBJECTS_RTEMS_SEMAPHORES, TRUE, maximum_semaphores, - sizeof( Semaphore_Control ) + sizeof( Semaphore_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -83,7 +86,7 @@ void _Semaphore_Manager_initialization( */ rtems_status_code rtems_semaphore_create( - Objects_Name name, + rtems_name name, unsigned32 count, rtems_attribute attribute_set, Objects_Id *id @@ -91,7 +94,7 @@ rtems_status_code rtems_semaphore_create( { register Semaphore_Control *the_semaphore; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); if ( _Attributes_Is_global( attribute_set ) ) { @@ -147,7 +150,7 @@ rtems_status_code rtems_semaphore_create( _Thread_queue_Initialize( &the_semaphore->Wait_queue, attribute_set, STATES_WAITING_FOR_SEMAPHORE ); - _Objects_Open( &_Semaphore_Information, &the_semaphore->Object, name ); + _Objects_Open( &_Semaphore_Information, &the_semaphore->Object, &name ); *id = the_semaphore->Object.id; @@ -181,12 +184,12 @@ rtems_status_code rtems_semaphore_create( */ rtems_status_code rtems_semaphore_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) { - return( _Objects_Name_to_id( &_Semaphore_Information, name, node, id ) ); + return( _Objects_Name_to_id( &_Semaphore_Information, &name, node, id ) ); } /*PAGE diff --git a/cpukit/rtems/src/semmp.c b/cpukit/rtems/src/semmp.c index d131d48150..3be9fafb5f 100644 --- a/cpukit/rtems/src/semmp.c +++ b/cpukit/rtems/src/semmp.c @@ -31,7 +31,7 @@ void _Semaphore_MP_Send_process_packet ( Semaphore_MP_Remote_operations operation, Objects_Id semaphore_id, - Objects_Name name, + rtems_name name, Objects_Id proxy_id ) { @@ -286,7 +286,7 @@ void _Semaphore_MP_Send_extract_proxy ( _Semaphore_MP_Send_process_packet( SEMAPHORE_MP_EXTRACT_PROXY, the_thread->Wait.id, - (Objects_Name) 0, + (rtems_name) 0, the_thread->Object.id ); diff --git a/cpukit/rtems/src/taskmp.c b/cpukit/rtems/src/taskmp.c index b938c60c53..17b08011ef 100644 --- a/cpukit/rtems/src/taskmp.c +++ b/cpukit/rtems/src/taskmp.c @@ -31,7 +31,7 @@ void _RTEMS_tasks_MP_Send_process_packet ( RTEMS_tasks_MP_Remote_operations operation, Objects_Id task_id, - Objects_Name name + rtems_name name ) { RTEMS_tasks_MP_Packet *the_packet; diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c index e900df0ab8..9cabbc50e9 100644 --- a/cpukit/rtems/src/tasks.c +++ b/cpukit/rtems/src/tasks.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/modes.h> #include <rtems/object.h> #include <rtems/stack.h> @@ -48,7 +49,7 @@ */ rtems_status_code rtems_task_create( - Objects_Name name, + rtems_name name, rtems_task_priority initial_priority, unsigned32 stack_size, rtems_mode initial_modes, @@ -62,7 +63,7 @@ rtems_status_code rtems_task_create( void *memory; rtems_attribute the_attribute_set; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); #if 0 @@ -156,7 +157,7 @@ rtems_status_code rtems_task_create( _ASR_Initialize( &the_thread->Signal ); - _Objects_Open( &_Thread_Information, &the_thread->Object, name ); + _Objects_Open( &_Thread_Information, &the_thread->Object, &name ); *id = the_thread->Object.id; @@ -192,13 +193,13 @@ rtems_status_code rtems_task_create( */ rtems_status_code rtems_task_ident( - Objects_Name name, + rtems_name name, unsigned32 node, Objects_Id *id ) { if ( name != OBJECTS_ID_OF_SELF ) - return( _Objects_Name_to_id( &_Thread_Information, name, node, id ) ); + return( _Objects_Name_to_id( &_Thread_Information, &name, node, id ) ); *id = _Thread_Executing->Object.id; return( RTEMS_SUCCESSFUL ); diff --git a/cpukit/sapi/include/rtems/config.h b/cpukit/sapi/include/rtems/config.h index c2001c8074..766ea4a4a8 100644 --- a/cpukit/sapi/include/rtems/config.h +++ b/cpukit/sapi/include/rtems/config.h @@ -21,6 +21,7 @@ extern "C" { #endif +#include <rtems/types.h> #include <rtems/object.h> #include <rtems/thread.h> @@ -32,7 +33,7 @@ extern "C" { */ typedef struct { - Objects_Name name; /* task name */ + rtems_name name; /* task name */ unsigned32 stack_size; /* task stack size */ rtems_task_priority initial_priority; /* task priority */ rtems_attribute attribute_set; /* task attributes */ diff --git a/cpukit/sapi/include/rtems/extension.h b/cpukit/sapi/include/rtems/extension.h index 1e20fe6470..b447cc43fe 100644 --- a/cpukit/sapi/include/rtems/extension.h +++ b/cpukit/sapi/include/rtems/extension.h @@ -28,6 +28,7 @@ extern "C" { #endif +#include <rtems.h> #include <rtems/object.h> #include <rtems/userext.h> @@ -72,7 +73,7 @@ void _Extension_Manager_initialization( */ rtems_status_code rtems_extension_create( - Objects_Name name, + rtems_name name, rtems_extensions_table *extension_table, Objects_Id *id ); @@ -89,7 +90,7 @@ rtems_status_code rtems_extension_create( */ rtems_status_code rtems_extension_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ); diff --git a/cpukit/sapi/include/rtems/init.h b/cpukit/sapi/include/rtems/init.h index a5ed1688b7..8c6e34d2c3 100644 --- a/cpukit/sapi/include/rtems/init.h +++ b/cpukit/sapi/include/rtems/init.h @@ -30,6 +30,7 @@ extern "C" { #endif +#include <rtems/types.h> #include <rtems/config.h> #include <rtems/intr.h> diff --git a/cpukit/sapi/src/extension.c b/cpukit/sapi/src/extension.c index 4cae903a34..8f5f5d998a 100644 --- a/cpukit/sapi/src/extension.c +++ b/cpukit/sapi/src/extension.c @@ -14,6 +14,7 @@ */ #include <rtems/system.h> +#include <rtems/support.h> #include <rtems/object.h> #include <rtems/thread.h> #include <rtems/extension.h> @@ -35,11 +36,13 @@ void _Extension_Manager_initialization( ) { _Objects_Initialize_information( - &_Extension_Information, - OBJECTS_RTEMS_EXTENSIONS, - FALSE, - maximum_extensions, - sizeof( Extension_Control ) + &_Extension_Information, + OBJECTS_RTEMS_EXTENSIONS, + FALSE, + maximum_extensions, + sizeof( Extension_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); } @@ -61,14 +64,14 @@ void _Extension_Manager_initialization( */ rtems_status_code rtems_extension_create( - Objects_Name name, + rtems_name name, rtems_extensions_table *extension_table, Objects_Id *id ) { Extension_Control *the_extension; - if ( !_Objects_Is_name_valid( name ) ) + if ( !rtems_is_name_valid( name ) ) return ( RTEMS_INVALID_NAME ); _Thread_Disable_dispatch(); /* to prevent deletion */ @@ -82,7 +85,7 @@ rtems_status_code rtems_extension_create( _User_extensions_Add_set( &the_extension->Extension, extension_table ); - _Objects_Open( &_Extension_Information, &the_extension->Object, name ); + _Objects_Open( &_Extension_Information, &the_extension->Object, &name ); *id = the_extension->Object.id; _Thread_Enable_dispatch(); @@ -107,13 +110,13 @@ rtems_status_code rtems_extension_create( */ rtems_status_code rtems_extension_ident( - Objects_Name name, + rtems_name name, Objects_Id *id ) { return _Objects_Name_to_id( &_Extension_Information, - name, + &name, RTEMS_SEARCH_LOCAL_NODE, id ); diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h index 7f4c01c53d..c5226302d6 100644 --- a/cpukit/score/include/rtems/score/object.h +++ b/cpukit/score/include/rtems/score/object.h @@ -29,7 +29,25 @@ extern "C" { * object names. */ -typedef unsigned32 Objects_Name; +typedef void * Objects_Name; + +/* + * Space for object names is allocated in multiples of this. + * + * NOTE: Must be a power of 2. Matches the name manipulation routines. + */ + +#define OBJECTS_NAME_ALIGNMENT 4 + +/* + * Functions which compare names are prototyped like this. + */ + +typedef boolean (*Objects_Name_comparators)( + void * /* name_1 */, + void * /* name_2 */, + unsigned32 /* length */ +); /* * The following type defines the control block used to manage @@ -91,7 +109,7 @@ typedef enum { typedef struct { Chain_Node Node; Objects_Id id; - Objects_Name *name; + Objects_Name name; } Objects_Control; /* @@ -108,6 +126,8 @@ typedef struct { Objects_Name *name_table; /* table of local object names */ Chain_Control *global_table; /* pointer to global table */ Chain_Control Inactive; /* chain of inactive ctl blocks */ + boolean is_string; /* TRUE if names are strings */ + unsigned32 name_length; /* maximum length of names */ } Objects_Information; /* @@ -179,10 +199,79 @@ void _Objects_Initialize_information ( Objects_Classes the_class, boolean supports_global, unsigned32 maximum, - unsigned32 size + unsigned32 size, + boolean is_string, + unsigned32 maximum_name_length +); + +/* + * _Objects_Clear_name + * + * DESCRIPTION: + * + * XXX + */ + +void _Objects_Clear_name( + void *name, + unsigned32 length +); + +/* + * _Objects_Copy_name_string + * + * DESCRIPTION: + * + * XXX + */ + +void _Objects_Copy_name_string( + void *source, + void *destination +); + +/* + * _Objects_Copy_name_raw + * + * DESCRIPTION: + * + * XXX + */ + +void _Objects_Copy_name_raw( + void *source, + void *destination, + unsigned32 length +); + +/* + * _Objects_Compare_name_string + * + * DESCRIPTION: + * + * XXX + */ + +boolean _Objects_Compare_name_string( + void *name_1, + void *name_2, + unsigned32 length ); /* + * _Objects_Compare_name_raw + * + * DESCRIPTION: + * + * XXX + */ + +boolean _Objects_Compare_name_raw( + void *name_1, + void *name_2, + unsigned32 length +); +/* * _Objects_Name_to_id * * DESCRIPTION: @@ -244,53 +333,6 @@ Objects_Control *_Objects_Get_next( ); /* - * _Objects_Is_name_valid - * - * DESCRIPTION: - * - * This function returns TRUE if the name is valid, and FALSE otherwise. - */ - -STATIC INLINE boolean _Objects_Is_name_valid ( - Objects_Name name -); - -/* - * rtems_build_name - * - * DESCRIPTION: - * - * This function returns an object name composed of the four characters - * C1, C2, C3, and C4. - * - * NOTE: - * - * This must be implemented as a macro for use in Configuration Tables. - * - */ - -#define rtems_build_name( _C1, _C2, _C3, _C4 ) \ - ( (_C1) << 24 | (_C2) << 16 | (_C3) << 8 | (_C4) ) - -/* - * rtems_name_to_characters - * - * DESCRIPTION: - * - * This function breaks the object name into the four component - * characters C1, C2, C3, and C4. - * - */ - -STATIC INLINE void rtems_name_to_characters( - Objects_Name name, - char *c1, - char *c2, - char *c3, - char *c4 -); - -/* * _Objects_Build_id * * DESCRIPTION: diff --git a/cpukit/score/include/rtems/score/objectmp.h b/cpukit/score/include/rtems/score/objectmp.h index 0d29fda753..6ec5ed1781 100644 --- a/cpukit/score/include/rtems/score/objectmp.h +++ b/cpukit/score/include/rtems/score/objectmp.h @@ -28,7 +28,8 @@ extern "C" { typedef struct { Objects_Control Object; - Objects_Name name; + unsigned32 name; /* XXX broken but works */ + /* XXX If any API is MP with variable length names .. BOOM!!!! */ } Objects_MP_Control; /* @@ -93,7 +94,7 @@ STATIC INLINE boolean _Objects_MP_Is_null_global_object ( boolean _Objects_MP_Open ( Objects_Information *information, - Objects_Name the_name, + unsigned32 the_name, /* XXX -- wrong for variable length */ Objects_Id the_id, boolean is_fatal_error ); diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h index 96b0abfff8..5f627c1a7c 100644 --- a/cpukit/score/include/rtems/system.h +++ b/cpukit/score/include/rtems/system.h @@ -127,6 +127,12 @@ extern const void * _Entry_points[ RTEMS_NUMBER_OF_ENTRY_POINTS ]; EXTERN rtems_cpu_table _CPU_Table; /* CPU dependent info */ +/* + * XXX weird RTEMS stuff + */ + +#define RTEMS_MAXIMUM_NAME_LENGTH 4 + #ifdef __cplusplus } #endif diff --git a/cpukit/score/inline/rtems/score/object.inl b/cpukit/score/inline/rtems/score/object.inl index da65807aa1..687ffd923b 100644 --- a/cpukit/score/inline/rtems/score/object.inl +++ b/cpukit/score/inline/rtems/score/object.inl @@ -19,39 +19,6 @@ /*PAGE * - * _Objects_Is_name_valid - * - */ - -STATIC INLINE boolean _Objects_Is_name_valid ( - Objects_Name name -) -{ - return ( name != 0 ); -} - -/*PAGE - * - * rtems_name_to_characters - * - */ - -STATIC INLINE void rtems_name_to_characters( - Objects_Name name, - char *c1, - char *c2, - char *c3, - char *c4 -) -{ - *c1 = (name >> 24) & 0xff; - *c2 = (name >> 16) & 0xff; - *c3 = (name >> 8) & 0xff; - *c4 = name & 0xff; -} - -/*PAGE - * * _Objects_Build_id * */ @@ -186,12 +153,15 @@ STATIC INLINE void _Objects_Open( Objects_Name name ) { - unsigned32 index; + unsigned32 index; index = rtems_get_index( the_object->id ); information->local_table[ index ] = the_object; - information->name_table[ index ] = name; - the_object->name = &information->name_table[ index ]; + + if ( information->is_string ) + _Objects_Copy_name_string( name, the_object->name ); + else + _Objects_Copy_name_raw( name, the_object->name, information->name_length ); } /*PAGE @@ -209,8 +179,7 @@ STATIC INLINE void _Objects_Close( index = rtems_get_index( the_object->id ); information->local_table[ index ] = NULL; - information->name_table[ index ] = 0; - the_object->name = 0; + _Objects_Clear_name( the_object->name, information->name_length ); } #endif diff --git a/cpukit/score/macros/rtems/score/object.inl b/cpukit/score/macros/rtems/score/object.inl index 6c7caa383a..27675b19bf 100644 --- a/cpukit/score/macros/rtems/score/object.inl +++ b/cpukit/score/macros/rtems/score/object.inl @@ -19,28 +19,6 @@ /*PAGE * - * _Objects_Is_name_valid - * - */ - -#define _Objects_Is_name_valid( _name ) \ - ( (_name) != 0 ) - -/* - * rtems_name_to_characters - * - */ - -#define rtems_name_to_characters( _name, _c1, _c2, _c3, _c4 ) \ - { \ - (*(_c1) = ((_name) >> 24) & 0xff; \ - (*(_c2) = ((_name) >> 16) & 0xff; \ - (*(_c3) = ((_name) >> 8) & 0xff; \ - (*(_c4) = ((_name)) & 0xff; \ - } - -/*PAGE - * * _Objects_Build_id * */ @@ -134,8 +112,12 @@ \ _index = rtems_get_index( (_the_object)->id ); \ (_information)->local_table[ _index ] = (_the_object); \ - (_information)->name_table[ _index ] = (_name); \ - (_the_object)->name = &(_information)->name_table[ _index ]; \ + \ + if ( (_information)->is_string ) \ + _Objects_Copy_name_string( (_name), (_the_object)->name ); \ + else \ + _Objects_Copy_name_raw( \ + (_name), (_the_object)->name, (_information)->name_length ); \ } /*PAGE @@ -150,8 +132,7 @@ \ _index = rtems_get_index( (_the_object)->id ); \ (_information)->local_table[ _index ] = NULL; \ - (_information)->name_table[ _index ] = 0; \ - (_the_object)->name = 0; \ + _Objects_Clear_name( (_the_object)->name, (_information)->name_length ); \ } #endif diff --git a/cpukit/score/src/object.c b/cpukit/score/src/object.c index 0181903647..5b64ea8802 100644 --- a/cpukit/score/src/object.c +++ b/cpukit/score/src/object.c @@ -55,6 +55,7 @@ void _Objects_Handler_initialization( * the_class - object class * supports_global - TRUE if this is a global object class * maximum - maximum objects of this class + * is_string - TRUE if names for this object are strings * size - size of this object's control block * * Output parameters: NONE @@ -65,15 +66,24 @@ void _Objects_Initialize_information( Objects_Classes the_class, boolean supports_global, unsigned32 maximum, - unsigned32 size + unsigned32 size, + boolean is_string, + unsigned32 maximum_name_length ) { unsigned32 minimum_index; unsigned32 index; Objects_Control *the_object; + unsigned32 name_length; + void *name_area; information->maximum = maximum; information->the_class = the_class; + information->is_string = is_string; + + /* + * Calculate minimum and maximum Id's + */ if ( maximum == 0 ) minimum_index = 0; else minimum_index = 1; @@ -84,24 +94,45 @@ void _Objects_Initialize_information( information->maximum_id = _Objects_Build_id( the_class, _Objects_Local_node, maximum ); + /* + * Allocate local pointer table + */ + information->local_table = _Workspace_Allocate_or_fatal_error( (maximum + 1) * sizeof(Objects_Control *) ); - information->name_table = _Workspace_Allocate_or_fatal_error( - (maximum + 1) * sizeof(Objects_Name) - ); + /* + * Allocate name table + */ + + name_length = maximum_name_length; + + if (name_length & (OBJECTS_NAME_ALIGNMENT-1)) + name_length = (name_length + OBJECTS_NAME_ALIGNMENT) & + ~(OBJECTS_NAME_ALIGNMENT-1); + + information->name_length = name_length; + + name_area = _Workspace_Allocate_or_fatal_error( (maximum + 1) * name_length ); + information->name_table = name_area; + + /* + * Initialize local pointer table + */ - for ( index=0 ; index < maximum ; index++ ) { + for ( index=0 ; index <= maximum ; index++ ) { information->local_table[ index ] = NULL; - information->name_table[ index ] = 0; } + /* + * Initialize objects .. if there are any + */ + if ( maximum == 0 ) { _Chain_Initialize_empty( &information->Inactive ); } else { - _Chain_Initialize( &information->Inactive, _Workspace_Allocate_or_fatal_error( maximum * size ), @@ -110,31 +141,151 @@ void _Objects_Initialize_information( ); the_object = (Objects_Control *) information->Inactive.first; - for ( index=1; - index <= maximum ; - index++ ) { + for ( index=1; index <= maximum ; index++ ) { the_object->id = _Objects_Build_id( the_class, _Objects_Local_node, index ); + + the_object->name = (void *) name_area; + + name_area = _Addresses_Add_offset( name_area, name_length ); + the_object = (Objects_Control *) the_object->Node.next; } } - if ( supports_global == TRUE && _Configuration_Is_multiprocessing() ) { + /* + * Take care of multiprocessing + */ - information->global_table = _Workspace_Allocate_or_fatal_error( - (_Configuration_MP_table->maximum_nodes + 1) * sizeof(Chain_Control) - ); + if ( supports_global == TRUE && _Configuration_Is_multiprocessing() ) { - for ( index=1; - index <= _Configuration_MP_table->maximum_nodes ; - index++ ) - _Chain_Initialize_empty( &information->global_table[ index ] ); - } - else - information->global_table = NULL; + information->global_table = _Workspace_Allocate_or_fatal_error( + (_Configuration_MP_table->maximum_nodes + 1) * sizeof(Chain_Control) + ); + + for ( index=1; + index <= _Configuration_MP_table->maximum_nodes ; + index++ ) + _Chain_Initialize_empty( &information->global_table[ index ] ); + } + else + information->global_table = NULL; +} + +/*PAGE + * + * _Objects_Clear_name + * + * XXX + */ + +void _Objects_Clear_name( + void *name, + unsigned32 length +) +{ + unsigned32 index; + unsigned32 maximum = length / OBJECTS_NAME_ALIGNMENT; + unsigned32 *name_ptr = name; + + for ( index=0 ; index < maximum ; index++ ) + *name_ptr++ = 0; +} + +/*PAGE + * + * _Objects_Copy_name_string + * + * XXX + */ + +void _Objects_Copy_name_string( + void *source, + void *destination +) +{ + unsigned8 *source_p = source; + unsigned8 *destination_p = destination; + + do { + *destination_p++ = *source_p; + } while ( *source_p++ ); +} + +/*PAGE + * + * _Objects_Copy_name_raw + * + * XXX + */ + +void _Objects_Copy_name_raw( + void *source, + void *destination, + unsigned32 length +) +{ + unsigned32 *source_p = source; + unsigned32 *destination_p = destination; + unsigned32 tmp_length = length / OBJECTS_NAME_ALIGNMENT; + + while ( tmp_length-- ) + *destination_p++ = *source_p++; +} + +/*PAGE + * + * _Objects_Compare_name_string + * + * XXX + */ + +boolean _Objects_Compare_name_string( + void *name_1, + void *name_2, + unsigned32 length +) +{ + unsigned8 *name_1_p = name_1; + unsigned8 *name_2_p = name_2; + unsigned32 tmp_length = length; + + do { + if ( *name_1_p++ != *name_2_p++ ) + return FALSE; + if ( !tmp_length-- ) + return FALSE; + } while ( *name_1_p ); + + return TRUE; +} + +/*PAGE + * + * _Objects_Compare_name_raw + * + * XXX + */ + +boolean _Objects_Compare_name_raw( + void *name_1, + void *name_2, + unsigned32 length +) +{ + unsigned32 *name_1_p = name_1; + unsigned32 *name_2_p = name_2; + unsigned32 tmp_length = length / OBJECTS_NAME_ALIGNMENT; + + while ( tmp_length-- ) + if ( *name_1_p++ != *name_2_p++ ) + return FALSE; + + return TRUE; } + /*PAGE * * _Objects_Name_to_id @@ -156,15 +307,17 @@ void _Objects_Initialize_information( rtems_status_code _Objects_Name_to_id( Objects_Information *information, - Objects_Name name, - unsigned32 node, - Objects_Id *id + Objects_Name name, + unsigned32 node, + Objects_Id *id ) { - boolean search_local_node; - Objects_Control **objects; - Objects_Control *the_object; - unsigned32 index; + boolean search_local_node; + Objects_Control **objects; + Objects_Control *the_object; + unsigned32 index; + unsigned32 name_length; + Objects_Name_comparators compare_them; if ( name == 0 ) return( RTEMS_INVALID_NAME ); @@ -179,6 +332,11 @@ rtems_status_code _Objects_Name_to_id( if ( search_local_node ) { objects = information->local_table; + name_length = information->name_length; + + if ( information->is_string ) compare_them = _Objects_Compare_name_string; + else compare_them = _Objects_Compare_name_raw; + for ( index = 1; index <= information->maximum; index++ ) { the_object = objects[ index ]; @@ -186,7 +344,7 @@ rtems_status_code _Objects_Name_to_id( if ( !the_object || !the_object->name ) continue; - if ( name == *the_object->name ) { + if ( (*compare_them)( name, the_object->name, name_length ) ) { *id = the_object->id; return( RTEMS_SUCCESSFUL ); } diff --git a/cpukit/score/src/objectmp.c b/cpukit/score/src/objectmp.c index d75a34b150..a8b067020d 100644 --- a/cpukit/score/src/objectmp.c +++ b/cpukit/score/src/objectmp.c @@ -53,12 +53,12 @@ void _Objects_MP_Handler_initialization ( boolean _Objects_MP_Open ( Objects_Information *information, - Objects_Name the_name, + unsigned32 the_name, /* XXX -- wrong for variable */ Objects_Id the_id, boolean is_fatal_error ) { - Objects_MP_Control *the_global_object; + Objects_MP_Control *the_global_object; the_global_object = _Objects_MP_Allocate_global_object(); if ( _Objects_MP_Is_null_global_object( the_global_object ) ) { @@ -139,6 +139,7 @@ rtems_status_code _Objects_MP_Global_name_search ( Chain_Control *the_chain; Chain_Node *the_node; Objects_MP_Control *the_object; + unsigned32 name_to_use = *(unsigned32 *)the_name; /* XXX variable */ if ( nodes_to_search > _Configuration_MP_table->maximum_nodes ) @@ -174,7 +175,7 @@ rtems_status_code _Objects_MP_Global_name_search ( the_object = (Objects_MP_Control *) the_node; - if ( the_object->name == the_name ) { + if ( the_object->name == name_to_use ) { *the_id = the_object->Object.id; _Thread_Enable_dispatch(); return ( RTEMS_SUCCESSFUL ); diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c index 92c882d749..9793792b44 100644 --- a/cpukit/score/src/thread.c +++ b/cpukit/score/src/thread.c @@ -58,11 +58,13 @@ void _Thread_Handler_initialization( _Thread_Ticks_per_timeslice = ticks_per_timeslice; _Objects_Initialize_information( - &_Thread_Information, - OBJECTS_RTEMS_TASKS, - TRUE, - maximum_tasks, - sizeof( Thread_Control ) + &_Thread_Information, + OBJECTS_RTEMS_TASKS, + TRUE, + maximum_tasks, + sizeof( Thread_Control ), + FALSE, + RTEMS_MAXIMUM_NAME_LENGTH ); _Thread_Ready_chain = _Workspace_Allocate_or_fatal_error( diff --git a/testsuites/mptests/mp01/system.h b/testsuites/mptests/mp01/system.h index 1a29db3f02..1110c1574f 100644 --- a/testsuites/mptests/mp01/system.h +++ b/testsuites/mptests/mp01/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:00:40 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp01/task1.c b/testsuites/mptests/mp01/task1.c index 465ae7063e..7f90bb3165 100644 --- a/testsuites/mptests/mp01/task1.c +++ b/testsuites/mptests/mp01/task1.c @@ -21,7 +21,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. * - * task1.c,v 1.2 1995/05/09 20:26:24 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp02/system.h b/testsuites/mptests/mp02/system.h index 74117b8f9b..0bf193dad9 100644 --- a/testsuites/mptests/mp02/system.h +++ b/testsuites/mptests/mp02/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:01:00 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp03/system.h b/testsuites/mptests/mp03/system.h index 2fa8e248e6..0bf193dad9 100644 --- a/testsuites/mptests/mp03/system.h +++ b/testsuites/mptests/mp03/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:01:22 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp04/system.h b/testsuites/mptests/mp04/system.h index 870bcbe907..0bf193dad9 100644 --- a/testsuites/mptests/mp04/system.h +++ b/testsuites/mptests/mp04/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:01:40 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp05/system.h b/testsuites/mptests/mp05/system.h index ff93a698c1..0bf193dad9 100644 --- a/testsuites/mptests/mp05/system.h +++ b/testsuites/mptests/mp05/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:02:00 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp06/system.h b/testsuites/mptests/mp06/system.h index 8c78ceda10..416af01a5d 100644 --- a/testsuites/mptests/mp06/system.h +++ b/testsuites/mptests/mp06/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:02:18 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp07/system.h b/testsuites/mptests/mp07/system.h index a04174d538..96286ca802 100644 --- a/testsuites/mptests/mp07/system.h +++ b/testsuites/mptests/mp07/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:02:38 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp08/system.h b/testsuites/mptests/mp08/system.h index df425fa221..0bf193dad9 100644 --- a/testsuites/mptests/mp08/system.h +++ b/testsuites/mptests/mp08/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:02:55 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp09/init.c b/testsuites/mptests/mp09/init.c index b63a4e0e88..cbd612a267 100644 --- a/testsuites/mptests/mp09/init.c +++ b/testsuites/mptests/mp09/init.c @@ -19,7 +19,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. * - * init.c,v 1.2 1995/05/31 17:03:11 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp09/recvmsg.c b/testsuites/mptests/mp09/recvmsg.c index 7eff6f8af0..fcdb75e966 100644 --- a/testsuites/mptests/mp09/recvmsg.c +++ b/testsuites/mptests/mp09/recvmsg.c @@ -15,7 +15,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. * - * recvmsg.c,v 1.2 1995/05/31 17:03:14 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp09/sendmsg.c b/testsuites/mptests/mp09/sendmsg.c index 94e004dfdb..ee555af67c 100644 --- a/testsuites/mptests/mp09/sendmsg.c +++ b/testsuites/mptests/mp09/sendmsg.c @@ -15,7 +15,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. * - * sendmsg.c,v 1.2 1995/05/31 17:03:16 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp09/system.h b/testsuites/mptests/mp09/system.h index 8b834cda70..0bf193dad9 100644 --- a/testsuites/mptests/mp09/system.h +++ b/testsuites/mptests/mp09/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:03:17 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp09/task1.c b/testsuites/mptests/mp09/task1.c index cd6cb90041..c4818af23a 100644 --- a/testsuites/mptests/mp09/task1.c +++ b/testsuites/mptests/mp09/task1.c @@ -16,7 +16,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. * - * task1.c,v 1.2 1995/05/31 17:03:19 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp10/init.c b/testsuites/mptests/mp10/init.c index 645250dddb..c5fe62e099 100644 --- a/testsuites/mptests/mp10/init.c +++ b/testsuites/mptests/mp10/init.c @@ -25,7 +25,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. * - * init.c,v 1.2 1995/05/31 17:03:33 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp10/system.h b/testsuites/mptests/mp10/system.h index 43804fb080..0bf193dad9 100644 --- a/testsuites/mptests/mp10/system.h +++ b/testsuites/mptests/mp10/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:03:35 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp10/task1.c b/testsuites/mptests/mp10/task1.c index 984c2ddfd4..1c72c34b58 100644 --- a/testsuites/mptests/mp10/task1.c +++ b/testsuites/mptests/mp10/task1.c @@ -16,7 +16,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. * - * task1.c,v 1.2 1995/05/31 17:03:37 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp11/init.c b/testsuites/mptests/mp11/init.c index 1f9f0f68d7..c2837a7fc2 100644 --- a/testsuites/mptests/mp11/init.c +++ b/testsuites/mptests/mp11/init.c @@ -22,7 +22,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. * - * init.c,v 1.2 1995/05/31 17:03:55 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp11/system.h b/testsuites/mptests/mp11/system.h index 6ec1b4186c..0bf193dad9 100644 --- a/testsuites/mptests/mp11/system.h +++ b/testsuites/mptests/mp11/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:03:57 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp12/system.h b/testsuites/mptests/mp12/system.h index dbb66d2516..0bf193dad9 100644 --- a/testsuites/mptests/mp12/system.h +++ b/testsuites/mptests/mp12/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:04:13 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp13/init.c b/testsuites/mptests/mp13/init.c index c6411f8106..eb2de9733c 100644 --- a/testsuites/mptests/mp13/init.c +++ b/testsuites/mptests/mp13/init.c @@ -19,7 +19,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. * - * init.c,v 1.2 1995/05/31 17:04:29 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp13/system.h b/testsuites/mptests/mp13/system.h index d7ed76d4e0..0bf193dad9 100644 --- a/testsuites/mptests/mp13/system.h +++ b/testsuites/mptests/mp13/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:04:31 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/mptests/mp13/task1.c b/testsuites/mptests/mp13/task1.c index 95da90f431..6b599f971a 100644 --- a/testsuites/mptests/mp13/task1.c +++ b/testsuites/mptests/mp13/task1.c @@ -17,7 +17,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. * - * task1.c,v 1.2 1995/05/31 17:04:33 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp14/init.c b/testsuites/mptests/mp14/init.c index d7bc7c9706..99891d50ba 100644 --- a/testsuites/mptests/mp14/init.c +++ b/testsuites/mptests/mp14/init.c @@ -19,7 +19,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. * - * init.c,v 1.2 1995/05/31 17:04:55 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp14/msgtask1.c b/testsuites/mptests/mp14/msgtask1.c index a4f9fd4bf7..78430a80ef 100644 --- a/testsuites/mptests/mp14/msgtask1.c +++ b/testsuites/mptests/mp14/msgtask1.c @@ -18,7 +18,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. * - * msgtask1.c,v 1.2 1995/05/31 17:04:58 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/mptests/mp14/system.h b/testsuites/mptests/mp14/system.h index eaf933a819..d825e0ef69 100644 --- a/testsuites/mptests/mp14/system.h +++ b/testsuites/mptests/mp14/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:05:03 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/samples/base_mp/apptask.c b/testsuites/samples/base_mp/apptask.c index cee3b88bf5..4f0bc72c74 100644 --- a/testsuites/samples/base_mp/apptask.c +++ b/testsuites/samples/base_mp/apptask.c @@ -17,7 +17,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. * - * apptask.c,v 1.2 1995/05/31 17:05:14 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/samples/base_mp/system.h b/testsuites/samples/base_mp/system.h index 25738a5d4c..38b20afb5c 100644 --- a/testsuites/samples/base_mp/system.h +++ b/testsuites/samples/base_mp/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:05:21 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/testsuites/samples/base_sp/apptask.c b/testsuites/samples/base_sp/apptask.c index 0f05a177fc..03c406f9ff 100644 --- a/testsuites/samples/base_sp/apptask.c +++ b/testsuites/samples/base_sp/apptask.c @@ -16,7 +16,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. * - * apptask.c,v 1.2 1995/05/31 17:05:28 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/samples/cdtest/init.c b/testsuites/samples/cdtest/init.c index eaafd431b8..00bdd647ba 100644 --- a/testsuites/samples/cdtest/init.c +++ b/testsuites/samples/cdtest/init.c @@ -18,7 +18,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. * - * init.c,v 1.2 1995/05/31 17:05:45 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/samples/cdtest/system.h b/testsuites/samples/cdtest/system.h index 95a58472d1..11e00f018a 100644 --- a/testsuites/samples/cdtest/system.h +++ b/testsuites/samples/cdtest/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:05:49 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/testsuites/samples/hello/init.c b/testsuites/samples/hello/init.c index 60ba06dd20..9c56c4edda 100644 --- a/testsuites/samples/hello/init.c +++ b/testsuites/samples/hello/init.c @@ -18,7 +18,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. * - * init.c,v 1.2 1995/05/31 17:05:58 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/samples/hello/system.h b/testsuites/samples/hello/system.h index c4a8598d0c..49deb52d4a 100644 --- a/testsuites/samples/hello/system.h +++ b/testsuites/samples/hello/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:06:00 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/testsuites/samples/paranoia/init.c b/testsuites/samples/paranoia/init.c index e847892cb9..947fdfd28f 100644 --- a/testsuites/samples/paranoia/init.c +++ b/testsuites/samples/paranoia/init.c @@ -18,7 +18,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. * - * init.c,v 1.2 1995/05/31 17:06:07 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/samples/paranoia/paranoia.c b/testsuites/samples/paranoia/paranoia.c index 8e435f3100..3b860c3b4a 100644 --- a/testsuites/samples/paranoia/paranoia.c +++ b/testsuites/samples/paranoia/paranoia.c @@ -1,5 +1,5 @@ /* - * RTEMS RCS Id: paranoia.c,v 1.2 1995/05/31 17:06:09 joel Exp + * $Id$ * * A C version of Kahan's Floating Point Test "Paranoia" * diff --git a/testsuites/samples/paranoia/system.h b/testsuites/samples/paranoia/system.h index 91d3451a6f..11e00f018a 100644 --- a/testsuites/samples/paranoia/system.h +++ b/testsuites/samples/paranoia/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:06:13 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/testsuites/samples/ticker/system.h b/testsuites/samples/ticker/system.h index 582c05f377..0bf193dad9 100644 --- a/testsuites/samples/ticker/system.h +++ b/testsuites/samples/ticker/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:06:23 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp01/system.h b/testsuites/sptests/sp01/system.h index de19ed92d5..0bf193dad9 100644 --- a/testsuites/sptests/sp01/system.h +++ b/testsuites/sptests/sp01/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:06:37 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp02/system.h b/testsuites/sptests/sp02/system.h index 1cb0c72f71..9bb3a13c81 100644 --- a/testsuites/sptests/sp02/system.h +++ b/testsuites/sptests/sp02/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:06:54 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp03/system.h b/testsuites/sptests/sp03/system.h index 1325ac0671..0bf193dad9 100644 --- a/testsuites/sptests/sp03/system.h +++ b/testsuites/sptests/sp03/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:07:10 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp04/system.h b/testsuites/sptests/sp04/system.h index 3f300b8e74..0bf193dad9 100644 --- a/testsuites/sptests/sp04/system.h +++ b/testsuites/sptests/sp04/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:07:24 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp04/task1.c b/testsuites/sptests/sp04/task1.c index a200dc6f4e..117f5eaa80 100644 --- a/testsuites/sptests/sp04/task1.c +++ b/testsuites/sptests/sp04/task1.c @@ -16,7 +16,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. * - * task1.c,v 1.2 1995/05/31 17:07:26 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp04/tswitch.c b/testsuites/sptests/sp04/tswitch.c index 250ec5c9a7..766d09e93b 100644 --- a/testsuites/sptests/sp04/tswitch.c +++ b/testsuites/sptests/sp04/tswitch.c @@ -18,7 +18,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. * - * tswitch.c,v 1.2 1995/05/09 20:32:43 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp05/system.h b/testsuites/sptests/sp05/system.h index 93593fb521..0bf193dad9 100644 --- a/testsuites/sptests/sp05/system.h +++ b/testsuites/sptests/sp05/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:07:40 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp06/system.h b/testsuites/sptests/sp06/system.h index f3342fb23c..0bf193dad9 100644 --- a/testsuites/sptests/sp06/system.h +++ b/testsuites/sptests/sp06/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:07:56 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp07/system.h b/testsuites/sptests/sp07/system.h index 0f2ec35aa4..c9246a0c07 100644 --- a/testsuites/sptests/sp07/system.h +++ b/testsuites/sptests/sp07/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:08:12 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp08/system.h b/testsuites/sptests/sp08/system.h index 17b39f6214..bbc6669a61 100644 --- a/testsuites/sptests/sp08/system.h +++ b/testsuites/sptests/sp08/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:08:40 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp09/screen05.c b/testsuites/sptests/sp09/screen05.c index b036468562..2ba984aba2 100644 --- a/testsuites/sptests/sp09/screen05.c +++ b/testsuites/sptests/sp09/screen05.c @@ -14,7 +14,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. * - * screen05.c,v 1.2 1995/05/31 17:08:59 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp09/screen07.c b/testsuites/sptests/sp09/screen07.c index 0fa8b5c27b..2c58160edd 100644 --- a/testsuites/sptests/sp09/screen07.c +++ b/testsuites/sptests/sp09/screen07.c @@ -14,7 +14,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. * - * screen07.c,v 1.2 1995/05/31 17:09:03 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp09/screen08.c b/testsuites/sptests/sp09/screen08.c index 2431dbbd0e..cc80bd2635 100644 --- a/testsuites/sptests/sp09/screen08.c +++ b/testsuites/sptests/sp09/screen08.c @@ -14,7 +14,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. * - * screen08.c,v 1.2 1995/05/31 17:09:05 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp09/screen09.c b/testsuites/sptests/sp09/screen09.c index 444ead79a2..5c6eece679 100644 --- a/testsuites/sptests/sp09/screen09.c +++ b/testsuites/sptests/sp09/screen09.c @@ -14,7 +14,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. * - * screen09.c,v 1.2 1995/05/31 17:09:07 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp09/screen13.c b/testsuites/sptests/sp09/screen13.c index 6e09d7196c..f58f42998d 100644 --- a/testsuites/sptests/sp09/screen13.c +++ b/testsuites/sptests/sp09/screen13.c @@ -14,7 +14,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. * - * screen13.c,v 1.2 1995/05/31 17:09:14 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp09/system.h b/testsuites/sptests/sp09/system.h index b46c6c992d..0bf193dad9 100644 --- a/testsuites/sptests/sp09/system.h +++ b/testsuites/sptests/sp09/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:09:17 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp09/task3.c b/testsuites/sptests/sp09/task3.c index 7a953e2e26..3ec1b0162c 100644 --- a/testsuites/sptests/sp09/task3.c +++ b/testsuites/sptests/sp09/task3.c @@ -17,7 +17,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. * - * task3.c,v 1.2 1995/05/31 17:09:22 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp11/system.h b/testsuites/sptests/sp11/system.h index 64ee01f47b..0bf193dad9 100644 --- a/testsuites/sptests/sp11/system.h +++ b/testsuites/sptests/sp11/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:09:35 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp12/system.h b/testsuites/sptests/sp12/system.h index b73a2bea97..0bf193dad9 100644 --- a/testsuites/sptests/sp12/system.h +++ b/testsuites/sptests/sp12/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:09:55 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp13/init.c b/testsuites/sptests/sp13/init.c index 121a8c9f3a..30834550d0 100644 --- a/testsuites/sptests/sp13/init.c +++ b/testsuites/sptests/sp13/init.c @@ -19,7 +19,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. * - * init.c,v 1.2 1995/05/31 17:10:13 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp13/putbuff.c b/testsuites/sptests/sp13/putbuff.c index 8105c19167..ed75a54fa4 100644 --- a/testsuites/sptests/sp13/putbuff.c +++ b/testsuites/sptests/sp13/putbuff.c @@ -16,7 +16,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. * - * putbuff.c,v 1.2 1995/05/31 17:10:15 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp13/system.h b/testsuites/sptests/sp13/system.h index c523829168..0bf193dad9 100644 --- a/testsuites/sptests/sp13/system.h +++ b/testsuites/sptests/sp13/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:10:19 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp13/task1.c b/testsuites/sptests/sp13/task1.c index 7ba54eabbf..f203c85ac6 100644 --- a/testsuites/sptests/sp13/task1.c +++ b/testsuites/sptests/sp13/task1.c @@ -15,7 +15,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. * - * task1.c,v 1.2 1995/05/31 17:10:20 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp13/task2.c b/testsuites/sptests/sp13/task2.c index 5be1f473cf..1541d6c8bd 100644 --- a/testsuites/sptests/sp13/task2.c +++ b/testsuites/sptests/sp13/task2.c @@ -16,7 +16,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. * - * task2.c,v 1.2 1995/05/31 17:10:22 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp13/task3.c b/testsuites/sptests/sp13/task3.c index 85e17cad32..f86f91a463 100644 --- a/testsuites/sptests/sp13/task3.c +++ b/testsuites/sptests/sp13/task3.c @@ -16,7 +16,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. * - * task3.c,v 1.2 1995/05/31 17:10:24 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp14/system.h b/testsuites/sptests/sp14/system.h index 2d4fe5d093..0bf193dad9 100644 --- a/testsuites/sptests/sp14/system.h +++ b/testsuites/sptests/sp14/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:10:37 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp15/system.h b/testsuites/sptests/sp15/system.h index 101bc4d9a4..0bf193dad9 100644 --- a/testsuites/sptests/sp15/system.h +++ b/testsuites/sptests/sp15/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:10:52 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp16/system.h b/testsuites/sptests/sp16/system.h index 22bf9a18c8..3d83632f61 100644 --- a/testsuites/sptests/sp16/system.h +++ b/testsuites/sptests/sp16/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:11:05 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp17/system.h b/testsuites/sptests/sp17/system.h index 97cfc263da..0bf193dad9 100644 --- a/testsuites/sptests/sp17/system.h +++ b/testsuites/sptests/sp17/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:11:26 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp19/fptest.h b/testsuites/sptests/sp19/fptest.h index dd45012e66..a8f3a925cb 100644 --- a/testsuites/sptests/sp19/fptest.h +++ b/testsuites/sptests/sp19/fptest.h @@ -22,7 +22,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. * - * fptest.h,v 1.2 1995/05/31 17:11:39 joel Exp + * $Id$ */ diff --git a/testsuites/sptests/sp19/inttest.h b/testsuites/sptests/sp19/inttest.h index 3b5fffee69..5dfb0af636 100644 --- a/testsuites/sptests/sp19/inttest.h +++ b/testsuites/sptests/sp19/inttest.h @@ -23,7 +23,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. * - * inttest.h,v 1.2 1995/05/31 17:11:44 joel Exp + * $Id$ */ diff --git a/testsuites/sptests/sp19/system.h b/testsuites/sptests/sp19/system.h index d3368f5c7c..0bf193dad9 100644 --- a/testsuites/sptests/sp19/system.h +++ b/testsuites/sptests/sp19/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:11:47 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp20/system.h b/testsuites/sptests/sp20/system.h index bdb09d6bfe..3d8bac50b8 100644 --- a/testsuites/sptests/sp20/system.h +++ b/testsuites/sptests/sp20/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:12:02 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp21/system.h b/testsuites/sptests/sp21/system.h index 0e1a3d02dd..0bf193dad9 100644 --- a/testsuites/sptests/sp21/system.h +++ b/testsuites/sptests/sp21/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:12:14 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp21/task1.c b/testsuites/sptests/sp21/task1.c index d77ad7d501..03bde1db75 100644 --- a/testsuites/sptests/sp21/task1.c +++ b/testsuites/sptests/sp21/task1.c @@ -15,7 +15,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. * - * task1.c,v 1.3 1995/05/31 17:37:05 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/sptests/sp22/system.h b/testsuites/sptests/sp22/system.h index 077b16d38e..0bf193dad9 100644 --- a/testsuites/sptests/sp22/system.h +++ b/testsuites/sptests/sp22/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:12:31 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp23/system.h b/testsuites/sptests/sp23/system.h index f940c951d6..0bf193dad9 100644 --- a/testsuites/sptests/sp23/system.h +++ b/testsuites/sptests/sp23/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:12:45 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp24/system.h b/testsuites/sptests/sp24/system.h index fc8b351107..0bf193dad9 100644 --- a/testsuites/sptests/sp24/system.h +++ b/testsuites/sptests/sp24/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:13:00 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/sp25/system.h b/testsuites/sptests/sp25/system.h index 828f99e934..3d83632f61 100644 --- a/testsuites/sptests/sp25/system.h +++ b/testsuites/sptests/sp25/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:13:11 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/spfatal/system.h b/testsuites/sptests/spfatal/system.h index 47da6eaf13..0bf193dad9 100644 --- a/testsuites/sptests/spfatal/system.h +++ b/testsuites/sptests/spfatal/system.h @@ -11,7 +11,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. * - * system.h,v 1.2 1995/05/31 17:13:28 joel Exp + * $Id$ */ #include <tmacros.h> diff --git a/testsuites/sptests/spsize/size.c b/testsuites/sptests/spsize/size.c index fb957e49ff..012b8570ef 100644 --- a/testsuites/sptests/spsize/size.c +++ b/testsuites/sptests/spsize/size.c @@ -11,7 +11,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. * - * size.c,v 1.4 1995/07/12 19:47:25 joel Exp + * $Id$ */ #include <rtems/system.h> diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h index 18560451be..c4cda870c5 100644 --- a/testsuites/support/include/tmacros.h +++ b/testsuites/support/include/tmacros.h @@ -11,7 +11,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. * - * tmacros.h,v 1.2 1995/05/31 17:00:10 joel Exp + * $Id$ */ #ifndef __TMACROS_h diff --git a/testsuites/tmtests/include/timesys.h b/testsuites/tmtests/include/timesys.h index 85f2040db2..3b61d7b42d 100644 --- a/testsuites/tmtests/include/timesys.h +++ b/testsuites/tmtests/include/timesys.h @@ -11,7 +11,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. * - * timesys.h,v 1.2 1995/05/31 17:13:45 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm01/system.h b/testsuites/tmtests/tm01/system.h index b69cef78bc..4444a53c4c 100644 --- a/testsuites/tmtests/tm01/system.h +++ b/testsuites/tmtests/tm01/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:01 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm02/system.h b/testsuites/tmtests/tm02/system.h index bd1c0e3394..4444a53c4c 100644 --- a/testsuites/tmtests/tm02/system.h +++ b/testsuites/tmtests/tm02/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:12 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm03/system.h b/testsuites/tmtests/tm03/system.h index 27d7dd5f6c..4444a53c4c 100644 --- a/testsuites/tmtests/tm03/system.h +++ b/testsuites/tmtests/tm03/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:23 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm04/system.h b/testsuites/tmtests/tm04/system.h index 8db59433a2..4444a53c4c 100644 --- a/testsuites/tmtests/tm04/system.h +++ b/testsuites/tmtests/tm04/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:33 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm05/system.h b/testsuites/tmtests/tm05/system.h index 7f9525e54e..4444a53c4c 100644 --- a/testsuites/tmtests/tm05/system.h +++ b/testsuites/tmtests/tm05/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:43 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm06/system.h b/testsuites/tmtests/tm06/system.h index a8fa305480..4444a53c4c 100644 --- a/testsuites/tmtests/tm06/system.h +++ b/testsuites/tmtests/tm06/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:14:54 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm07/system.h b/testsuites/tmtests/tm07/system.h index a7d6538a7d..4444a53c4c 100644 --- a/testsuites/tmtests/tm07/system.h +++ b/testsuites/tmtests/tm07/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:05 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm08/system.h b/testsuites/tmtests/tm08/system.h index 26418252be..4444a53c4c 100644 --- a/testsuites/tmtests/tm08/system.h +++ b/testsuites/tmtests/tm08/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:15 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm09/system.h b/testsuites/tmtests/tm09/system.h index 8756e04ca2..4444a53c4c 100644 --- a/testsuites/tmtests/tm09/system.h +++ b/testsuites/tmtests/tm09/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:26 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c index d23967a3b1..f1aab28241 100644 --- a/testsuites/tmtests/tm09/task1.c +++ b/testsuites/tmtests/tm09/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:15:28 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/tmtests/tm10/system.h b/testsuites/tmtests/tm10/system.h index 9c59593710..4444a53c4c 100644 --- a/testsuites/tmtests/tm10/system.h +++ b/testsuites/tmtests/tm10/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:37 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c index 9ed9fc129e..3717022063 100644 --- a/testsuites/tmtests/tm10/task1.c +++ b/testsuites/tmtests/tm10/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:15:39 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/tmtests/tm11/system.h b/testsuites/tmtests/tm11/system.h index 49eeeefc67..4444a53c4c 100644 --- a/testsuites/tmtests/tm11/system.h +++ b/testsuites/tmtests/tm11/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:48 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c index f7d518613f..ade5d849dd 100644 --- a/testsuites/tmtests/tm11/task1.c +++ b/testsuites/tmtests/tm11/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:15:50 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/tmtests/tm12/system.h b/testsuites/tmtests/tm12/system.h index 0ba9d98e96..4444a53c4c 100644 --- a/testsuites/tmtests/tm12/system.h +++ b/testsuites/tmtests/tm12/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:15:59 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c index 149c356a50..6801ffb86a 100644 --- a/testsuites/tmtests/tm12/task1.c +++ b/testsuites/tmtests/tm12/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:16:00 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/tmtests/tm13/system.h b/testsuites/tmtests/tm13/system.h index c56c1b133e..4444a53c4c 100644 --- a/testsuites/tmtests/tm13/system.h +++ b/testsuites/tmtests/tm13/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:16:11 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c index 32ca67c785..45df61e2b1 100644 --- a/testsuites/tmtests/tm13/task1.c +++ b/testsuites/tmtests/tm13/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:16:13 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/tmtests/tm14/system.h b/testsuites/tmtests/tm14/system.h index 66fcd71c55..4444a53c4c 100644 --- a/testsuites/tmtests/tm14/system.h +++ b/testsuites/tmtests/tm14/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:16:22 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c index b4b2e1eabf..be27545d31 100644 --- a/testsuites/tmtests/tm14/task1.c +++ b/testsuites/tmtests/tm14/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:16:24 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/tmtests/tm15/system.h b/testsuites/tmtests/tm15/system.h index 189c611505..4444a53c4c 100644 --- a/testsuites/tmtests/tm15/system.h +++ b/testsuites/tmtests/tm15/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:16:33 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm16/system.h b/testsuites/tmtests/tm16/system.h index d4418f1722..4444a53c4c 100644 --- a/testsuites/tmtests/tm16/system.h +++ b/testsuites/tmtests/tm16/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:16:45 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm17/system.h b/testsuites/tmtests/tm17/system.h index 80209a3ee8..4444a53c4c 100644 --- a/testsuites/tmtests/tm17/system.h +++ b/testsuites/tmtests/tm17/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:16:57 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm18/system.h b/testsuites/tmtests/tm18/system.h index a4d3b338c0..4444a53c4c 100644 --- a/testsuites/tmtests/tm18/system.h +++ b/testsuites/tmtests/tm18/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:17:15 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm19/system.h b/testsuites/tmtests/tm19/system.h index d785e54f8c..4444a53c4c 100644 --- a/testsuites/tmtests/tm19/system.h +++ b/testsuites/tmtests/tm19/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:17:35 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm20/system.h b/testsuites/tmtests/tm20/system.h index 16aff61444..4444a53c4c 100644 --- a/testsuites/tmtests/tm20/system.h +++ b/testsuites/tmtests/tm20/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:17:56 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c index 97c1a13e0b..fdd44d510c 100644 --- a/testsuites/tmtests/tm20/task1.c +++ b/testsuites/tmtests/tm20/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:18:00 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/tmtests/tm21/system.h b/testsuites/tmtests/tm21/system.h index 478208437f..4444a53c4c 100644 --- a/testsuites/tmtests/tm21/system.h +++ b/testsuites/tmtests/tm21/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:18:16 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c index 4cdf738d09..9b8715aa83 100644 --- a/testsuites/tmtests/tm21/task1.c +++ b/testsuites/tmtests/tm21/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:18:19 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/tmtests/tm22/system.h b/testsuites/tmtests/tm22/system.h index 236315dac7..4444a53c4c 100644 --- a/testsuites/tmtests/tm22/system.h +++ b/testsuites/tmtests/tm22/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:18:37 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c index 981093efe1..21983d8818 100644 --- a/testsuites/tmtests/tm22/task1.c +++ b/testsuites/tmtests/tm22/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.2 1995/05/31 17:18:40 joel Exp + * $Id$ */ #include "system.h" diff --git a/testsuites/tmtests/tm23/system.h b/testsuites/tmtests/tm23/system.h index fff94be073..4444a53c4c 100644 --- a/testsuites/tmtests/tm23/system.h +++ b/testsuites/tmtests/tm23/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:18:54 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm24/system.h b/testsuites/tmtests/tm24/system.h index 6b3aaa8393..4444a53c4c 100644 --- a/testsuites/tmtests/tm24/system.h +++ b/testsuites/tmtests/tm24/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:19:07 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm25/system.h b/testsuites/tmtests/tm25/system.h index fe378e711b..4444a53c4c 100644 --- a/testsuites/tmtests/tm25/system.h +++ b/testsuites/tmtests/tm25/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:19:17 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm26/fptest.h b/testsuites/tmtests/tm26/fptest.h index 2001bcaca9..39b8438ef9 100644 --- a/testsuites/tmtests/tm26/fptest.h +++ b/testsuites/tmtests/tm26/fptest.h @@ -22,7 +22,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. * - * fptest.h,v 1.2 1995/05/31 17:19:26 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm26/system.h b/testsuites/tmtests/tm26/system.h index c46f55b939..f76f6855b5 100644 --- a/testsuites/tmtests/tm26/system.h +++ b/testsuites/tmtests/tm26/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:19:30 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c index b3962b07e8..6442017101 100644 --- a/testsuites/tmtests/tm26/task1.c +++ b/testsuites/tmtests/tm26/task1.c @@ -8,7 +8,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. * - * task1.c,v 1.3 1995/06/05 23:55:00 joel Exp + * $Id$ */ #include <rtems.h> diff --git a/testsuites/tmtests/tm27/system.h b/testsuites/tmtests/tm27/system.h index 25e9ac5656..4444a53c4c 100644 --- a/testsuites/tmtests/tm27/system.h +++ b/testsuites/tmtests/tm27/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:19:41 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm28/system.h b/testsuites/tmtests/tm28/system.h index 0f8d12b27a..4444a53c4c 100644 --- a/testsuites/tmtests/tm28/system.h +++ b/testsuites/tmtests/tm28/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:19:51 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tm29/system.h b/testsuites/tmtests/tm29/system.h index 2da585d5a1..4444a53c4c 100644 --- a/testsuites/tmtests/tm29/system.h +++ b/testsuites/tmtests/tm29/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:20:02 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tmck/system.h b/testsuites/tmtests/tmck/system.h index 4a8601897a..4444a53c4c 100644 --- a/testsuites/tmtests/tmck/system.h +++ b/testsuites/tmtests/tmck/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:20:12 joel Exp + * $Id$ */ diff --git a/testsuites/tmtests/tmoverhd/dumrtems.h b/testsuites/tmtests/tmoverhd/dumrtems.h index e90c5cef7f..d0492c1014 100644 --- a/testsuites/tmtests/tmoverhd/dumrtems.h +++ b/testsuites/tmtests/tmoverhd/dumrtems.h @@ -11,7 +11,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. * - * dumrtems.h,v 1.2 1995/05/31 17:20:21 joel Exp + * $Id$ */ #ifndef __DUMRTEMS_h diff --git a/testsuites/tmtests/tmoverhd/system.h b/testsuites/tmtests/tmoverhd/system.h index 8dc2b305b7..4444a53c4c 100644 --- a/testsuites/tmtests/tmoverhd/system.h +++ b/testsuites/tmtests/tmoverhd/system.h @@ -10,7 +10,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. * - * system.h,v 1.2 1995/05/31 17:20:26 joel Exp + * $Id$ */ |