Changeset 95fbca1 in rtems for c/src/exec/score/include

Timestamp:

08/18/95 21:41:27 (27 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

9863dbf

Parents:

b06e68ef

Message:

+ Added object type field to object id.

+ Added name pointer to Object_Control.

+ Modified Object Open and Close to address name field.

+ Removed name as separate element from Thread and Proxy Control.

Location:

c/src/exec/score/include/rtems/score

Files:

• object.h (modified) (7 diffs)
• thread.h (modified) (2 diffs)

c/src/exec/score/include/rtems/score/object.h

@@ -34 +34 @@
 /*
  *  The following type defines the control block used to manage
- *  object IDs.
+ *  object IDs.  The format is as follows (0=LSB):
+ *
+ *     Bits  0 .. 15    = index
+ *     Bits 16 .. 25    = node
+ *     Bits 26 .. 31    = class
  */
 
 typedef unsigned32 Objects_Id;
+
+#define OBJECTS_INDEX_START_BIT  0
+#define OBJECTS_NODE_START_BIT  16
+#define OBJECTS_CLASS_START_BIT 26
+
+#define OBJECTS_INDEX_MASK      0x0000ffff
+#define OBJECTS_NODE_MASK       0x03ff0000
+#define OBJECTS_CLASS_MASK      0xfc000000
+
+#define OBJECTS_INDEX_VALID_BITS  0x0000ffff
+#define OBJECTS_NODE_VALID_BITS   0x000003ff
+#define OBJECTS_CLASS_VALID_BITS  0x000000cf
+
+/*
+ *  This enumerated type is used in the class field of the object ID.
+ */
+
+typedef enum {
+  OBJECTS_NO_CLASS             =  0,
+  OBJECTS_RTEMS_TASKS          =  1,
+  OBJECTS_RTEMS_TIMERS         =  2,
+  OBJECTS_RTEMS_SEMAPHORES     =  3,
+  OBJECTS_RTEMS_MESSAGE_QUEUES =  4,
+  OBJECTS_RTEMS_PARTITIONS     =  5,
+  OBJECTS_RTEMS_REGIONS        =  6,
+  OBJECTS_RTEMS_PORTS          =  7,
+  OBJECTS_RTEMS_PERIODS        =  8,
+  OBJECTS_RTEMS_EXTENSIONS     =  9
+} Objects_Classes;
 
 /*
@@ -57 +90 @@
 
 typedef struct {
-  Chain_Node Node;
-  Objects_Id id;
+  Chain_Node    Node;
+  Objects_Id    id;
+  Objects_Name *name;
 }   Objects_Control;
 
@@ -67 +101 @@
 
 typedef struct {
+  Objects_Classes   the_class;       /* Class of this object */
   Objects_Id        minimum_id;      /* minimum valid id of this type */
   Objects_Id        maximum_id;      /* maximum valid id of this type */
@@ -89 +124 @@
  */
 
-#define OBJECTS_ID_OF_SELF 0
+#define OBJECTS_ID_OF_SELF ((Objects_Id) 0)
 
 /*
@@ -108 +143 @@
 
 #define RTEMS_OBJECT_ID_INITIAL(node)   (_Objects_Build_id(      \
+                                            OBJECTS_NO_CLASS, \
                                             node, \
                                             RTEMS_OBJECT_ID_INITIAL_INDEX))
-#define RTEMS_OBJECT_ID_FINAL           ((Objects_Id) ~0)
+#define RTEMS_OBJECT_ID_FINAL           ((Objects_Id)~0)
 
 /*
@@ -141 +177 @@
 void _Objects_Initialize_information (
   Objects_Information *information,
+  Objects_Classes      the_class,
   boolean              supports_global,
   unsigned32           maximum,
@@ -265 +302 @@
 
 STATIC INLINE Objects_Id _Objects_Build_id(
-  unsigned32 node,
-  unsigned32 index
+  Objects_Classes  the_class,
+  unsigned32       node,
+  unsigned32       index
+);
+
+/*
+ *  rtems_get_class
+ *
+ *  DESCRIPTION:
+ *
+ *  This function returns the class portion of the ID.
+ *
+ */
+ 
+STATIC INLINE Objects_Classes rtems_get_class(
+  Objects_Id id
 );
 

c/src/exec/score/include/rtems/score/thread.h

@@ -134 +134 @@
 typedef struct {
   Objects_Control          Object;
-  Objects_Name             name;
   States_Control           current_state;
-  rtems_task_priority         current_priority;
-  rtems_task_priority         real_priority;
+  rtems_task_priority      current_priority;
+  rtems_task_priority      real_priority;
   unsigned32               resource_count;
   Thread_Wait_information  Wait;
   Watchdog_Control         Timer;
-  rtems_packet_prefix        *receive_packet;
+  rtems_packet_prefix     *receive_packet;
      /****************** end of common block ********************/
   Chain_Node               Active;
@@ -157 +156 @@
 typedef struct {
   Objects_Control           Object;
-  Objects_Name              name;
   States_Control            current_state;
   rtems_task_priority       current_priority;