Support for variable length names added to Object Handler. This supports

both fixed length "raw" names and strings from the API's point of view.

Both inline and macro implementations were tested.

4 files changed, 19 insertions, 13 deletions

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
   );