User extension API: add const to some params, inline _User_extensions_Add_API_set

3 files changed, 12 insertions, 57 deletions

diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index a86f2a323e..c61e1dcca8 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -196,7 +196,7 @@ libscore_a_SOURCES += src/watchdog.c src/watchdogadjust.c \
     src/watchdogtickle.c src/watchdogreport.c src/watchdogreportchain.c
 
 ## USEREXT_C_FILES
-libscore_a_SOURCES += src/userextaddset.c src/userextaddapiset.c \
+libscore_a_SOURCES += src/userextaddset.c \
     src/userext.c src/userextremoveset.c src/userextthreadbegin.c \
     src/userextthreadcreate.c src/userextthreaddelete.c \
     src/userextthreadrestart.c src/userextthreadstart.c \
diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/score/include/rtems/score/userext.h
index 863d86ed9a..e16a259997 100644
--- a/cpukit/score/include/rtems/score/userext.h
+++ b/cpukit/score/include/rtems/score/userext.h
@@ -173,12 +173,12 @@ typedef void( *User_extensions_thread_exitted_extension )(
 );
 
 /**
- * @brief Task fatal error extension.
+ * @brief Fatal error extension.
  *
  * It corresponds to _Internal_error_Occurred() (used by the
  * rtems_fatal_error_occurred() directive).  The first parameter contains the
- * internal error source.  The second parameter indicates if it was an internal
- * error.  The third parameter contains the error code.
+ * error source.  The second parameter indicates if it was an internal error.
+ * The third parameter contains the error code.
  *
  * This extension should not call any RTEMS directives.
  */
@@ -246,19 +246,16 @@ void _User_extensions_Add_set(
   User_extensions_Control *extension
 );
 
-/** @brief User extensions Add to API extension set
- *
- *  This routine is used to add an API extension set to the active list.
- *
- *  @param[in] the_extension is the extension set to add
- */
-void _User_extensions_Add_API_set (
-  User_extensions_Control *the_extension
-);
+RTEMS_INLINE_ROUTINE void _User_extensions_Add_API_set(
+  User_extensions_Control *extension
+)
+{
+  _User_extensions_Add_set( extension );
+}
 
 RTEMS_INLINE_ROUTINE void _User_extensions_Add_set_with_table(
-  User_extensions_Control *extension,
-  User_extensions_Table   *extension_table
+  User_extensions_Control     *extension,
+  const User_extensions_Table *extension_table
 )
 {
   extension->Callouts = *extension_table;
diff --git a/cpukit/score/src/userextaddapiset.c b/cpukit/score/src/userextaddapiset.c
deleted file mode 100644
index 954571f8af..0000000000
--- a/cpukit/score/src/userextaddapiset.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  COPYRIGHT (c) 1989-2009.
- *  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.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <rtems/system.h>
-#include <rtems/score/userext.h>
-
-/**
- *  This routine is used to add an API extension set to the active list.
- */
-void _User_extensions_Add_API_set (
-  User_extensions_Control *the_extension
-)
-{
-  _Chain_Append( &_User_extensions_List, &the_extension->Node );
-
-  /*
-   *  If a switch handler is present, append it to the switch chain.
-   *
-   *  NOTE: The Classic API has an extension.  Neither POSIX nor ITRON do.
-   *        So if they are not configured, then do not check for NULL.
-   */
-#if defined(RTEMS_POSIX_API) || defined(RTEMS_ITRON_API)
-  if ( the_extension->Callouts.thread_switch != NULL )
-#endif
-  {
-    the_extension->Switch.thread_switch = the_extension->Callouts.thread_switch;
-    _Chain_Append(
-      &_User_extensions_Switches_list, &the_extension->Switch.Node );
-  }
-}