2009-12-15 Glenn Humphrey <glenn.humphrey@OARcorp.com>

	* rtems/include/rtems/rtems/dpmem.h, rtems/include/rtems/rtems/event.h,
	rtems/include/rtems/rtems/message.h,
	rtems/include/rtems/rtems/part.h,
	rtems/include/rtems/rtems/ratemon.h,
	rtems/include/rtems/rtems/region.h,
	rtems/include/rtems/rtems/semmp.h,
	rtems/include/rtems/rtems/signal.h,
	rtems/include/rtems/rtems/signalmp.h,
	rtems/include/rtems/rtems/tasks.h, rtems/include/rtems/rtems/timer.h,
	rtems/src/dpmemcreate.c, rtems/src/dpmemdelete.c,
	rtems/src/dpmemexternal2internal.c, rtems/src/dpmemident.c,
	rtems/src/dpmeminternal2external.c, rtems/src/eventsend.c,
	rtems/src/msgqbroadcast.c, rtems/src/msgqcreate.c,
	rtems/src/msgqdelete.c, rtems/src/msgqflush.c,
	rtems/src/msgqgetnumberpending.c, rtems/src/msgqident.c,
	rtems/src/msgqreceive.c, rtems/src/msgqsend.c,
	rtems/src/msgqurgent.c, rtems/src/partcreate.c,
	rtems/src/partdelete.c, rtems/src/partgetbuffer.c,
	rtems/src/partident.c, rtems/src/partreturnbuffer.c,
	rtems/src/ratemoncancel.c, rtems/src/ratemoncreate.c,
	rtems/src/ratemondelete.c, rtems/src/ratemongetstatistics.c,
	rtems/src/ratemongetstatus.c, rtems/src/ratemonident.c,
	rtems/src/ratemonperiod.c, rtems/src/ratemonresetstatistics.c,
	rtems/src/regioncreate.c, rtems/src/regiondelete.c,
	rtems/src/regionextend.c, rtems/src/regiongetfreeinfo.c,
	rtems/src/regiongetinfo.c, rtems/src/regiongetsegment.c,
	rtems/src/regiongetsegmentsize.c, rtems/src/regionident.c,
	rtems/src/regionresizesegment.c, rtems/src/regionreturnsegment.c,
	rtems/src/signalmp.c, rtems/src/signalsend.c, rtems/src/taskcreate.c,
	rtems/src/taskdelete.c, rtems/src/taskgetnote.c,
	rtems/src/taskident.c, rtems/src/taskissuspended.c,
	rtems/src/taskrestart.c, rtems/src/taskresume.c,
	rtems/src/tasksetnote.c, rtems/src/tasksetpriority.c,
	rtems/src/tasksuspend.c, rtems/src/timercancel.c,
	rtems/src/timercreate.c, rtems/src/timerdelete.c,
	rtems/src/timerfireafter.c, rtems/src/timerfirewhen.c,
	rtems/src/timergetinfo.c, rtems/src/timerident.c,
	rtems/src/timerreset.c, rtems/src/timerserverfireafter.c,
	rtems/src/timerserverfirewhen.c: Changed Objects_Id to rtems_id in
	the public API.

60 files changed, 108 insertions, 108 deletions

diff --git a/cpukit/rtems/src/dpmemcreate.c b/cpukit/rtems/src/dpmemcreate.c
index 789f075a6b..69df430dd8 100644
--- a/cpukit/rtems/src/dpmemcreate.c
+++ b/cpukit/rtems/src/dpmemcreate.c
@@ -48,7 +48,7 @@ rtems_status_code rtems_port_create(
   void         *internal_start,
   void         *external_start,
   uint32_t      length,
-  Objects_Id   *id
+  rtems_id     *id
 )
 {
   register Dual_ported_memory_Control *the_port;
diff --git a/cpukit/rtems/src/dpmemdelete.c b/cpukit/rtems/src/dpmemdelete.c
index a3f500edd7..003c27fecb 100644
--- a/cpukit/rtems/src/dpmemdelete.c
+++ b/cpukit/rtems/src/dpmemdelete.c
@@ -40,7 +40,7 @@
  */
 
 rtems_status_code rtems_port_delete(
-  Objects_Id id
+  rtems_id id
 )
 {
   register Dual_ported_memory_Control *the_port;
diff --git a/cpukit/rtems/src/dpmemexternal2internal.c b/cpukit/rtems/src/dpmemexternal2internal.c
index 3d7cd1544d..45c8344588 100644
--- a/cpukit/rtems/src/dpmemexternal2internal.c
+++ b/cpukit/rtems/src/dpmemexternal2internal.c
@@ -44,9 +44,9 @@
  */
 
 rtems_status_code rtems_port_external_to_internal(
-  Objects_Id   id,
-  void        *external,
-  void       **internal
+  rtems_id   id,
+  void      *external,
+  void     **internal
 )
 {
   register Dual_ported_memory_Control *the_port;
diff --git a/cpukit/rtems/src/dpmemident.c b/cpukit/rtems/src/dpmemident.c
index e9b4d4e288..f41aef293b 100644
--- a/cpukit/rtems/src/dpmemident.c
+++ b/cpukit/rtems/src/dpmemident.c
@@ -42,8 +42,8 @@
  */
 
 rtems_status_code rtems_port_ident(
-  rtems_name    name,
-  Objects_Id   *id
+  rtems_name  name,
+  rtems_id   *id
 )
 {
   Objects_Name_or_id_lookup_errors  status;
diff --git a/cpukit/rtems/src/dpmeminternal2external.c b/cpukit/rtems/src/dpmeminternal2external.c
index 3bd33ff921..5bf4d4fe93 100644
--- a/cpukit/rtems/src/dpmeminternal2external.c
+++ b/cpukit/rtems/src/dpmeminternal2external.c
@@ -44,9 +44,9 @@
  */
 
 rtems_status_code rtems_port_internal_to_external(
-  Objects_Id   id,
-  void        *internal,
-  void       **external
+  rtems_id   id,
+  void      *internal,
+  void     **external
 )
 {
   register Dual_ported_memory_Control *the_port;
diff --git a/cpukit/rtems/src/eventsend.c b/cpukit/rtems/src/eventsend.c
index 189ad78718..412d52a7f1 100644
--- a/cpukit/rtems/src/eventsend.c
+++ b/cpukit/rtems/src/eventsend.c
@@ -41,7 +41,7 @@
  */
 
 rtems_status_code rtems_event_send(
-  Objects_Id        id,
+  rtems_id          id,
   rtems_event_set   event_in
 )
 {
diff --git a/cpukit/rtems/src/msgqbroadcast.c b/cpukit/rtems/src/msgqbroadcast.c
index 54f27a86bd..96389b8d23 100644
--- a/cpukit/rtems/src/msgqbroadcast.c
+++ b/cpukit/rtems/src/msgqbroadcast.c
@@ -54,10 +54,10 @@
  */
 
 rtems_status_code rtems_message_queue_broadcast(
-  Objects_Id            id,
-  const void           *buffer,
-  size_t                size,
-  uint32_t             *count
+  rtems_id    id,
+  const void *buffer,
+  size_t      size,
+  uint32_t   *count
 )
 {
   register Message_queue_Control *the_message_queue;
diff --git a/cpukit/rtems/src/msgqcreate.c b/cpukit/rtems/src/msgqcreate.c
index d333beaaac..77af8eac95 100644
--- a/cpukit/rtems/src/msgqcreate.c
+++ b/cpukit/rtems/src/msgqcreate.c
@@ -55,11 +55,11 @@
  */
 
 rtems_status_code rtems_message_queue_create(
-  rtems_name          name,
-  uint32_t            count,
-  size_t              max_message_size,
-  rtems_attribute     attribute_set,
-  Objects_Id         *id
+  rtems_name       name,
+  uint32_t         count,
+  size_t           max_message_size,
+  rtems_attribute  attribute_set,
+  rtems_id        *id
 )
 {
   register Message_queue_Control *the_message_queue;
diff --git a/cpukit/rtems/src/msgqdelete.c b/cpukit/rtems/src/msgqdelete.c
index e51270c2ff..8834886e38 100644
--- a/cpukit/rtems/src/msgqdelete.c
+++ b/cpukit/rtems/src/msgqdelete.c
@@ -50,7 +50,7 @@
  */
 
 rtems_status_code rtems_message_queue_delete(
-  Objects_Id id
+  rtems_id id
 )
 {
   register Message_queue_Control *the_message_queue;
diff --git a/cpukit/rtems/src/msgqflush.c b/cpukit/rtems/src/msgqflush.c
index 42c2375466..deee3b80ae 100644
--- a/cpukit/rtems/src/msgqflush.c
+++ b/cpukit/rtems/src/msgqflush.c
@@ -53,8 +53,8 @@
  */
 
 rtems_status_code rtems_message_queue_flush(
-  Objects_Id  id,
-  uint32_t   *count
+  rtems_id  id,
+  uint32_t *count
 )
 {
   register Message_queue_Control *the_message_queue;
diff --git a/cpukit/rtems/src/msgqgetnumberpending.c b/cpukit/rtems/src/msgqgetnumberpending.c
index 32eeb0844b..cedb2b23d3 100644
--- a/cpukit/rtems/src/msgqgetnumberpending.c
+++ b/cpukit/rtems/src/msgqgetnumberpending.c
@@ -51,8 +51,8 @@
  */
 
 rtems_status_code rtems_message_queue_get_number_pending(
-  Objects_Id  id,
-  uint32_t   *count
+  rtems_id  id,
+  uint32_t *count
 )
 {
   register Message_queue_Control *the_message_queue;
diff --git a/cpukit/rtems/src/msgqident.c b/cpukit/rtems/src/msgqident.c
index 435da557e5..9030d5df3f 100644
--- a/cpukit/rtems/src/msgqident.c
+++ b/cpukit/rtems/src/msgqident.c
@@ -53,9 +53,9 @@
  */
 
 rtems_status_code rtems_message_queue_ident(
-  rtems_name    name,
-  uint32_t      node,
-  Objects_Id   *id
+  rtems_name  name,
+  uint32_t    node,
+  rtems_id   *id
 )
 {
   Objects_Name_or_id_lookup_errors  status;
diff --git a/cpukit/rtems/src/msgqreceive.c b/cpukit/rtems/src/msgqreceive.c
index 48b3af4289..f7f0db1605 100644
--- a/cpukit/rtems/src/msgqreceive.c
+++ b/cpukit/rtems/src/msgqreceive.c
@@ -54,11 +54,11 @@
  */
 
 rtems_status_code rtems_message_queue_receive(
-  Objects_Id            id,
-  void                 *buffer,
-  size_t               *size,
-  rtems_option          option_set,
-  rtems_interval        timeout
+  rtems_id        id,
+  void           *buffer,
+  size_t         *size,
+  rtems_option    option_set,
+  rtems_interval  timeout
 )
 {
   register Message_queue_Control *the_message_queue;
diff --git a/cpukit/rtems/src/msgqsend.c b/cpukit/rtems/src/msgqsend.c
index 6311051991..9c2c251cfd 100644
--- a/cpukit/rtems/src/msgqsend.c
+++ b/cpukit/rtems/src/msgqsend.c
@@ -57,9 +57,9 @@
 #endif
 
 rtems_status_code rtems_message_queue_send(
-  Objects_Id            id,
-  const void           *buffer,
-  size_t                size
+  rtems_id    id,
+  const void *buffer,
+  size_t      size
 )
 {
   register Message_queue_Control  *the_message_queue;
diff --git a/cpukit/rtems/src/msgqurgent.c b/cpukit/rtems/src/msgqurgent.c
index 8022ecfdc4..ddb66a8488 100644
--- a/cpukit/rtems/src/msgqurgent.c
+++ b/cpukit/rtems/src/msgqurgent.c
@@ -57,9 +57,9 @@
 #endif
 
 rtems_status_code rtems_message_queue_urgent(
-  Objects_Id            id,
-  const void           *buffer,
-  size_t                size
+  rtems_id    id,
+  const void *buffer,
+  size_t      size
 )
 {
   register Message_queue_Control  *the_message_queue;
diff --git a/cpukit/rtems/src/partcreate.c b/cpukit/rtems/src/partcreate.c
index c51c67a6fe..6b3d819ea5 100644
--- a/cpukit/rtems/src/partcreate.c
+++ b/cpukit/rtems/src/partcreate.c
@@ -47,12 +47,12 @@
  */
 
 rtems_status_code rtems_partition_create(
-  rtems_name          name,
-  void               *starting_address,
-  uint32_t            length,
-  uint32_t            buffer_size,
-  rtems_attribute     attribute_set,
-  Objects_Id         *id
+  rtems_name       name,
+  void            *starting_address,
+  uint32_t         length,
+  uint32_t         buffer_size,
+  rtems_attribute  attribute_set,
+  rtems_id        *id
 )
 {
   register Partition_Control *the_partition;
diff --git a/cpukit/rtems/src/partdelete.c b/cpukit/rtems/src/partdelete.c
index aa4c9184cd..871e198f3f 100644
--- a/cpukit/rtems/src/partdelete.c
+++ b/cpukit/rtems/src/partdelete.c
@@ -42,7 +42,7 @@
  */
 
 rtems_status_code rtems_partition_delete(
-  Objects_Id id
+  rtems_id id
 )
 {
   register Partition_Control *the_partition;
diff --git a/cpukit/rtems/src/partgetbuffer.c b/cpukit/rtems/src/partgetbuffer.c
index 092a177e8c..56d58a1103 100644
--- a/cpukit/rtems/src/partgetbuffer.c
+++ b/cpukit/rtems/src/partgetbuffer.c
@@ -42,8 +42,8 @@
  */
 
 rtems_status_code rtems_partition_get_buffer(
-  Objects_Id   id,
-  void       **buffer
+  rtems_id   id,
+  void     **buffer
 )
 {
   register Partition_Control *the_partition;
diff --git a/cpukit/rtems/src/partident.c b/cpukit/rtems/src/partident.c
index 71159a5330..8f9004ea8e 100644
--- a/cpukit/rtems/src/partident.c
+++ b/cpukit/rtems/src/partident.c
@@ -44,9 +44,9 @@
  */
 
 rtems_status_code rtems_partition_ident(
-  rtems_name    name,
-  uint32_t      node,
-  Objects_Id   *id
+  rtems_name  name,
+  uint32_t    node,
+  rtems_id   *id
 )
 {
   Objects_Name_or_id_lookup_errors  status;
diff --git a/cpukit/rtems/src/partreturnbuffer.c b/cpukit/rtems/src/partreturnbuffer.c
index dccf36e108..8b83ab3cec 100644
--- a/cpukit/rtems/src/partreturnbuffer.c
+++ b/cpukit/rtems/src/partreturnbuffer.c
@@ -42,8 +42,8 @@
  */
 
 rtems_status_code rtems_partition_return_buffer(
-  Objects_Id  id,
-  void       *buffer
+  rtems_id  id,
+  void     *buffer
 )
 {
   register Partition_Control *the_partition;
diff --git a/cpukit/rtems/src/ratemoncancel.c b/cpukit/rtems/src/ratemoncancel.c
index 829724c39c..7950fe58d1 100644
--- a/cpukit/rtems/src/ratemoncancel.c
+++ b/cpukit/rtems/src/ratemoncancel.c
@@ -38,7 +38,7 @@
  */
 
 rtems_status_code rtems_rate_monotonic_cancel(
-  Objects_Id id
+  rtems_id id
 )
 {
   Rate_monotonic_Control *the_period;
diff --git a/cpukit/rtems/src/ratemoncreate.c b/cpukit/rtems/src/ratemoncreate.c
index 01dffcca58..9fb16aa56c 100644
--- a/cpukit/rtems/src/ratemoncreate.c
+++ b/cpukit/rtems/src/ratemoncreate.c
@@ -41,8 +41,8 @@
  */
 
 rtems_status_code rtems_rate_monotonic_create(
-  rtems_name    name,
-  Objects_Id   *id
+  rtems_name  name,
+  rtems_id   *id
 )
 {
   Rate_monotonic_Control *the_period;
diff --git a/cpukit/rtems/src/ratemondelete.c b/cpukit/rtems/src/ratemondelete.c
index 1f1341eb22..8149233079 100644
--- a/cpukit/rtems/src/ratemondelete.c
+++ b/cpukit/rtems/src/ratemondelete.c
@@ -38,7 +38,7 @@
  */
 
 rtems_status_code rtems_rate_monotonic_delete(
-  Objects_Id id
+  rtems_id id
 )
 {
   Rate_monotonic_Control *the_period;
diff --git a/cpukit/rtems/src/ratemongetstatistics.c b/cpukit/rtems/src/ratemongetstatistics.c
index 00060b85db..0ecd5515f1 100644
--- a/cpukit/rtems/src/ratemongetstatistics.c
+++ b/cpukit/rtems/src/ratemongetstatistics.c
@@ -41,8 +41,8 @@
  */
 
 rtems_status_code rtems_rate_monotonic_get_statistics(
-  Objects_Id                               id,
-  rtems_rate_monotonic_period_statistics  *statistics
+  rtems_id                                id,
+  rtems_rate_monotonic_period_statistics *statistics
 )
 {
   Objects_Locations                        location;
diff --git a/cpukit/rtems/src/ratemongetstatus.c b/cpukit/rtems/src/ratemongetstatus.c
index 5cc6b56a5e..c18b5b57ba 100644
--- a/cpukit/rtems/src/ratemongetstatus.c
+++ b/cpukit/rtems/src/ratemongetstatus.c
@@ -45,8 +45,8 @@
  */
 
 rtems_status_code rtems_rate_monotonic_get_status(
-  Objects_Id                           id,
-  rtems_rate_monotonic_period_status  *status
+  rtems_id                            id,
+  rtems_rate_monotonic_period_status *status
 )
 {
   Thread_CPU_usage_t             executed;
diff --git a/cpukit/rtems/src/ratemonident.c b/cpukit/rtems/src/ratemonident.c
index bd9bb3a83d..68df076cbb 100644
--- a/cpukit/rtems/src/ratemonident.c
+++ b/cpukit/rtems/src/ratemonident.c
@@ -41,8 +41,8 @@
  */
 
 rtems_status_code rtems_rate_monotonic_ident(
-  rtems_name    name,
-  Objects_Id   *id
+  rtems_name  name,
+  rtems_id   *id
 )
 {
   Objects_Name_or_id_lookup_errors  status;
diff --git a/cpukit/rtems/src/ratemonperiod.c b/cpukit/rtems/src/ratemonperiod.c
index b32228953b..eea939ee7c 100644
--- a/cpukit/rtems/src/ratemonperiod.c
+++ b/cpukit/rtems/src/ratemonperiod.c
@@ -242,8 +242,8 @@ void _Rate_monotonic_Update_statistics(
  */
 
 rtems_status_code rtems_rate_monotonic_period(
-  Objects_Id        id,
-  rtems_interval    length
+  rtems_id       id,
+  rtems_interval length
 )
 {
   Rate_monotonic_Control              *the_period;
diff --git a/cpukit/rtems/src/ratemonresetstatistics.c b/cpukit/rtems/src/ratemonresetstatistics.c
index 9f60dd3661..065c31aec2 100644
--- a/cpukit/rtems/src/ratemonresetstatistics.c
+++ b/cpukit/rtems/src/ratemonresetstatistics.c
@@ -40,7 +40,7 @@
  */
 
 rtems_status_code rtems_rate_monotonic_reset_statistics(
-  Objects_Id                               id
+  rtems_id id
 )
 {
   Objects_Locations              location;
diff --git a/cpukit/rtems/src/regioncreate.c b/cpukit/rtems/src/regioncreate.c
index 66beec13fd..7abab149c9 100644
--- a/cpukit/rtems/src/regioncreate.c
+++ b/cpukit/rtems/src/regioncreate.c
@@ -53,7 +53,7 @@ rtems_status_code rtems_region_create(
   uintptr_t           length,
   uintptr_t           page_size,
   rtems_attribute     attribute_set,
-  Objects_Id         *id
+  rtems_id           *id
 )
 {
   rtems_status_code  return_status;
diff --git a/cpukit/rtems/src/regiondelete.c b/cpukit/rtems/src/regiondelete.c
index 8380242ee1..8217e68f71 100644
--- a/cpukit/rtems/src/regiondelete.c
+++ b/cpukit/rtems/src/regiondelete.c
@@ -43,7 +43,7 @@
  */
 
 rtems_status_code rtems_region_delete(
-  Objects_Id id
+  rtems_id id
 )
 {
   Objects_Locations   location;
diff --git a/cpukit/rtems/src/regionextend.c b/cpukit/rtems/src/regionextend.c
index 6d181a09dc..0531381328 100644
--- a/cpukit/rtems/src/regionextend.c
+++ b/cpukit/rtems/src/regionextend.c
@@ -43,9 +43,9 @@
  */
 
 rtems_status_code rtems_region_extend(
-  Objects_Id          id,
-  void               *starting_address,
-  uintptr_t           length
+  rtems_id   id,
+  void      *starting_address,
+  uintptr_t  length
 )
 {
   uintptr_t           amount_extended;
diff --git a/cpukit/rtems/src/regiongetfreeinfo.c b/cpukit/rtems/src/regiongetfreeinfo.c
index e7e8fe666d..fcfa3bc8b2 100644
--- a/cpukit/rtems/src/regiongetfreeinfo.c
+++ b/cpukit/rtems/src/regiongetfreeinfo.c
@@ -45,7 +45,7 @@
  */
 
 rtems_status_code rtems_region_get_free_information(
-  Objects_Id              id,
+  rtems_id                id,
   Heap_Information_block *the_info
 )
 {
diff --git a/cpukit/rtems/src/regiongetinfo.c b/cpukit/rtems/src/regiongetinfo.c
index 3723749642..306f3da947 100644
--- a/cpukit/rtems/src/regiongetinfo.c
+++ b/cpukit/rtems/src/regiongetinfo.c
@@ -43,7 +43,7 @@
  */
 
 rtems_status_code rtems_region_get_information(
-  Objects_Id              id,
+  rtems_id                id,
   Heap_Information_block *the_info
 )
 {
diff --git a/cpukit/rtems/src/regiongetsegment.c b/cpukit/rtems/src/regiongetsegment.c
index 0e46b07e71..c8c8cfa0fb 100644
--- a/cpukit/rtems/src/regiongetsegment.c
+++ b/cpukit/rtems/src/regiongetsegment.c
@@ -46,7 +46,7 @@
  */
 
 rtems_status_code rtems_region_get_segment(
-  Objects_Id         id,
+  rtems_id           id,
   uintptr_t          size,
   rtems_option       option_set,
   rtems_interval     timeout,
diff --git a/cpukit/rtems/src/regiongetsegmentsize.c b/cpukit/rtems/src/regiongetsegmentsize.c
index 24c47b23fd..601145128a 100644
--- a/cpukit/rtems/src/regiongetsegmentsize.c
+++ b/cpukit/rtems/src/regiongetsegmentsize.c
@@ -43,9 +43,9 @@
  */
 
 rtems_status_code rtems_region_get_segment_size(
-  Objects_Id         id,
-  void              *segment,
-  uintptr_t         *size
+  rtems_id   id,
+  void      *segment,
+  uintptr_t *size
 )
 {
   Objects_Locations        location;
diff --git a/cpukit/rtems/src/regionident.c b/cpukit/rtems/src/regionident.c
index adeba9ffe7..55df94d48c 100644
--- a/cpukit/rtems/src/regionident.c
+++ b/cpukit/rtems/src/regionident.c
@@ -44,8 +44,8 @@
  */
 
 rtems_status_code rtems_region_ident(
-  rtems_name    name,
-  Objects_Id   *id
+  rtems_name  name,
+  rtems_id   *id
 )
 {
   Objects_Name_or_id_lookup_errors  status;
diff --git a/cpukit/rtems/src/regionresizesegment.c b/cpukit/rtems/src/regionresizesegment.c
index 1fac2c18d3..737e31436e 100644
--- a/cpukit/rtems/src/regionresizesegment.c
+++ b/cpukit/rtems/src/regionresizesegment.c
@@ -44,7 +44,7 @@
  */
 
 rtems_status_code rtems_region_resize_segment(
-  Objects_Id  id,
+  rtems_id    id,
   void       *segment,
   uintptr_t   size,
   uintptr_t  *old_size
diff --git a/cpukit/rtems/src/regionreturnsegment.c b/cpukit/rtems/src/regionreturnsegment.c
index 346d8d29a2..b98ff1d486 100644
--- a/cpukit/rtems/src/regionreturnsegment.c
+++ b/cpukit/rtems/src/regionreturnsegment.c
@@ -50,8 +50,8 @@
  */
 
 rtems_status_code rtems_region_return_segment(
-  Objects_Id  id,
-  void       *segment
+  rtems_id  id,
+  void     *segment
 )
 {
   Objects_Locations        location;
diff --git a/cpukit/rtems/src/signalmp.c b/cpukit/rtems/src/signalmp.c
index f49a0a5862..2311e9e4a0 100644
--- a/cpukit/rtems/src/signalmp.c
+++ b/cpukit/rtems/src/signalmp.c
@@ -46,7 +46,7 @@
 rtems_status_code _Signal_MP_Send_request_packet (
   Signal_MP_Remote_operations operation,
   Objects_Id                  task_id,
-  rtems_signal_set      signal_in
+  rtems_signal_set            signal_in
 )
 {
   Signal_MP_Packet *the_packet;
diff --git a/cpukit/rtems/src/signalsend.c b/cpukit/rtems/src/signalsend.c
index d5dc503cdd..038317e55d 100644
--- a/cpukit/rtems/src/signalsend.c
+++ b/cpukit/rtems/src/signalsend.c
@@ -41,7 +41,7 @@
  */
 
 rtems_status_code rtems_signal_send(
-  Objects_Id        id,
+  rtems_id          id,
   rtems_signal_set  signal_set
 )
 {
diff --git a/cpukit/rtems/src/taskcreate.c b/cpukit/rtems/src/taskcreate.c
index b82b7e8468..c173eced29 100644
--- a/cpukit/rtems/src/taskcreate.c
+++ b/cpukit/rtems/src/taskcreate.c
@@ -61,7 +61,7 @@ rtems_status_code rtems_task_create(
   size_t               stack_size,
   rtems_mode           initial_modes,
   rtems_attribute      attribute_set,
-  Objects_Id          *id
+  rtems_id            *id
 )
 {
   register Thread_Control *the_thread;
diff --git a/cpukit/rtems/src/taskdelete.c b/cpukit/rtems/src/taskdelete.c
index be5b44ccea..a29ea77ac4 100644
--- a/cpukit/rtems/src/taskdelete.c
+++ b/cpukit/rtems/src/taskdelete.c
@@ -52,7 +52,7 @@
  */
 
 rtems_status_code rtems_task_delete(
-  Objects_Id id
+  rtems_id id
 )
 {
   register Thread_Control *the_thread;
diff --git a/cpukit/rtems/src/taskgetnote.c b/cpukit/rtems/src/taskgetnote.c
index dda1ddb7ae..46c28460a5 100644
--- a/cpukit/rtems/src/taskgetnote.c
+++ b/cpukit/rtems/src/taskgetnote.c
@@ -52,7 +52,7 @@
  */
 
 rtems_status_code rtems_task_get_note(
-  Objects_Id  id,
+  rtems_id    id,
   uint32_t    notepad,
   uint32_t   *note
 )
diff --git a/cpukit/rtems/src/taskident.c b/cpukit/rtems/src/taskident.c
index 7e74edb9bf..8888c77ee2 100644
--- a/cpukit/rtems/src/taskident.c
+++ b/cpukit/rtems/src/taskident.c
@@ -53,7 +53,7 @@
 rtems_status_code rtems_task_ident(
   rtems_name    name,
   uint32_t      node,
-  Objects_Id   *id
+  rtems_id     *id
 )
 {
   Objects_Name_or_id_lookup_errors  status;
diff --git a/cpukit/rtems/src/taskissuspended.c b/cpukit/rtems/src/taskissuspended.c
index 9d8f9fe02c..eaea72160d 100644
--- a/cpukit/rtems/src/taskissuspended.c
+++ b/cpukit/rtems/src/taskissuspended.c
@@ -49,7 +49,7 @@
  */
 
 rtems_status_code rtems_task_is_suspended(
-  Objects_Id id
+  rtems_id id
 )
 {
   register Thread_Control *the_thread;
diff --git a/cpukit/rtems/src/taskrestart.c b/cpukit/rtems/src/taskrestart.c
index 61d14b3dc1..bc85137b23 100644
--- a/cpukit/rtems/src/taskrestart.c
+++ b/cpukit/rtems/src/taskrestart.c
@@ -51,8 +51,8 @@
  */
 
 rtems_status_code rtems_task_restart(
-  Objects_Id id,
-  uint32_t   argument
+  rtems_id  id,
+  uint32_t  argument
 )
 {
   register Thread_Control *the_thread;
diff --git a/cpukit/rtems/src/taskresume.c b/cpukit/rtems/src/taskresume.c
index 224d259759..ae5e4202f5 100644
--- a/cpukit/rtems/src/taskresume.c
+++ b/cpukit/rtems/src/taskresume.c
@@ -48,7 +48,7 @@
  */
 
 rtems_status_code rtems_task_resume(
-  Objects_Id id
+  rtems_id id
 )
 {
   register Thread_Control *the_thread;
diff --git a/cpukit/rtems/src/tasksetnote.c b/cpukit/rtems/src/tasksetnote.c
index 45825aeb46..cd2bfb6dd1 100644
--- a/cpukit/rtems/src/tasksetnote.c
+++ b/cpukit/rtems/src/tasksetnote.c
@@ -50,9 +50,9 @@
  */
 
 rtems_status_code rtems_task_set_note(
-  Objects_Id id,
-  uint32_t   notepad,
-  uint32_t   note
+  rtems_id id,
+  uint32_t notepad,
+  uint32_t note
 )
 {
   register Thread_Control *the_thread;
diff --git a/cpukit/rtems/src/tasksetpriority.c b/cpukit/rtems/src/tasksetpriority.c
index 3b1493bdf2..7499d176e0 100644
--- a/cpukit/rtems/src/tasksetpriority.c
+++ b/cpukit/rtems/src/tasksetpriority.c
@@ -52,7 +52,7 @@
  */
 
 rtems_status_code rtems_task_set_priority(
-  Objects_Id           id,
+  rtems_id             id,
   rtems_task_priority  new_priority,
   rtems_task_priority *old_priority
 )
diff --git a/cpukit/rtems/src/tasksuspend.c b/cpukit/rtems/src/tasksuspend.c
index bd67862182..3f7e8b7d03 100644
--- a/cpukit/rtems/src/tasksuspend.c
+++ b/cpukit/rtems/src/tasksuspend.c
@@ -49,7 +49,7 @@
  */
 
 rtems_status_code rtems_task_suspend(
-  Objects_Id id
+  rtems_id id
 )
 {
   register Thread_Control *the_thread;
diff --git a/cpukit/rtems/src/timercancel.c b/cpukit/rtems/src/timercancel.c
index e369f0766d..abab3f424c 100644
--- a/cpukit/rtems/src/timercancel.c
+++ b/cpukit/rtems/src/timercancel.c
@@ -40,7 +40,7 @@
  */
 
 rtems_status_code rtems_timer_cancel(
-  Objects_Id id
+  rtems_id id
 )
 {
   Timer_Control   *the_timer;
diff --git a/cpukit/rtems/src/timercreate.c b/cpukit/rtems/src/timercreate.c
index e303b93204..e277768933 100644
--- a/cpukit/rtems/src/timercreate.c
+++ b/cpukit/rtems/src/timercreate.c
@@ -42,8 +42,8 @@
  */
 
 rtems_status_code rtems_timer_create(
-  rtems_name    name,
-  Objects_Id   *id
+  rtems_name  name,
+  rtems_id   *id
 )
 {
   Timer_Control *the_timer;
diff --git a/cpukit/rtems/src/timerdelete.c b/cpukit/rtems/src/timerdelete.c
index f855767e14..7dbc812a2e 100644
--- a/cpukit/rtems/src/timerdelete.c
+++ b/cpukit/rtems/src/timerdelete.c
@@ -40,7 +40,7 @@
  */
 
 rtems_status_code rtems_timer_delete(
-  Objects_Id id
+  rtems_id id
 )
 {
   Timer_Control     *the_timer;
diff --git a/cpukit/rtems/src/timerfireafter.c b/cpukit/rtems/src/timerfireafter.c
index df124536fd..540ede38ad 100644
--- a/cpukit/rtems/src/timerfireafter.c
+++ b/cpukit/rtems/src/timerfireafter.c
@@ -43,7 +43,7 @@
  */
 
 rtems_status_code rtems_timer_fire_after(
-  Objects_Id                         id,
+  rtems_id                           id,
   rtems_interval                     ticks,
   rtems_timer_service_routine_entry  routine,
   void                              *user_data
diff --git a/cpukit/rtems/src/timerfirewhen.c b/cpukit/rtems/src/timerfirewhen.c
index 84ed3f6520..670b39ec1b 100644
--- a/cpukit/rtems/src/timerfirewhen.c
+++ b/cpukit/rtems/src/timerfirewhen.c
@@ -43,7 +43,7 @@
  */
 
 rtems_status_code rtems_timer_fire_when(
-  Objects_Id                          id,
+  rtems_id                            id,
   rtems_time_of_day                  *wall_time,
   rtems_timer_service_routine_entry   routine,
   void                               *user_data
diff --git a/cpukit/rtems/src/timergetinfo.c b/cpukit/rtems/src/timergetinfo.c
index bcf8487a47..2b648597fe 100644
--- a/cpukit/rtems/src/timergetinfo.c
+++ b/cpukit/rtems/src/timergetinfo.c
@@ -43,7 +43,7 @@
  */
 
 rtems_status_code rtems_timer_get_information(
-  Objects_Id               id,
+  rtems_id                 id,
   rtems_timer_information *the_info
 )
 {
diff --git a/cpukit/rtems/src/timerident.c b/cpukit/rtems/src/timerident.c
index af32943bc7..1f1ebbcd7d 100644
--- a/cpukit/rtems/src/timerident.c
+++ b/cpukit/rtems/src/timerident.c
@@ -44,7 +44,7 @@
 
 rtems_status_code rtems_timer_ident(
   rtems_name    name,
-  Objects_Id   *id
+  rtems_id     *id
 )
 {
   Objects_Name_or_id_lookup_errors  status;
diff --git a/cpukit/rtems/src/timerreset.c b/cpukit/rtems/src/timerreset.c
index fc3f074895..4a3e094a08 100644
--- a/cpukit/rtems/src/timerreset.c
+++ b/cpukit/rtems/src/timerreset.c
@@ -40,7 +40,7 @@
  */
 
 rtems_status_code rtems_timer_reset(
-  Objects_Id id
+  rtems_id id
 )
 {
   Timer_Control     *the_timer;
diff --git a/cpukit/rtems/src/timerserverfireafter.c b/cpukit/rtems/src/timerserverfireafter.c
index 43458df5e7..a0af568865 100644
--- a/cpukit/rtems/src/timerserverfireafter.c
+++ b/cpukit/rtems/src/timerserverfireafter.c
@@ -44,7 +44,7 @@
  */
 
 rtems_status_code rtems_timer_server_fire_after(
-  Objects_Id                         id,
+  rtems_id                           id,
   rtems_interval                     ticks,
   rtems_timer_service_routine_entry  routine,
   void                              *user_data
diff --git a/cpukit/rtems/src/timerserverfirewhen.c b/cpukit/rtems/src/timerserverfirewhen.c
index a0ea2287b9..d5e6c472a1 100644
--- a/cpukit/rtems/src/timerserverfirewhen.c
+++ b/cpukit/rtems/src/timerserverfirewhen.c
@@ -44,7 +44,7 @@
  */
 
 rtems_status_code rtems_timer_server_fire_when(
-  Objects_Id                         id,
+  rtems_id                           id,
   rtems_time_of_day                  *wall_time,
   rtems_timer_service_routine_entry  routine,
   void                              *user_data