Changeset f70079c in rtems

Timestamp:

11/25/18 19:26:02 (4 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

add0b6a3

Parents:

1c2d178

git-author:

Sebastian Huber <sebastian.huber@…> (11/25/18 19:26:02)

git-committer:

Sebastian Huber <sebastian.huber@…> (12/07/18 13:22:02)

Message:

score: Remove Objects_Information::the_api

Remove Objects_Information::the_class. This information is already
contained in Objects_Information::maximum_id.

Update #3621.

Location:

cpukit

Files:

• include/rtems/score/objectimpl.h (modified) (1 diff)
• score/src/objectextendinformation.c (modified) (4 diffs)
• score/src/objectinitializeinformation.c (modified) (1 diff)

cpukit/include/rtems/score/objectimpl.h

@@ -138 +138 @@
    */
   uint16_t          name_length;
-  /** This field indicates the API of this object class. */
-  uint8_t           the_api;
-  /** This is the class of this object set. */
-  uint8_t           the_class;
   /** This is the true if unlimited objects in this class. */
   bool              auto_extend;

cpukit/score/src/objectextendinformation.c

@@ -55 +55 @@
   Objects_Control  *new_object_block;
   bool              do_extend;
+  Objects_Id        api_class_and_node;
 
   _Assert(
@@ -61 +62 @@
   );
 
+  api_class_and_node = information->maximum_id & ~OBJECTS_INDEX_MASK;
   old_maximum = _Objects_Get_maximum_index( information );
 
@@ -219 +221 @@
     information->inactive_per_block = inactive_per_block;
     information->local_table = local_table;
-    information->maximum_id = _Objects_Build_id(
-      information->the_api,
-      information->the_class,
-      _Objects_Local_node,
-      new_maximum
-    );
+    information->maximum_id = api_class_and_node
+      | (new_maximum << OBJECTS_INDEX_START_BIT);
 
     _ISR_lock_ISR_enable( &lock_context );
@@ -245 +243 @@
   the_object = new_object_block;
   for ( index = index_base ; index < index_end ; ++index ) {
-    the_object->id = _Objects_Build_id(
-      information->the_api,
-      information->the_class,
-      _Objects_Local_node,
-      index + OBJECTS_INDEX_MINIMUM
-    );
+    the_object->id = api_class_and_node
+      | ( ( index + OBJECTS_INDEX_MINIMUM ) << OBJECTS_INDEX_START_BIT );
 
     _Chain_Initialize_node( &the_object->Node );

cpukit/score/src/objectinitializeinformation.c

@@ -40 +40 @@
   Objects_Maximum maximum_per_allocation;
 
-  information->the_api     = the_api;
-  information->the_class   = the_class;
+  information->maximum_id = _Objects_Build_id(
+    the_api,
+    the_class,
+    _Objects_Local_node,
+    0
+  );
   information->object_size = object_size;