From 5d3e5399bb1fa4960c11f5f1ebb3a61eb4025fff Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 17 Jan 1996 20:11:33 +0000 Subject: added class to initial id macro --- c/src/exec/rtems/headers/rtems.h | 8 ++++---- c/src/exec/rtems/include/rtems.h | 8 ++++---- c/src/exec/score/headers/object.h | 7 +++---- c/src/exec/score/include/rtems/score/object.h | 7 +++---- cpukit/rtems/include/rtems.h | 8 ++++---- cpukit/score/include/rtems/score/object.h | 7 +++---- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/c/src/exec/rtems/headers/rtems.h b/c/src/exec/rtems/headers/rtems.h index 8c507d45ff..97eec4b772 100644 --- a/c/src/exec/rtems/headers/rtems.h +++ b/c/src/exec/rtems/headers/rtems.h @@ -65,11 +65,11 @@ extern "C" { * Parameters and return id's for _Objects_Get_next */ -#define RTEMS_OBJECT_ID_INITIAL_INDEX OBJECTS_ID_INITIAL_INDEX -#define RTEMS_OBJECT_ID_FINAL_INDEX OBJECTS_ID_FINAL_INDEX +#define RTEMS_OBJECT_ID_INITIAL_INDEX OBJECTS_ID_INITIAL_INDEX +#define RTEMS_OBJECT_ID_FINAL_INDEX OBJECTS_ID_FINAL_INDEX -#define RTEMS_OBJECT_ID_INITIAL(node) OBJECTS_ID_INITIAL(node) -#define RTEMS_OBJECT_ID_FINAL OBJECTS_ID_FINAL +#define RTEMS_OBJECT_ID_INITIAL(class, node) OBJECTS_ID_INITIAL(class, node) +#define RTEMS_OBJECT_ID_FINAL OBJECTS_ID_FINAL /* * The following constant defines the minimum stack size which every diff --git a/c/src/exec/rtems/include/rtems.h b/c/src/exec/rtems/include/rtems.h index 8c507d45ff..97eec4b772 100644 --- a/c/src/exec/rtems/include/rtems.h +++ b/c/src/exec/rtems/include/rtems.h @@ -65,11 +65,11 @@ extern "C" { * Parameters and return id's for _Objects_Get_next */ -#define RTEMS_OBJECT_ID_INITIAL_INDEX OBJECTS_ID_INITIAL_INDEX -#define RTEMS_OBJECT_ID_FINAL_INDEX OBJECTS_ID_FINAL_INDEX +#define RTEMS_OBJECT_ID_INITIAL_INDEX OBJECTS_ID_INITIAL_INDEX +#define RTEMS_OBJECT_ID_FINAL_INDEX OBJECTS_ID_FINAL_INDEX -#define RTEMS_OBJECT_ID_INITIAL(node) OBJECTS_ID_INITIAL(node) -#define RTEMS_OBJECT_ID_FINAL OBJECTS_ID_FINAL +#define RTEMS_OBJECT_ID_INITIAL(class, node) OBJECTS_ID_INITIAL(class, node) +#define RTEMS_OBJECT_ID_FINAL OBJECTS_ID_FINAL /* * The following constant defines the minimum stack size which every diff --git a/c/src/exec/score/headers/object.h b/c/src/exec/score/headers/object.h index 4366eb1b88..2337a8e13a 100644 --- a/c/src/exec/score/headers/object.h +++ b/c/src/exec/score/headers/object.h @@ -187,10 +187,9 @@ EXTERN Objects_Information #define OBJECTS_ID_INITIAL_INDEX (0) #define OBJECTS_ID_FINAL_INDEX (0xffff) -#define OBJECTS_ID_INITIAL(node) (_Objects_Build_id( \ - OBJECTS_NO_CLASS, \ - node, \ - OBJECTS_ID_INITIAL_INDEX)) +#define OBJECTS_ID_INITIAL(_class, _node) \ + _Objects_Build_id( (_class), (_node), OBJECTS_ID_INITIAL_INDEX ) + #define OBJECTS_ID_FINAL ((Objects_Id)~0) /* diff --git a/c/src/exec/score/include/rtems/score/object.h b/c/src/exec/score/include/rtems/score/object.h index 4366eb1b88..2337a8e13a 100644 --- a/c/src/exec/score/include/rtems/score/object.h +++ b/c/src/exec/score/include/rtems/score/object.h @@ -187,10 +187,9 @@ EXTERN Objects_Information #define OBJECTS_ID_INITIAL_INDEX (0) #define OBJECTS_ID_FINAL_INDEX (0xffff) -#define OBJECTS_ID_INITIAL(node) (_Objects_Build_id( \ - OBJECTS_NO_CLASS, \ - node, \ - OBJECTS_ID_INITIAL_INDEX)) +#define OBJECTS_ID_INITIAL(_class, _node) \ + _Objects_Build_id( (_class), (_node), OBJECTS_ID_INITIAL_INDEX ) + #define OBJECTS_ID_FINAL ((Objects_Id)~0) /* diff --git a/cpukit/rtems/include/rtems.h b/cpukit/rtems/include/rtems.h index 8c507d45ff..97eec4b772 100644 --- a/cpukit/rtems/include/rtems.h +++ b/cpukit/rtems/include/rtems.h @@ -65,11 +65,11 @@ extern "C" { * Parameters and return id's for _Objects_Get_next */ -#define RTEMS_OBJECT_ID_INITIAL_INDEX OBJECTS_ID_INITIAL_INDEX -#define RTEMS_OBJECT_ID_FINAL_INDEX OBJECTS_ID_FINAL_INDEX +#define RTEMS_OBJECT_ID_INITIAL_INDEX OBJECTS_ID_INITIAL_INDEX +#define RTEMS_OBJECT_ID_FINAL_INDEX OBJECTS_ID_FINAL_INDEX -#define RTEMS_OBJECT_ID_INITIAL(node) OBJECTS_ID_INITIAL(node) -#define RTEMS_OBJECT_ID_FINAL OBJECTS_ID_FINAL +#define RTEMS_OBJECT_ID_INITIAL(class, node) OBJECTS_ID_INITIAL(class, node) +#define RTEMS_OBJECT_ID_FINAL OBJECTS_ID_FINAL /* * The following constant defines the minimum stack size which every diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h index 4366eb1b88..2337a8e13a 100644 --- a/cpukit/score/include/rtems/score/object.h +++ b/cpukit/score/include/rtems/score/object.h @@ -187,10 +187,9 @@ EXTERN Objects_Information #define OBJECTS_ID_INITIAL_INDEX (0) #define OBJECTS_ID_FINAL_INDEX (0xffff) -#define OBJECTS_ID_INITIAL(node) (_Objects_Build_id( \ - OBJECTS_NO_CLASS, \ - node, \ - OBJECTS_ID_INITIAL_INDEX)) +#define OBJECTS_ID_INITIAL(_class, _node) \ + _Objects_Build_id( (_class), (_node), OBJECTS_ID_INITIAL_INDEX ) + #define OBJECTS_ID_FINAL ((Objects_Id)~0) /* -- cgit v1.2.3