From dd9e50102b6829c018b6ea24e925cf26e924273f Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 10 Dec 2019 11:26:20 +0100
Subject: score: Add _Objects_Activate_unlimited()

Update #3835.
---
 cpukit/include/rtems/score/objectimpl.h    | 30 ++++++++++++++++++++++++++++++
 cpukit/score/src/objectallocateunlimited.c | 13 +------------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/cpukit/include/rtems/score/objectimpl.h b/cpukit/include/rtems/score/objectimpl.h
index d4d6347ea8..e0fd7882c2 100644
--- a/cpukit/include/rtems/score/objectimpl.h
+++ b/cpukit/include/rtems/score/objectimpl.h
@@ -937,6 +937,36 @@ RTEMS_INLINE_ROUTINE void _Objects_Free(
   ( *information->free )( information, the_object );
 }
 
+/**
+ * @brief Activate the object.
+ *
+ * This function must be only used in case this objects information supports
+ * unlimited objects.
+ *
+ * @param information The object information block.
+ * @param the_object The object to activate.
+ */
+RTEMS_INLINE_ROUTINE void _Objects_Activate_unlimited(
+  Objects_Information *information,
+  Objects_Control     *the_object
+)
+{
+  Objects_Maximum objects_per_block;
+  Objects_Maximum block;
+
+  _Assert( _Objects_Is_auto_extend( information ) );
+
+  objects_per_block = information->objects_per_block;
+  block = _Objects_Get_index( the_object->id ) - OBJECTS_INDEX_MINIMUM;
+
+  if ( block > objects_per_block ) {
+    block /= objects_per_block;
+
+    information->inactive_per_block[ block ]--;
+    information->inactive--;
+  }
+}
+
 /** @} */
 
 #ifdef __cplusplus
diff --git a/cpukit/score/src/objectallocateunlimited.c b/cpukit/score/src/objectallocateunlimited.c
index 92727e1411..6ec4a7950b 100644
--- a/cpukit/score/src/objectallocateunlimited.c
+++ b/cpukit/score/src/objectallocateunlimited.c
@@ -61,18 +61,7 @@ Objects_Control *_Objects_Allocate_unlimited( Objects_Information *information )
   }
 
   if ( the_object != NULL ) {
-    Objects_Maximum objects_per_block;
-    Objects_Maximum block;
-
-    objects_per_block = information->objects_per_block;
-    block = _Objects_Get_index( the_object->id ) - OBJECTS_INDEX_MINIMUM;
-
-    if ( block > objects_per_block ) {
-      block /= objects_per_block;
-
-      information->inactive_per_block[ block ]--;
-      information->inactive--;
-    }
+    _Objects_Activate_unlimited( information, the_object );
   }
 
   return the_object;
-- 
cgit v1.2.3