Ticket #753: unl.diff

File unl.diff, 3.0 KB (added by Eric Norum, on Dec 3, 2006 at 1:31:13 PM)

unl.diff

  • score/src/objectinitializeinformation.c

    RCS file: /usr1/CVS/rtems/cpukit/score/src/objectinitializeinformation.c,v
    retrieving revision 1.10
    diff -u -r1.10 objectinitializeinformation.c
     
    5151  Objects_Information *information,
    5252  Objects_APIs         the_api,
    5353  uint32_t             the_class,
    54   Objects_Maximum      maximum,
     54  uint32_t             maximum,
    5555  uint16_t             size,
    5656  boolean              is_string,
    5757  uint32_t             maximum_name_length
  • score/include/rtems/score/object.h

    RCS file: /usr1/CVS/rtems/cpukit/score/include/rtems/score/object.h,v
    retrieving revision 1.43
    diff -u -r1.43 object.h
     
    2929#include <rtems/score/isr.h>
    3030
    3131/*
    32  *  Mask to enable unlimited objects.  This is used in the configuration
    33  *  table when specifying the number of configured objects.
    34  */
    35 
    36 #define OBJECTS_UNLIMITED_OBJECTS 0x80000000
    37 
    38 /*
    3932 *  The following type defines the control block used to manage
    4033 *  object names.
    4134 */
     
    4841 *  NOTE:  Must be a power of 2.  Matches the name manipulation routines.
    4942 */
    5043
    51 #define OBJECTS_NAME_ALIGNMENT     sizeof( uint32_t   )
     44#define OBJECTS_NAME_ALIGNMENT     sizeof( uint32_t )
    5245
    5346/*
    5447 *  Functions which compare names are prototyped like this.
     
    7770#define OBJECTS_API_START_BIT    8
    7871#define OBJECTS_CLASS_START_BIT 11
    7972
    80 #define OBJECTS_INDEX_MASK      (Objects_Id)0x000000ff
    81 #define OBJECTS_API_MASK        (Objects_Id)0x00000700
    82 #define OBJECTS_CLASS_MASK      (Objects_Id)0x0000F800
     73#define OBJECTS_INDEX_MASK      (Objects_Id)0x00ff
     74#define OBJECTS_API_MASK        (Objects_Id)0x0700
     75#define OBJECTS_CLASS_MASK      (Objects_Id)0xF800
     76
     77#define OBJECTS_INDEX_VALID_BITS  (Objects_Id)0x00ff
     78#define OBJECTS_API_VALID_BITS    (Objects_Id)0x0007
     79/* OBJECTS_NODE_VALID_BITS should not be used with 16 bit Ids */
     80#define OBJECTS_CLASS_VALID_BITS  (Objects_Id)0x001f
     81
     82#define OBJECTS_UNLIMITED_OBJECTS 0x8000
    8383
    8484#else
    8585/*
     
    109109#define OBJECTS_NODE_VALID_BITS   (Objects_Id)0x000000ff
    110110#define OBJECTS_API_VALID_BITS    (Objects_Id)0x00000007
    111111#define OBJECTS_CLASS_VALID_BITS  (Objects_Id)0x0000001f
     112
     113/*
     114 *  Mask to enable unlimited objects.  This is used in the configuration
     115 *  table when specifying the number of configured objects.
     116 */
     117#define OBJECTS_UNLIMITED_OBJECTS 0x80000000
     118
    112119#endif
    113120
    114121/*
     
    344351  Objects_Information *information,
    345352  Objects_APIs         the_api,
    346353  uint32_t             the_class,
    347   Objects_Maximum      maximum,
     354  uint32_t             maximum,
    348355  uint16_t             size,
    349356  boolean              is_string,
    350357  uint32_t             maximum_name_length