Split Signal Manager into one routine per file.

4 files changed, 158 insertions, 109 deletions

diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in
index 115fe268fe..25368bfdbe 100644
--- a/c/src/exec/rtems/src/Makefile.in
+++ b/c/src/exec/rtems/src/Makefile.in
@@ -43,6 +43,9 @@ SEMAPHORE_PIECES=\
 EVENT_PIECES=\
   event eventreceive eventseize eventsend eventsurrender eventtimeout
 
+SIGNAL_PIECES=\
+  signal signalcatch signalsend
+
 RATEMON_PIECES=\
   ratemon ratemoncancel ratemoncreate ratemondelete ratemongetstatus \
   ratemonident ratemonperiod ratemontimeout
@@ -63,7 +66,7 @@ C_PIECES=\
   intr intrbody \
   $(CLOCK_PIECES) $(TIMER_PIECES) \
   $(SEMAPHORE_PIECES) $(MESSAGE_QUEUE_PIECES) \
-  $(EVENT_PIECES) signal
+  $(EVENT_PIECES) $(SIGNAL_PIECES) \
   $(PARTITION_PIECES) $(REGION_PIECES) $(DPMEM_PIECES) \
   $(MP_PIECES)
 C_FILES=$(C_PIECES:%=%.c)
diff --git a/c/src/exec/rtems/src/signal.c b/c/src/exec/rtems/src/signal.c
index 120233d2d5..c71afdc643 100644
--- a/c/src/exec/rtems/src/signal.c
+++ b/c/src/exec/rtems/src/signal.c
@@ -46,111 +46,3 @@ void _Signal_Manager_initialization( void )
   );
 #endif
 }
- 
-/*PAGE
- *
- *  rtems_signal_catch
- *
- *  This directive allows a thread to specify what action to take when
- *  catching signals.
- *
- *  Input parameters:
- *    handler  - address of asynchronous signal routine (asr)
- *              ( NULL indicates asr is invalid )
- *    mode_set - mode value for asr
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - always succeeds
- */
-
-rtems_status_code rtems_signal_catch(
-  rtems_asr_entry   asr_handler,
-  rtems_mode        mode_set
-)
-{
-  Thread_Control     *executing;
-  RTEMS_API_Control  *api;
-  ASR_Information    *asr;
-
-/* XXX normalize mode */
-  executing = _Thread_Executing;
-  api = executing->API_Extensions[ THREAD_API_RTEMS ];
-  asr = &api->Signal;
-
-  _Thread_Disable_dispatch(); /* cannot reschedule while */
-                              /*   the thread is inconsistent */
-
-  if ( !_ASR_Is_null_handler( asr_handler ) ) {
-    asr->mode_set = mode_set;
-    asr->handler = asr_handler;
-  }
-  else
-    _ASR_Initialize( asr );
-  _Thread_Enable_dispatch();
-  return RTEMS_SUCCESSFUL;
-}
-
-/*PAGE
- *
- *  rtems_signal_send
- *
- *  This directive allows a thread to send signals to a thread.
- *
- *  Input parameters:
- *    id         - thread id
- *    signal_set - signal set
- *
- *  Output parameters:
- *    RTEMS_SUCCESSFUL - if successful
- *    error code - if unsuccessful
- */
-
-rtems_status_code rtems_signal_send(
-  Objects_Id             id,
-  rtems_signal_set signal_set
-)
-{
-  register Thread_Control *the_thread;
-  Objects_Locations        location;
-  RTEMS_API_Control       *api;
-  ASR_Information         *asr;
-
-  the_thread = _Thread_Get( id, &location );
-  switch ( location ) {
-
-    case OBJECTS_REMOTE:
-#if defined(RTEMS_MULTIPROCESSING)
-      return _Signal_MP_Send_request_packet(
-        SIGNAL_MP_SEND_REQUEST,
-        id,
-        signal_set
-      );
-#endif
-
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
-
-    case OBJECTS_LOCAL:
-      api = the_thread->API_Extensions[ THREAD_API_RTEMS ];
-      asr = &api->Signal;
-
-      if ( ! _ASR_Is_null_handler( asr->handler ) ) {
-        if ( asr->is_enabled ) {
-          _ASR_Post_signals( signal_set, &asr->signals_posted );
-
-          the_thread->do_post_task_switch_extension = TRUE;
-
-          if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) )
-            _ISR_Signals_to_thread_executing = TRUE;
-        } else {
-          _ASR_Post_signals( signal_set, &asr->signals_pending );
-        }
-        _Thread_Enable_dispatch();
-        return RTEMS_SUCCESSFUL;
-      }
-      _Thread_Enable_dispatch();
-      return RTEMS_NOT_DEFINED;
-  }
-
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
-}
diff --git a/c/src/exec/rtems/src/signalcatch.c b/c/src/exec/rtems/src/signalcatch.c
new file mode 100644
index 0000000000..ee2327187a
--- /dev/null
+++ b/c/src/exec/rtems/src/signalcatch.c
@@ -0,0 +1,66 @@
+/*
+ *  Signal Manager
+ *
+ *
+ *  COPYRIGHT (c) 1989-1998.
+ *  On-Line Applications Research Corporation (OAR).
+ *  Copyright assigned to U.S. Government, 1994.
+ *
+ *  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 <rtems/system.h>
+#include <rtems/rtems/status.h>
+#include <rtems/rtems/asr.h>
+#include <rtems/score/isr.h>
+#include <rtems/rtems/modes.h>
+#include <rtems/rtems/signal.h>
+#include <rtems/score/thread.h>
+#include <rtems/rtems/tasks.h>
+
+/*PAGE
+ *
+ *  rtems_signal_catch
+ *
+ *  This directive allows a thread to specify what action to take when
+ *  catching signals.
+ *
+ *  Input parameters:
+ *    handler  - address of asynchronous signal routine (asr)
+ *              ( NULL indicates asr is invalid )
+ *    mode_set - mode value for asr
+ *
+ *  Output parameters:
+ *    RTEMS_SUCCESSFUL - always succeeds
+ */
+
+rtems_status_code rtems_signal_catch(
+  rtems_asr_entry   asr_handler,
+  rtems_mode        mode_set
+)
+{
+  Thread_Control     *executing;
+  RTEMS_API_Control  *api;
+  ASR_Information    *asr;
+
+/* XXX normalize mode */
+  executing = _Thread_Executing;
+  api = executing->API_Extensions[ THREAD_API_RTEMS ];
+  asr = &api->Signal;
+
+  _Thread_Disable_dispatch(); /* cannot reschedule while */
+                              /*   the thread is inconsistent */
+
+  if ( !_ASR_Is_null_handler( asr_handler ) ) {
+    asr->mode_set = mode_set;
+    asr->handler = asr_handler;
+  }
+  else
+    _ASR_Initialize( asr );
+  _Thread_Enable_dispatch();
+  return RTEMS_SUCCESSFUL;
+}
diff --git a/c/src/exec/rtems/src/signalsend.c b/c/src/exec/rtems/src/signalsend.c
new file mode 100644
index 0000000000..1191f4e7f6
--- /dev/null
+++ b/c/src/exec/rtems/src/signalsend.c
@@ -0,0 +1,88 @@
+/*
+ *  Signal Manager
+ *
+ *
+ *  COPYRIGHT (c) 1989-1998.
+ *  On-Line Applications Research Corporation (OAR).
+ *  Copyright assigned to U.S. Government, 1994.
+ *
+ *  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 <rtems/system.h>
+#include <rtems/rtems/status.h>
+#include <rtems/rtems/asr.h>
+#include <rtems/score/isr.h>
+#include <rtems/rtems/modes.h>
+#include <rtems/rtems/signal.h>
+#include <rtems/score/thread.h>
+#include <rtems/rtems/tasks.h>
+
+/*PAGE
+ *
+ *  rtems_signal_send
+ *
+ *  This directive allows a thread to send signals to a thread.
+ *
+ *  Input parameters:
+ *    id         - thread id
+ *    signal_set - signal set
+ *
+ *  Output parameters:
+ *    RTEMS_SUCCESSFUL - if successful
+ *    error code - if unsuccessful
+ */
+
+rtems_status_code rtems_signal_send(
+  Objects_Id             id,
+  rtems_signal_set signal_set
+)
+{
+  register Thread_Control *the_thread;
+  Objects_Locations        location;
+  RTEMS_API_Control       *api;
+  ASR_Information         *asr;
+
+  the_thread = _Thread_Get( id, &location );
+  switch ( location ) {
+
+    case OBJECTS_REMOTE:
+#if defined(RTEMS_MULTIPROCESSING)
+      return _Signal_MP_Send_request_packet(
+        SIGNAL_MP_SEND_REQUEST,
+        id,
+        signal_set
+      );
+#endif
+
+    case OBJECTS_ERROR:
+      return RTEMS_INVALID_ID;
+
+    case OBJECTS_LOCAL:
+      api = the_thread->API_Extensions[ THREAD_API_RTEMS ];
+      asr = &api->Signal;
+
+      if ( ! _ASR_Is_null_handler( asr->handler ) ) {
+        if ( asr->is_enabled ) {
+          _ASR_Post_signals( signal_set, &asr->signals_posted );
+
+          the_thread->do_post_task_switch_extension = TRUE;
+
+          if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) )
+            _ISR_Signals_to_thread_executing = TRUE;
+        } else {
+          _ASR_Post_signals( signal_set, &asr->signals_pending );
+        }
+        _Thread_Enable_dispatch();
+        return RTEMS_SUCCESSFUL;
+      }
+      _Thread_Enable_dispatch();
+      return RTEMS_NOT_DEFINED;
+  }
+
+  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
+}