Changeset b0bd1b6 in rtems


Ignore:
Timestamp:
Nov 29, 2011, 9:55:18 PM (7 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master
Children:
be8feba8
Parents:
ece1759
Message:

2011-11-29 Joel Sherrill <joel.sherrilL@…>

PR 1967/cpukit

  • score/include/rtems/score/object.h, score/src/objectinitializeinformation.c: Remove OBJECTS_NAME_ALIGNMENT and uses.
Location:
cpukit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rece1759 rb0bd1b6  
     12011-11-29      Joel Sherrill <joel.sherrilL@OARcorp.com>
     2
     3        PR 1967/cpukit
     4        * score/include/rtems/score/object.h,
     5        score/src/objectinitializeinformation.c: Remove
     6        OBJECTS_NAME_ALIGNMENT and uses.
     7
    182011-11-28      Joel Sherrill <joel.sherrill@oarcorp.com>
    29
  • cpukit/score/include/rtems/score/object.h

    rece1759 rb0bd1b6  
    6464  uint32_t    name_u32;
    6565} Objects_Name;
    66 
    67 /**
    68  *  Space for object names is allocated in multiples of this.
    69  *
    70  *  NOTE:  Must be a power of 2.  Matches the name manipulation routines.
    71  */
    72 #define OBJECTS_NAME_ALIGNMENT     sizeof( uint32_t )
    7366
    7467/**
  • cpukit/score/src/objectinitializeinformation.c

    rece1759 rb0bd1b6  
    129129   *  Calculate the maximum name length
    130130   *
    131    *  NOTE: Always 4 bytes long in Class so aligned.  It is POSIX name
    132    *        lengths that may be an odd number of bytes.
     131   *  NOTE: Either 4 bytes for Classic API names or an arbitrary
     132   *        number for POSIX names which are strings that may be
     133   *        an odd number of bytes.
    133134   */
    134   name_length = maximum_name_length;
    135135
    136   #if defined(RTEMS_POSIX_API)
    137     if ( name_length & (OBJECTS_NAME_ALIGNMENT-1) )
    138       name_length = (name_length + OBJECTS_NAME_ALIGNMENT) &
    139                     ~(OBJECTS_NAME_ALIGNMENT-1);
    140   #endif
    141 
    142   information->name_length = name_length;
     136  information->name_length = maximum_name_length;
    143137
    144138  _Chain_Initialize_empty( &information->Inactive );
     
    165159
    166160      information->global_table =
    167         (Chain_Control *) _Workspace_Allocate_or_fatal_error(
    168           (_Objects_Maximum_nodes + 1) * sizeof(Chain_Control)
    169         );
     161        (Chain_Control *) _Workspace_Allocate_or_fatal_error(
     162          (_Objects_Maximum_nodes + 1) * sizeof(Chain_Control)
     163        );
    170164
    171165      for ( index=1; index <= _Objects_Maximum_nodes ; index++ )
    172         _Chain_Initialize_empty( &information->global_table[ index ] );
     166        _Chain_Initialize_empty( &information->global_table[ index ] );
    173167     }
    174168     else
Note: See TracChangeset for help on using the changeset viewer.