Changeset f70079c in rtems


Ignore:
Timestamp:
Nov 25, 2018, 7:26:02 PM (6 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/include/rtems/score/objectimpl.h

    r1c2d178 rf70079c  
    138138   */
    139139  uint16_t          name_length;
    140   /** This field indicates the API of this object class. */
    141   uint8_t           the_api;
    142   /** This is the class of this object set. */
    143   uint8_t           the_class;
    144140  /** This is the true if unlimited objects in this class. */
    145141  bool              auto_extend;
  • cpukit/score/src/objectextendinformation.c

    r1c2d178 rf70079c  
    5555  Objects_Control  *new_object_block;
    5656  bool              do_extend;
     57  Objects_Id        api_class_and_node;
    5758
    5859  _Assert(
     
    6162  );
    6263
     64  api_class_and_node = information->maximum_id & ~OBJECTS_INDEX_MASK;
    6365  old_maximum = _Objects_Get_maximum_index( information );
    6466
     
    219221    information->inactive_per_block = inactive_per_block;
    220222    information->local_table = local_table;
    221     information->maximum_id = _Objects_Build_id(
    222       information->the_api,
    223       information->the_class,
    224       _Objects_Local_node,
    225       new_maximum
    226     );
     223    information->maximum_id = api_class_and_node
     224      | (new_maximum << OBJECTS_INDEX_START_BIT);
    227225
    228226    _ISR_lock_ISR_enable( &lock_context );
     
    245243  the_object = new_object_block;
    246244  for ( index = index_base ; index < index_end ; ++index ) {
    247     the_object->id = _Objects_Build_id(
    248       information->the_api,
    249       information->the_class,
    250       _Objects_Local_node,
    251       index + OBJECTS_INDEX_MINIMUM
    252     );
     245    the_object->id = api_class_and_node
     246      | ( ( index + OBJECTS_INDEX_MINIMUM ) << OBJECTS_INDEX_START_BIT );
    253247
    254248    _Chain_Initialize_node( &the_object->Node );
  • cpukit/score/src/objectinitializeinformation.c

    r1c2d178 rf70079c  
    4040  Objects_Maximum maximum_per_allocation;
    4141
    42   information->the_api     = the_api;
    43   information->the_class   = the_class;
     42  information->maximum_id = _Objects_Build_id(
     43    the_api,
     44    the_class,
     45    _Objects_Local_node,
     46    0
     47  );
    4448  information->object_size = object_size;
    4549
Note: See TracChangeset for help on using the changeset viewer.