2009-09-25 Sebastian Huber <Sebastian.Huber@embedded-brains.de>

	* sapi/include/rtems/extension.h, sapi/src/extensiondelete.c,
	sapi/src/extensionident.c, sapi/src/extensioncreate.c,
	sapi/inline/rtems/extension.inl, score/include/rtems/score/userext.h,
	score/src/userextthreaddelete.c, score/src/userext.c,
	score/src/userextthreadcreate.c, score/src/userextremoveset.c,
	score/src/userextthreadbegin.c, score/src/userextaddset.c,
	score/src/userextthreadstart.c, score/src/userextthreadswitch.c,
	score/src/userextthreadrestart.c: Documentation. The types
	User_extensions_routine and rtems_extension are now deprecated.
	Removed unused types User_extensions_thread_post_switch_extension and
	rtems_task_post_switch_extension. Renamed _User_extensions_Add_API_set()
	in _User_extensions_Add_set(). Renamed _User_extensions_Add_set() in
	_User_extensions_Add_set_with_table().
	* score/src/userextaddapiset.c: Removed file.
	* score/Makefile.am: Update.

9 files changed, 78 insertions, 65 deletions

diff --git a/cpukit/score/src/userext.c b/cpukit/score/src/userext.c
index 190c15f85f..9b778b6300 100644
--- a/cpukit/score/src/userext.c
+++ b/cpukit/score/src/userext.c
@@ -1,3 +1,11 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreUserExt
+ *
+ * @brief User Extension Handler implementation.
+ */
+
 /*
  *  COPYRIGHT (c) 1989-2008.
  *  On-Line Applications Research Corporation (OAR).
@@ -19,10 +27,6 @@
 #include <rtems/score/wkspace.h>
 #include <string.h>
 
-/**
- *  This routine performs the initialization necessary for this handler.
- */
-
 void _User_extensions_Handler_initialization(void)
 {
   User_extensions_Control *extension;
@@ -49,7 +53,7 @@ void _User_extensions_Handler_initialization(void)
     );
   
     for ( i = 0 ; i < number_of_extensions ; i++ ) {
-      _User_extensions_Add_set (extension, &initial_extensions[i]);
+      _User_extensions_Add_set_with_table (extension, &initial_extensions[i]);
       extension++;
     }
   }
diff --git a/cpukit/score/src/userextaddset.c b/cpukit/score/src/userextaddset.c
index 516477a50e..fd732e73c4 100644
--- a/cpukit/score/src/userextaddset.c
+++ b/cpukit/score/src/userextaddset.c
@@ -1,3 +1,11 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreUserExt
+ *
+ * @brief User Extension Handler implementation.
+ */
+
 /*
  *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
@@ -16,28 +24,19 @@
 #include <rtems/system.h>
 #include <rtems/score/userext.h>
 
-/**
- *  This routine is used to add a user extension set to the active list.
- *
- *  @note Must be before _User_extensions_Handler_initialization to
- *        ensure proper inlining.
- */
-
-void _User_extensions_Add_set (
-  User_extensions_Control *the_extension,
-  User_extensions_Table   *extension_table
+void _User_extensions_Add_set(
+  User_extensions_Control *the_extension
 )
 {
-  the_extension->Callouts = *extension_table;
-
   _Chain_Append( &_User_extensions_List, &the_extension->Node );
 
   /*
    * If a switch handler is present, append it to the switch chain.
    */
 
-  if ( extension_table->thread_switch != NULL ) {
-    the_extension->Switch.thread_switch = extension_table->thread_switch;
+  if ( the_extension->Callouts.thread_switch != NULL ) {
+    the_extension->Switch.thread_switch =
+      the_extension->Callouts.thread_switch;
     _Chain_Append(
       &_User_extensions_Switches_list,
       &the_extension->Switch.Node
diff --git a/cpukit/score/src/userextremoveset.c b/cpukit/score/src/userextremoveset.c
index dcff2ef626..4466007c25 100644
--- a/cpukit/score/src/userextremoveset.c
+++ b/cpukit/score/src/userextremoveset.c
@@ -1,3 +1,11 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreUserExt
+ *
+ * @brief User Extension Handler implementation.
+ */
+
 /*
  *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
@@ -16,10 +24,6 @@
 #include <rtems/system.h>
 #include <rtems/score/userext.h>
 
-/**
- *  This routine is used to remove a user extension set from the active list.
- */
-
 void _User_extensions_Remove_set (
   User_extensions_Control  *the_extension
 )
diff --git a/cpukit/score/src/userextthreadbegin.c b/cpukit/score/src/userextthreadbegin.c
index 7c36604d2a..eacdc15706 100644
--- a/cpukit/score/src/userextthreadbegin.c
+++ b/cpukit/score/src/userextthreadbegin.c
@@ -1,3 +1,11 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreUserExt
+ *
+ * @brief User Extension Handler implementation.
+ */
+
 /*
  *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
@@ -16,12 +24,6 @@
 #include <rtems/system.h>
 #include <rtems/score/userext.h>
 
-/*PAGE
- *
- *  _User_extensions_Thread_begin
- *
- */
-
 void _User_extensions_Thread_begin (
   Thread_Control *executing
 )
@@ -40,11 +42,6 @@ void _User_extensions_Thread_begin (
   }
 }
 
-/*PAGE
- *
- *  _User_extensions_Thread_exitted
- */
-
 void _User_extensions_Thread_exitted (
   Thread_Control *executing
 )
@@ -63,11 +60,6 @@ void _User_extensions_Thread_exitted (
   }
 }
 
-/*PAGE
- *
- *  _User_extensions_Fatal
- */
-
 void _User_extensions_Fatal (
   Internal_errors_Source  the_source,
   bool                    is_internal,
diff --git a/cpukit/score/src/userextthreadcreate.c b/cpukit/score/src/userextthreadcreate.c
index 2b6c3f21c7..b7e7e6e855 100644
--- a/cpukit/score/src/userextthreadcreate.c
+++ b/cpukit/score/src/userextthreadcreate.c
@@ -1,3 +1,11 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreUserExt
+ *
+ * @brief User Extension Handler implementation.
+ */
+
 /*
  *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
@@ -16,11 +24,6 @@
 #include <rtems/system.h>
 #include <rtems/score/userext.h>
 
-/*PAGE
- *
- *  _User_extensions_Thread_create
- */
-
 bool _User_extensions_Thread_create (
   Thread_Control *the_thread
 )
diff --git a/cpukit/score/src/userextthreaddelete.c b/cpukit/score/src/userextthreaddelete.c
index 4f7214805b..393580f3ab 100644
--- a/cpukit/score/src/userextthreaddelete.c
+++ b/cpukit/score/src/userextthreaddelete.c
@@ -1,3 +1,11 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreUserExt
+ *
+ * @brief User Extension Handler implementation.
+ */
+
 /*
  *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
@@ -16,11 +24,6 @@
 #include <rtems/system.h>
 #include <rtems/score/userext.h>
 
-/*PAGE
- *
- *  _User_extensions_Thread_delete
- */
-
 void _User_extensions_Thread_delete (
   Thread_Control *the_thread
 )
diff --git a/cpukit/score/src/userextthreadrestart.c b/cpukit/score/src/userextthreadrestart.c
index d8af932cf2..f159c8bb0e 100644
--- a/cpukit/score/src/userextthreadrestart.c
+++ b/cpukit/score/src/userextthreadrestart.c
@@ -1,3 +1,11 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreUserExt
+ *
+ * @brief User Extension Handler implementation.
+ */
+
 /*
  *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
@@ -16,12 +24,6 @@
 #include <rtems/system.h>
 #include <rtems/score/userext.h>
 
-/*PAGE
- *
- *  _User_extensions_Thread_restart
- *
- */
-
 void _User_extensions_Thread_restart (
   Thread_Control *the_thread
 )
diff --git a/cpukit/score/src/userextthreadstart.c b/cpukit/score/src/userextthreadstart.c
index 1534571344..e6364e158a 100644
--- a/cpukit/score/src/userextthreadstart.c
+++ b/cpukit/score/src/userextthreadstart.c
@@ -1,3 +1,11 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreUserExt
+ *
+ * @brief User Extension Handler implementation.
+ */
+
 /*
  *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
@@ -16,12 +24,6 @@
 #include <rtems/system.h>
 #include <rtems/score/userext.h>
 
-/*PAGE
- *
- *  _User_extensions_Thread_start
- *
- */
-
 void _User_extensions_Thread_start (
   Thread_Control *the_thread
 )
diff --git a/cpukit/score/src/userextthreadswitch.c b/cpukit/score/src/userextthreadswitch.c
index 2a88c9f4f9..e7896e79a0 100644
--- a/cpukit/score/src/userextthreadswitch.c
+++ b/cpukit/score/src/userextthreadswitch.c
@@ -1,3 +1,11 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreUserExt
+ *
+ * @brief User Extension Handler implementation.
+ */
+
 /*
  *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
@@ -16,10 +24,6 @@
 #include <rtems/system.h>
 #include <rtems/score/userext.h>
 
-/**
- *  This routine is used to invoke the user extension which
- *  is invoked when a context switch occurs.
- */
 void _User_extensions_Thread_switch (
   Thread_Control *executing,
   Thread_Control *heir