From 37cd592b0fa2ffa777093db0c10c57ea2cd8665b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 4 Jul 2002 16:22:54 +0000 Subject: 2002-07-04 Joel Sherrill * Jump table for single entry point removed. * include/rtems/directives.h, src/entrytable.c: Removed. * include/Makefile.am, src/Makefile.am, src/exinit.c: Modified to reflect above. --- c/src/exec/sapi/ChangeLog | 7 ++ c/src/exec/sapi/include/Makefile.am | 4 +- c/src/exec/sapi/include/rtems/directives.h | 119 ----------------------------- c/src/exec/sapi/src/Makefile.am | 2 +- c/src/exec/sapi/src/entrytable.c | 105 ------------------------- c/src/exec/sapi/src/exinit.c | 1 - 6 files changed, 10 insertions(+), 228 deletions(-) delete mode 100644 c/src/exec/sapi/include/rtems/directives.h delete mode 100644 c/src/exec/sapi/src/entrytable.c (limited to 'c/src/exec/sapi') diff --git a/c/src/exec/sapi/ChangeLog b/c/src/exec/sapi/ChangeLog index 615ff4d32c..17075f75a3 100644 --- a/c/src/exec/sapi/ChangeLog +++ b/c/src/exec/sapi/ChangeLog @@ -1,3 +1,10 @@ +2002-07-04 Joel Sherrill + + * Jump table for single entry point removed. + * include/rtems/directives.h, src/entrytable.c: Removed. + * include/Makefile.am, src/Makefile.am, src/exinit.c: Modified to + reflect above. + 2002-07-01 Joel Sherrill * Mega patch merge to change the format of the object IDs to diff --git a/c/src/exec/sapi/include/Makefile.am b/c/src/exec/sapi/include/Makefile.am index 00eb710cea..b41bb64295 100644 --- a/c/src/exec/sapi/include/Makefile.am +++ b/c/src/exec/sapi/include/Makefile.am @@ -18,8 +18,8 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE) \ include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/config.h rtems/directives.h rtems/extension.h \ - rtems/fatal.h rtems/init.h rtems/io.h rtems/mptables.h rtems/sptables.h +include_rtems_HEADERS = rtems/config.h rtems/extension.h rtems/fatal.h \ + rtems/init.h rtems/io.h rtems/mptables.h rtems/sptables.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%) diff --git a/c/src/exec/sapi/include/rtems/directives.h b/c/src/exec/sapi/include/rtems/directives.h deleted file mode 100644 index 5c68f056e3..0000000000 --- a/c/src/exec/sapi/include/rtems/directives.h +++ /dev/null @@ -1,119 +0,0 @@ -/* directives.h - * - * The following definitions are the directive numbers used - * in the assembly interface. - * - * COPYRIGHT (c) 1989-1997 - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#ifndef __RTEMS_DIRECTIVES_h -#define __RTEMS_DIRECTIVES_h - -#ifdef __cplusplus -extern "C" { -#endif - -#define RTEMS_INITIALIZE_EXECUTIVE 0 -#define RTEMS_INITIALIZE_EXECUTIVE_EARLY 1 -#define RTEMS_INITIALIZE_EXECUTIVE_LATE 2 -#define RTEMS_SHUTDOWN_EXECUTIVE 3 -#define RTEMS_TASKS_CREATE 4 -#define RTEMS_TASKS_NAME_TO_ID 5 -#define RTEMS_TASKS_START 6 -#define RTEMS_TASKS_RESTART 7 -#define RTEMS_TASKS_DELETE 8 -#define RTEMS_TASKS_SUSPEND 9 -#define RTEMS_TASKS_RESUME 10 -#define RTEMS_TASKS_SET_PRIORITY 11 -#define RTEMS_TASKS_MODE 12 -#define RTEMS_TASKS_GET_NOTE 13 -#define RTEMS_TASKS_SET_NOTE 14 -#define RTEMS_TASKS_WAKE_AFTER 15 -#define RTEMS_TASKS_WAKE_WHEN 16 -#define RTEMS_INTERRUPT_CATCH 17 -#define RTEMS_CLOCK_SET 18 -#define RTEMS_CLOCK_GET 19 -#define RTEMS_CLOCK_TICK 20 -#define RTEMS_EXTENSION_CREATE 21 -#define RTEMS_EXTENSION_NAME_TO_ID 22 -#define RTEMS_EXTENSION_DELETE 23 -#define RTEMS_TIMER_CREATE 24 -#define RTEMS_TIMER_NAME_TO_ID 25 -#define RTEMS_TIMER_CANCEL 26 -#define RTEMS_TIMER_DELETE 27 -#define RTEMS_TIMER_FIRE_AFTER 28 -#define RTEMS_TIMER_FIRE_WHEN 29 -#define RTEMS_TIMER_RESET 30 -#define RTEMS_SEMAPHORE_CREATE 31 -#define RTEMS_SEMAPHORE_NAME_TO_ID 32 -#define RTEMS_SEMAPHORE_DELETE 33 -#define RTEMS_SEMAPHORE_OBTAIN 34 -#define RTEMS_SEMAPHORE_RELEASE 35 -#define RTEMS_MESSAGE_QUEUE_CREATE 36 -#define RTEMS_MESSAGE_QUEUE_NAME_TO_ID 37 -#define RTEMS_MESSAGE_QUEUE_DELETE 38 -#define RTEMS_MESSAGE_QUEUE_SEND 39 -#define RTEMS_MESSAGE_QUEUE_URGENT 40 -#define RTEMS_MESSAGE_QUEUE_BROADCAST 41 -#define RTEMS_MESSAGE_QUEUE_RECEIVE 42 -#define RTEMS_MESSAGE_QUEUE_FLUSH 43 -#define RTEMS_EVENT_SEND 44 -#define RTEMS_EVENT_RECEIVE 45 -#define RTEMS_SIGNAL_CATCH 46 -#define RTEMS_SIGNAL_SEND 47 -#define RTEMS_PARTITION_CREATE 48 -#define RTEMS_PARTITION_NAME_TO_ID 49 -#define RTEMS_PARTITION_DELETE 50 -#define RTEMS_PARTITION_GET_BUFFER 51 -#define RTEMS_PARTITION_RETURN_BUFFER 52 -#define RTEMS_REGION_CREATE 53 -#define RTEMS_REGION_EXTEND 54 -#define RTEMS_REGION_NAME_TO_ID 55 -#define RTEMS_REGION_DELETE 56 -#define RTEMS_REGION_GET_SEGMENT_SIZE 57 -#define RTEMS_REGION_GET_SEGMENT 58 -#define RTEMS_REGION_RETURN_SEGMENT 59 -#define RTEMS_DUAL_PORTED_MEMORY_CREATE 60 -#define RTEMS_DUAL_PORTED_MEMORY_NAME_TO_ID 61 -#define RTEMS_DUAL_PORTED_MEMORY_DELETE 62 -#define RTEMS_DUAL_PORTED_MEMORY_EXTERNAL_TO_INTERNAL 63 -#define RTEMS_DUAL_PORTED_MEMORY_INTERNAL_TO_EXTERNAL 64 -#define RTEMS_IO_INITIALIZE 65 -#define RTEMS_IO_REGISTER_NAME 66 -#define RTEMS_IO_LOOKUP_NAME 67 -#define RTEMS_IO_OPEN 68 -#define RTEMS_IO_CLOSE 69 -#define RTEMS_IO_READ 70 -#define RTEMS_IO_WRITE 71 -#define RTEMS_IO_CONTROL 72 -#define RTEMS_FATAL_ERROR_OCCURRED 73 -#define RTEMS_RATE_MONOTONIC_CREATE 74 -#define RTEMS_RATE_MONOTONIC_NAME_TO_ID 75 -#define RTEMS_RATE_MONOTONIC_DELETE 76 -#define RTEMS_RATE_MONOTONIC_CANCEL 77 -#define RTEMS_RATE_MONOTONIC_PERIOD 78 -#define RTEMS_MULTIPROCESSING_ANNOUNCE 79 -#define RTEMS_DEBUG_ENABLE 80 -#define RTEMS_DEBUG_DISABLE 81 - -#define RTEMS_NUMBER_OF_ENTRY_POINTS 82 - -/* - * The jump table of entry points into RTEMS directives. - */ - -extern const void *_Entry_points[ RTEMS_NUMBER_OF_ENTRY_POINTS ]; - -#ifdef __cplusplus -} -#endif - -#endif -/* end of directives.h */ diff --git a/c/src/exec/sapi/src/Makefile.am b/c/src/exec/sapi/src/Makefile.am index f3dc578524..a2fc897c85 100644 --- a/c/src/exec/sapi/src/Makefile.am +++ b/c/src/exec/sapi/src/Makefile.am @@ -5,7 +5,7 @@ EXTENSION_FILES = extension.c extensioncreate.c extensiondelete.c \ extensionident.c -C_FILES = debug.c entrytable.c $(EXTENSION_FILES) fatal.c exinit.c io.c \ +C_FILES = debug.c $(EXTENSION_FILES) fatal.c exinit.c io.c \ itronapi.c posixapi.c rtemsapi.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) diff --git a/c/src/exec/sapi/src/entrytable.c b/c/src/exec/sapi/src/entrytable.c deleted file mode 100644 index e54aed3b6e..0000000000 --- a/c/src/exec/sapi/src/entrytable.c +++ /dev/null @@ -1,105 +0,0 @@ -/* entrytable.c - * - * This include file contains the executive's entry table. - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include - -const void * _Entry_points[ RTEMS_NUMBER_OF_ENTRY_POINTS ] = { - (void *) rtems_initialize_executive, /* 0 */ - (void *) rtems_initialize_executive_early, /* 1 */ - (void *) rtems_initialize_executive_late, /* 2 */ - (void *) rtems_shutdown_executive, /* 3 */ - (void *) rtems_task_create, /* 4 */ - (void *) rtems_task_ident, /* 5 */ - (void *) rtems_task_start, /* 6 */ - (void *) rtems_task_restart, /* 7 */ - (void *) rtems_task_delete, /* 8 */ - (void *) rtems_task_suspend, /* 9 */ - (void *) rtems_task_resume, /* 10 */ - (void *) rtems_task_set_priority, /* 11 */ - (void *) rtems_task_mode, /* 12 */ - (void *) rtems_task_get_note, /* 13 */ - (void *) rtems_task_set_note, /* 14 */ - (void *) rtems_task_wake_after, /* 15 */ - (void *) rtems_task_wake_when, /* 16 */ - (void *) rtems_interrupt_catch, /* 17 */ - (void *) rtems_clock_set, /* 18 */ - (void *) rtems_clock_get, /* 19 */ - (void *) rtems_clock_tick, /* 20 */ - (void *) rtems_extension_create, /* 21 */ - (void *) rtems_extension_ident, /* 22 */ - (void *) rtems_extension_delete, /* 23 */ - (void *) rtems_timer_create, /* 24 */ - (void *) rtems_timer_ident, /* 25 */ - (void *) rtems_timer_cancel, /* 26 */ - (void *) rtems_timer_delete, /* 27 */ - (void *) rtems_timer_fire_after, /* 28 */ - (void *) rtems_timer_fire_when, /* 29 */ - (void *) rtems_timer_reset, /* 30 */ - (void *) rtems_semaphore_create, /* 31 */ - (void *) rtems_semaphore_ident, /* 32 */ - (void *) rtems_semaphore_delete, /* 33 */ - (void *) rtems_semaphore_obtain, /* 34 */ - (void *) rtems_semaphore_release, /* 35 */ - (void *) rtems_message_queue_create, /* 36 */ - (void *) rtems_message_queue_ident, /* 37 */ - (void *) rtems_message_queue_delete, /* 38 */ - (void *) rtems_message_queue_send, /* 39 */ - (void *) rtems_message_queue_urgent, /* 40 */ - (void *) rtems_message_queue_broadcast, /* 41 */ - (void *) rtems_message_queue_receive, /* 42 */ - (void *) rtems_message_queue_flush, /* 43 */ - (void *) rtems_event_send, /* 44 */ - (void *) rtems_event_receive, /* 45 */ - (void *) rtems_signal_catch, /* 46 */ - (void *) rtems_signal_send, /* 47 */ - (void *) rtems_partition_create, /* 48 */ - (void *) rtems_partition_ident, /* 49 */ - (void *) rtems_partition_delete, /* 50 */ - (void *) rtems_partition_get_buffer, /* 51 */ - (void *) rtems_partition_return_buffer, /* 52 */ - (void *) rtems_region_create, /* 53 */ - (void *) rtems_region_extend, /* 54 */ - (void *) rtems_region_ident, /* 55 */ - (void *) rtems_region_delete, /* 56 */ - (void *) rtems_region_get_segment, /* 57 */ - (void *) rtems_region_get_segment_size, /* 58 */ - (void *) rtems_region_return_segment, /* 59 */ - (void *) rtems_port_create, /* 60 */ - (void *) rtems_port_ident, /* 61 */ - (void *) rtems_port_delete, /* 62 */ - (void *) rtems_port_external_to_internal, /* 63 */ - (void *) rtems_port_internal_to_external, /* 64 */ - (void *) rtems_io_initialize, /* 65 */ - (void *) rtems_io_register_name, /* 66 */ - (void *) rtems_io_lookup_name, /* 67 */ - (void *) rtems_io_open, /* 68 */ - (void *) rtems_io_close, /* 69 */ - (void *) rtems_io_read, /* 70 */ - (void *) rtems_io_write, /* 71 */ - (void *) rtems_io_control, /* 72 */ - (void *) rtems_fatal_error_occurred, /* 73 */ - (void *) rtems_rate_monotonic_create, /* 74 */ - (void *) rtems_rate_monotonic_ident, /* 75 */ - (void *) rtems_rate_monotonic_delete, /* 76 */ - (void *) rtems_rate_monotonic_cancel, /* 77 */ - (void *) rtems_rate_monotonic_period, /* 78 */ -#if defined(RTEMS_MULTIPROCESSING) - (void *) rtems_multiprocessing_announce, /* 79 */ -#else - (void *) NULL, /* 79 */ -#endif - (void *) rtems_debug_enable, /* 80 */ - (void *) rtems_debug_disable /* 81 */ -}; diff --git a/c/src/exec/sapi/src/exinit.c b/c/src/exec/sapi/src/exinit.c index 2bc61afb09..8206e174c2 100644 --- a/c/src/exec/sapi/src/exinit.c +++ b/c/src/exec/sapi/src/exinit.c @@ -44,7 +44,6 @@ #include #include -#include #include -- cgit v1.2.3