From f05eeb2091803b17f89045a685028e9e403f06eb Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 19 Apr 2016 13:39:00 +0200
Subject: score: Simplify _Objects_Initialize_information()

Remove unused supports_global parameter.  Convert
_Objects_Initialize_information() to a macro to avoid use of
RTEMS_MULTIPROCESSING define for each caller.
---
 cpukit/rtems/src/barrier.c    | 6 +-----
 cpukit/rtems/src/dpmem.c      | 6 +-----
 cpukit/rtems/src/msg.c        | 6 +-----
 cpukit/rtems/src/part.c       | 6 +-----
 cpukit/rtems/src/ratemon.c    | 6 +-----
 cpukit/rtems/src/region.c     | 6 +-----
 cpukit/rtems/src/rtemstimer.c | 6 +-----
 cpukit/rtems/src/sem.c        | 6 +-----
 cpukit/rtems/src/tasks.c      | 4 ----
 9 files changed, 8 insertions(+), 44 deletions(-)

(limited to 'cpukit/rtems/src')

diff --git a/cpukit/rtems/src/barrier.c b/cpukit/rtems/src/barrier.c
index 6c85f4743e..a2912389e9 100644
--- a/cpukit/rtems/src/barrier.c
+++ b/cpukit/rtems/src/barrier.c
@@ -40,12 +40,8 @@ static void _Barrier_Manager_initialization(void)
                                    /* maximum objects of this class */
     sizeof( Barrier_Control ),     /* size of this object's control block */
     false,                         /* true if the name is a string */
-    RTEMS_MAXIMUM_NAME_LENGTH      /* maximum length of an object name */
-#if defined(RTEMS_MULTIPROCESSING)
-    ,
-    false,                         /* true if this is a global object class */
+    RTEMS_MAXIMUM_NAME_LENGTH,     /* maximum length of an object name */
     NULL                           /* Proxy extraction support callout */
-#endif
   );
 }
 
diff --git a/cpukit/rtems/src/dpmem.c b/cpukit/rtems/src/dpmem.c
index aca71a3a1f..2522a59951 100644
--- a/cpukit/rtems/src/dpmem.c
+++ b/cpukit/rtems/src/dpmem.c
@@ -38,12 +38,8 @@ static void _Dual_ported_memory_Manager_initialization(void)
     sizeof( Dual_ported_memory_Control ),
                                   /* size of this object's control block */
     false,                        /* true if names of this object are strings */
-    RTEMS_MAXIMUM_NAME_LENGTH     /* maximum length of each object's name */
-#if defined(RTEMS_MULTIPROCESSING)
-    ,
-    false,                        /* true if this is a global object class */
+    RTEMS_MAXIMUM_NAME_LENGTH,    /* maximum length of each object's name */
     NULL                          /* Proxy extraction support callout */
-#endif
   );
 }
 
diff --git a/cpukit/rtems/src/msg.c b/cpukit/rtems/src/msg.c
index acb6c37601..44a0727ea4 100644
--- a/cpukit/rtems/src/msg.c
+++ b/cpukit/rtems/src/msg.c
@@ -40,13 +40,9 @@ static void _Message_queue_Manager_initialization(void)
     sizeof( Message_queue_Control ),
                                   /* size of this object's control block */
     false,                        /* true if names of this object are strings */
-    RTEMS_MAXIMUM_NAME_LENGTH     /* maximum length of each object's name */
-#if defined(RTEMS_MULTIPROCESSING)
-    ,
-    true,                         /* true if this is a global object class */
+    RTEMS_MAXIMUM_NAME_LENGTH,    /* maximum length of each object's name */
     _Message_queue_MP_Send_extract_proxy
                                   /* Proxy extraction support callout */
-#endif
   );
 
   /*
diff --git a/cpukit/rtems/src/part.c b/cpukit/rtems/src/part.c
index 211c1176e9..4df676ed7a 100644
--- a/cpukit/rtems/src/part.c
+++ b/cpukit/rtems/src/part.c
@@ -37,12 +37,8 @@ static void _Partition_Manager_initialization(void)
                                  /* maximum objects of this class */
     sizeof( Partition_Control ), /* size of this object's control block */
     false,                       /* true if the name is a string */
-    RTEMS_MAXIMUM_NAME_LENGTH    /* maximum length of an object name */
-#if defined(RTEMS_MULTIPROCESSING)
-    ,
-    true,                        /* true if this is a global object class */
+    RTEMS_MAXIMUM_NAME_LENGTH,   /* maximum length of an object name */
     _Partition_MP_Send_extract_proxy  /* Proxy extraction support callout */
-#endif
   );
 
   /*
diff --git a/cpukit/rtems/src/ratemon.c b/cpukit/rtems/src/ratemon.c
index b0d248f18a..dd3ca29cdd 100644
--- a/cpukit/rtems/src/ratemon.c
+++ b/cpukit/rtems/src/ratemon.c
@@ -37,12 +37,8 @@ static void _Rate_monotonic_Manager_initialization(void)
                                      /* maximum objects of this class */
     sizeof( Rate_monotonic_Control ),/* size of this object's control block */
     false,                           /* true if the name is a string */
-    RTEMS_MAXIMUM_NAME_LENGTH        /* maximum length of an object name */
-#if defined(RTEMS_MULTIPROCESSING)
-    ,
-    false,                           /* true if this is a global object class */
+    RTEMS_MAXIMUM_NAME_LENGTH,       /* maximum length of an object name */
     NULL                             /* Proxy extraction support callout */
-#endif
   );
 }
 
diff --git a/cpukit/rtems/src/region.c b/cpukit/rtems/src/region.c
index f1c2b23a21..65933f93bc 100644
--- a/cpukit/rtems/src/region.c
+++ b/cpukit/rtems/src/region.c
@@ -48,12 +48,8 @@ static void _Region_Manager_initialization(void)
                                /* maximum objects of this class */
     sizeof( Region_Control ),  /* size of this object's control block */
     false,                     /* true if the name is a string */
-    RTEMS_MAXIMUM_NAME_LENGTH  /* maximum length of an object name */
-#if defined(RTEMS_MULTIPROCESSING)
-    ,
-    false,                     /* true if this is a global object class */
+    RTEMS_MAXIMUM_NAME_LENGTH, /* maximum length of an object name */
     NULL                       /* Proxy extraction support callout */
-#endif
   );
 
   /*
diff --git a/cpukit/rtems/src/rtemstimer.c b/cpukit/rtems/src/rtemstimer.c
index f591c25af2..d60e4a9b48 100644
--- a/cpukit/rtems/src/rtemstimer.c
+++ b/cpukit/rtems/src/rtemstimer.c
@@ -39,12 +39,8 @@ static void _Timer_Manager_initialization(void)
                                /* maximum objects of this class */
     sizeof( Timer_Control ),   /* size of this object's control block */
     false,                     /* true if the name is a string */
-    RTEMS_MAXIMUM_NAME_LENGTH  /* maximum length of an object name */
-#if defined(RTEMS_MULTIPROCESSING)
-    ,
-    false,                     /* true if this is a global object class */
+    RTEMS_MAXIMUM_NAME_LENGTH, /* maximum length of an object name */
     NULL                       /* Proxy extraction support callout */
-#endif
   );
 }
 
diff --git a/cpukit/rtems/src/sem.c b/cpukit/rtems/src/sem.c
index 13615eb8bd..a221852928 100644
--- a/cpukit/rtems/src/sem.c
+++ b/cpukit/rtems/src/sem.c
@@ -39,12 +39,8 @@ static void _Semaphore_Manager_initialization(void)
                                  /* maximum objects of this class */
     sizeof( Semaphore_Control ), /* size of this object's control block */
     false,                       /* true if the name is a string */
-    RTEMS_MAXIMUM_NAME_LENGTH    /* maximum length of an object name */
-#if defined(RTEMS_MULTIPROCESSING)
-    ,
-    true,                        /* true if this is a global object class */
+    RTEMS_MAXIMUM_NAME_LENGTH,   /* maximum length of an object name */
     _Semaphore_MP_Send_extract_proxy /* Proxy extraction support callout */
-#endif
   );
 
   /*
diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c
index 832228e8aa..f18e0ab3db 100644
--- a/cpukit/rtems/src/tasks.c
+++ b/cpukit/rtems/src/tasks.c
@@ -185,10 +185,6 @@ static void _RTEMS_tasks_Manager_initialization(void)
                                /* maximum objects of this class */
     false,                     /* true if the name is a string */
     RTEMS_MAXIMUM_NAME_LENGTH  /* maximum length of an object name */
-#if defined(RTEMS_MULTIPROCESSING)
-    ,
-    true                       /* true if this is a global object class */
-#endif
   );
 
   /*
-- 
cgit v1.2.3