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.

11 files changed, 90 insertions, 90 deletions

diff --git a/cpukit/rtems/include/rtems/rtems/dpmem.h b/cpukit/rtems/include/rtems/rtems/dpmem.h
index f8b1cc8064..86885143b5 100644
--- a/cpukit/rtems/include/rtems/rtems/dpmem.h
+++ b/cpukit/rtems/include/rtems/rtems/dpmem.h
@@ -99,7 +99,7 @@ rtems_status_code rtems_port_create(
   void         *internal_start,
   void         *external_start,
   uint32_t      length,
-  Objects_Id   *id
+  rtems_id     *id
 );
 
 /**
@@ -111,7 +111,7 @@ rtems_status_code rtems_port_create(
  */
 rtems_status_code rtems_port_ident(
   rtems_name    name,
-  Objects_Id   *id
+  rtems_id     *id
 );
 
 /**
@@ -121,7 +121,7 @@ rtems_status_code rtems_port_ident(
  *  the port associated with ID.
  */
 rtems_status_code rtems_port_delete(
-  Objects_Id id
+  rtems_id   id
 );
 
 /**
@@ -132,7 +132,7 @@ rtems_status_code rtems_port_delete(
  *  external port address for the specified port ID.
  */
 rtems_status_code rtems_port_external_to_internal(
-  Objects_Id   id,
+  rtems_id     id,
   void        *external,
   void       **internal
 );
@@ -145,7 +145,7 @@ rtems_status_code rtems_port_external_to_internal(
  *  internal port address for the specified port ID.
  */
 rtems_status_code rtems_port_internal_to_external(
-  Objects_Id   id,
+  rtems_id     id,
   void        *internal,
   void       **external
 );
diff --git a/cpukit/rtems/include/rtems/rtems/event.h b/cpukit/rtems/include/rtems/rtems/event.h
index 8006762951..05f66d64cd 100644
--- a/cpukit/rtems/include/rtems/rtems/event.h
+++ b/cpukit/rtems/include/rtems/rtems/event.h
@@ -79,7 +79,7 @@ void _Event_Manager_initialization( void );
  *  the task's event condition, then it is unblocked.
  */
 rtems_status_code rtems_event_send (
-  Objects_Id         id,
+  rtems_id        id,
   rtems_event_set event_in
 );
 
diff --git a/cpukit/rtems/include/rtems/rtems/message.h b/cpukit/rtems/include/rtems/rtems/message.h
index f4e73c3cbc..c56cc220a1 100644
--- a/cpukit/rtems/include/rtems/rtems/message.h
+++ b/cpukit/rtems/include/rtems/rtems/message.h
@@ -120,7 +120,7 @@ rtems_status_code rtems_message_queue_create(
   uint32_t         count,
   size_t           max_message_size,
   rtems_attribute  attribute_set,
-  Objects_Id      *id
+  rtems_id        *id
 );
 
 /**
@@ -135,9 +135,9 @@ rtems_status_code rtems_message_queue_create(
  *  encompass all nodes.
  */
 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
 );
 
 /**
@@ -147,7 +147,7 @@ rtems_status_code rtems_message_queue_ident(
  *  message queue indicated by ID is deleted.
  */
 rtems_status_code rtems_message_queue_delete(
-  Objects_Id id
+  rtems_id id
 );
 
 /**
@@ -164,9 +164,9 @@ rtems_status_code rtems_message_queue_delete(
  *  chain of pending messages for this message queue.
  */
 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
 );
 
 /**
@@ -179,9 +179,9 @@ rtems_status_code rtems_message_queue_send(
  *  than at the REAR.
  */
 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
 );
 
 /**
@@ -193,10 +193,10 @@ rtems_status_code rtems_message_queue_urgent(
  *  If no tasks are waiting, then the message buffer will not be queued.
  */
 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
 );
 
 /**
@@ -211,11 +211,11 @@ rtems_status_code rtems_message_queue_broadcast(
  *  optionally, timeout clock ticks have passed.
  */
 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
 );
 
 /**
@@ -227,8 +227,8 @@ rtems_status_code rtems_message_queue_receive(
  *  chain.  The number of messages flushed is returned in COUNT.
  */
 rtems_status_code rtems_message_queue_flush(
-  Objects_Id  id,
-  uint32_t   *count
+  rtems_id  id,
+  uint32_t *count
 );
 
 /**
@@ -240,8 +240,8 @@ rtems_status_code rtems_message_queue_flush(
  *  chain.  The number of messages pending is returned in COUNT.
  */
 rtems_status_code rtems_message_queue_get_number_pending(
-  Objects_Id  id,
-  uint32_t   *count
+  rtems_id  id,
+  uint32_t *count
 );
 
 
@@ -256,7 +256,7 @@ rtems_status_code rtems_message_queue_get_number_pending(
  *  which will be inserted at the front of the queue.
  */
 rtems_status_code _Message_queue_Submit(
-  Objects_Id                  id,
+  rtems_id                    id,
   const void                 *buffer,
   size_t                      size,
   Message_queue_Submit_types  submit_type
@@ -292,7 +292,7 @@ rtems_status_code _Message_queue_Translate_core_message_queue_return_code (
  */
 void  _Message_queue_Core_message_queue_mp_support (
   Thread_Control *the_thread,
-  Objects_Id      id
+  rtems_id        id
 );
 #endif
 
diff --git a/cpukit/rtems/include/rtems/rtems/part.h b/cpukit/rtems/include/rtems/rtems/part.h
index e7601d6589..3d3d2938ab 100644
--- a/cpukit/rtems/include/rtems/rtems/part.h
+++ b/cpukit/rtems/include/rtems/rtems/part.h
@@ -104,12 +104,12 @@ void _Partition_Manager_initialization(void);
  *  created partition in ID.
  */
 rtems_status_code rtems_partition_create(
-  rtems_name          name,
-  void               *starting_address,
-  uint32_t            length,
-  uint32_t            buffer_size,
+  rtems_name       name,
+  void            *starting_address,
+  uint32_t         length,
+  uint32_t         buffer_size,
   rtems_attribute  attribute_set,
-  Objects_Id         *id
+  rtems_id        *id
 );
 
 /**
@@ -124,9 +124,9 @@ rtems_status_code rtems_partition_create(
  *  encompass all nodes.
  */
 rtems_status_code rtems_partition_ident(
-  rtems_name    name,
-  uint32_t      node,
-  Objects_Id   *id
+  rtems_name  name,
+  uint32_t    node,
+  rtems_id   *id
 );
 
 /**
@@ -136,7 +136,7 @@ rtems_status_code rtems_partition_ident(
  *  partition indicated by ID is deleted.
  */
 rtems_status_code rtems_partition_delete(
-  Objects_Id id
+  rtems_id id
 );
 
 /**
@@ -147,8 +147,8 @@ rtems_status_code rtems_partition_delete(
  *  If a buffer is allocated, its address is returned in buffer.
  */
 rtems_status_code rtems_partition_get_buffer(
-  Objects_Id  id,
-  void       **buffer
+  rtems_id   id,
+  void     **buffer
 );
 
 /**
@@ -159,8 +159,8 @@ rtems_status_code rtems_partition_get_buffer(
  *  have been previously allocated from the same partition.
  */
 rtems_status_code rtems_partition_return_buffer(
-  Objects_Id  id,
-  void       *buffer
+  rtems_id  id,
+  void     *buffer
 );
 
 #ifndef __RTEMS_APPLICATION__
diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/rtems/include/rtems/rtems/ratemon.h
index 74b4022ceb..9e0f1fda09 100644
--- a/cpukit/rtems/include/rtems/rtems/ratemon.h
+++ b/cpukit/rtems/include/rtems/rtems/ratemon.h
@@ -194,7 +194,7 @@ typedef struct {
  */
 typedef struct {
   /** This is the Id of the thread using this period. */
-  Objects_Id                           owner;
+  rtems_id                             owner;
 
   /** This is the current state of this period. */
   rtems_rate_monotonic_period_states   state;
@@ -283,7 +283,7 @@ void _Rate_monotonic_Manager_initialization(void);
  */
 rtems_status_code rtems_rate_monotonic_create(
   rtems_name    name,
-  Objects_Id   *id
+  rtems_id     *id
 );
 
 /**
@@ -295,7 +295,7 @@ rtems_status_code rtems_rate_monotonic_create(
  */
 rtems_status_code rtems_rate_monotonic_ident(
   rtems_name    name,
-  Objects_Id   *id
+  rtems_id     *id
 );
 
 /**
@@ -306,7 +306,7 @@ rtems_status_code rtems_rate_monotonic_ident(
  *  run.
  */
 rtems_status_code rtems_rate_monotonic_cancel(
-  Objects_Id id
+  rtems_id   id
 );
 
 /**
@@ -316,7 +316,7 @@ rtems_status_code rtems_rate_monotonic_cancel(
  *  period indicated by ID is deleted.
  */
 rtems_status_code rtems_rate_monotonic_delete(
-  Objects_Id id
+  rtems_id   id
 );
 
 /**
@@ -327,7 +327,7 @@ rtems_status_code rtems_rate_monotonic_delete(
  *
  */
 rtems_status_code rtems_rate_monotonic_get_status(
-  Objects_Id                           id,
+  rtems_id                             id,
   rtems_rate_monotonic_period_status  *status
 );
 
@@ -338,7 +338,7 @@ rtems_status_code rtems_rate_monotonic_get_status(
  *  Statistics gathered from the use of this period are returned.
  */
 rtems_status_code rtems_rate_monotonic_get_statistics(
-  Objects_Id                              id,
+  rtems_id                                id,
   rtems_rate_monotonic_period_statistics *statistics
 );
 
@@ -349,7 +349,7 @@ rtems_status_code rtems_rate_monotonic_get_statistics(
  *  on a specific period instance.
  */
 rtems_status_code rtems_rate_monotonic_reset_statistics(
-  Objects_Id                               id
+  rtems_id                                 id
 );
 
 /**
@@ -388,7 +388,7 @@ void rtems_rate_monotonic_report_statistics( void );
  *  result is set to indicate the current state of the period.
  */
 rtems_status_code rtems_rate_monotonic_period(
-  Objects_Id      id,
+  rtems_id        id,
   rtems_interval  length
 );
 
@@ -403,7 +403,7 @@ rtems_status_code rtems_rate_monotonic_period(
  *  state and not restarted.
  */
 void _Rate_monotonic_Timeout(
-  Objects_Id  id,
+  rtems_id    id,
   void       *ignored
 );
 
diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/rtems/include/rtems/rtems/region.h
index 87f367eb81..adab79b999 100644
--- a/cpukit/rtems/include/rtems/rtems/region.h
+++ b/cpukit/rtems/include/rtems/rtems/region.h
@@ -107,7 +107,7 @@ rtems_status_code rtems_region_create(
   uintptr_t           length,
   uintptr_t           page_size,
   rtems_attribute     attribute_set,
-  Objects_Id         *id
+  rtems_id           *id
 );
 
 /**
@@ -119,7 +119,7 @@ rtems_status_code rtems_region_create(
  *  the memory starting at starting_address.
  */
 rtems_status_code rtems_region_extend(
-  Objects_Id          id,
+  rtems_id            id,
   void               *starting_address,
   uintptr_t           length
 );
@@ -134,7 +134,7 @@ rtems_status_code rtems_region_extend(
  */
 rtems_status_code rtems_region_ident(
   rtems_name    name,
-  Objects_Id   *id
+  rtems_id     *id
 );
 
 /**
@@ -145,7 +145,7 @@ rtems_status_code rtems_region_ident(
  *  this region.
  */
 rtems_status_code rtems_region_get_information(
-  Objects_Id              id,
+  rtems_id                id,
   Heap_Information_block *the_info
 );
 
@@ -157,7 +157,7 @@ rtems_status_code rtems_region_get_information(
  *  heap associated with this region.
  */
 rtems_status_code rtems_region_get_free_information(
-  Objects_Id              id,
+  rtems_id                id,
   Heap_Information_block *the_info
 );
 
@@ -168,7 +168,7 @@ rtems_status_code rtems_region_get_free_information(
  *  region indicated by ID is deleted.
  */
 rtems_status_code rtems_region_delete(
-  Objects_Id id
+  rtems_id   id
 );
 
 /**
@@ -183,7 +183,7 @@ rtems_status_code rtems_region_delete(
  *  immediately is based on the no_wait option in the option_set.
  */
 rtems_status_code rtems_region_get_segment(
-  Objects_Id         id,
+  rtems_id           id,
   uintptr_t          size,
   rtems_option       option_set,
   rtems_interval     timeout,
@@ -197,7 +197,7 @@ rtems_status_code rtems_region_get_segment(
  *  returns the size in bytes of the specified user memory area.
  */
 rtems_status_code rtems_region_get_segment_size(
-  Objects_Id         id,
+  rtems_id           id,
   void              *segment,
   uintptr_t         *size
 );
@@ -214,7 +214,7 @@ rtems_status_code rtems_region_get_segment_size(
  *  satisfied.
  */
 rtems_status_code rtems_region_return_segment(
-  Objects_Id  id,
+  rtems_id    id,
   void       *segment
 );
 
@@ -239,7 +239,7 @@ rtems_status_code rtems_region_return_segment(
  *  segment.
  */
 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/include/rtems/rtems/semmp.h b/cpukit/rtems/include/rtems/rtems/semmp.h
index 1be30ef467..f3a06aeb2f 100644
--- a/cpukit/rtems/include/rtems/rtems/semmp.h
+++ b/cpukit/rtems/include/rtems/rtems/semmp.h
@@ -150,7 +150,7 @@ Semaphore_MP_Packet *_Semaphore_MP_Get_packet ( void );
  */
 void  _Semaphore_Core_mutex_mp_support (
   Thread_Control *the_thread,
-  rtems_id        id
+  Objects_Id      id
 );
 
 /**
@@ -162,7 +162,7 @@ void  _Semaphore_Core_mutex_mp_support (
  */
 void  _Semaphore_Core_semaphore_mp_support (
   Thread_Control *the_thread,
-  rtems_id        id
+  Objects_Id      id
 );
 
 #ifdef __cplusplus
diff --git a/cpukit/rtems/include/rtems/rtems/signal.h b/cpukit/rtems/include/rtems/rtems/signal.h
index 5f3be2a606..1517dce734 100644
--- a/cpukit/rtems/include/rtems/rtems/signal.h
+++ b/cpukit/rtems/include/rtems/rtems/signal.h
@@ -69,7 +69,7 @@ rtems_status_code rtems_signal_catch(
  *  sends the signal_set to the task specified by ID.
  */
 rtems_status_code rtems_signal_send(
-  Objects_Id             id,
+  rtems_id         id,
   rtems_signal_set signal_set
 );
 
diff --git a/cpukit/rtems/include/rtems/rtems/signalmp.h b/cpukit/rtems/include/rtems/rtems/signalmp.h
index 49fc37b0d0..46e6a60538 100644
--- a/cpukit/rtems/include/rtems/rtems/signalmp.h
+++ b/cpukit/rtems/include/rtems/rtems/signalmp.h
@@ -75,7 +75,7 @@ typedef struct {
 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
 );
 
 /**
diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h
index c468583ed8..1e9a9c57e6 100644
--- a/cpukit/rtems/include/rtems/rtems/tasks.h
+++ b/cpukit/rtems/include/rtems/rtems/tasks.h
@@ -261,7 +261,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
 );
 
 /**
@@ -278,7 +278,7 @@ rtems_status_code rtems_task_create(
 rtems_status_code rtems_task_ident(
   rtems_name    name,
   uint32_t      node,
-  Objects_Id   *id
+  rtems_id     *id
 );
 
 /**
@@ -288,7 +288,7 @@ rtems_status_code rtems_task_ident(
  *  task indicated by ID is deleted.
  */
 rtems_status_code rtems_task_delete(
-  Objects_Id id
+  rtems_id   id
 );
 
 /**
@@ -299,7 +299,7 @@ rtems_status_code rtems_task_delete(
  *  is returned in note.
  */
 rtems_status_code rtems_task_get_note(
-  Objects_Id  id,
+  rtems_id    id,
   uint32_t    notepad,
   uint32_t   *note
 );
@@ -312,7 +312,7 @@ rtems_status_code rtems_task_get_note(
  *  is returned in note.
  */
 rtems_status_code rtems_task_set_note(
-  Objects_Id id,
+  rtems_id   id,
   uint32_t   notepad,
   uint32_t   note
 );
@@ -339,7 +339,7 @@ rtems_status_code rtems_task_mode(
  *  point with the new argument.
  */
 rtems_status_code rtems_task_restart(
-  Objects_Id id,
+  rtems_id   id,
   uint32_t   arg
 );
 
@@ -350,7 +350,7 @@ rtems_status_code rtems_task_restart(
  *  SUSPENDED state is set for task associated with ID.
  */
 rtems_status_code rtems_task_suspend(
-  Objects_Id id
+  rtems_id   id
 );
 
 /**
@@ -360,7 +360,7 @@ rtems_status_code rtems_task_suspend(
  *  SUSPENDED state is cleared for task associated with ID.
  */
 rtems_status_code rtems_task_resume(
-  Objects_Id id
+  rtems_id   id
 );
 
 /**
@@ -372,7 +372,7 @@ rtems_status_code rtems_task_resume(
  *  in old_priority.
  */
 rtems_status_code rtems_task_set_priority(
-  Objects_Id           id,
+  rtems_id             id,
   rtems_task_priority  new_priority,
   rtems_task_priority *old_priority
 );
@@ -385,7 +385,7 @@ rtems_status_code rtems_task_set_priority(
  *  set to entry_point with the initial argument.
  */
 rtems_status_code rtems_task_start(
-  Objects_Id   id,
+  rtems_id     id,
   rtems_task_entry entry_point,
   rtems_task_argument     argument
 );
@@ -419,7 +419,7 @@ rtems_status_code rtems_task_wake_after(
  *  the specified task is suspended.
  */
 rtems_status_code rtems_task_is_suspended(
-  Objects_Id id
+  rtems_id   id
 );
 
 /**
diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/cpukit/rtems/include/rtems/rtems/timer.h
index 77fc3007ba..a328e9a0d1 100644
--- a/cpukit/rtems/include/rtems/rtems/timer.h
+++ b/cpukit/rtems/include/rtems/rtems/timer.h
@@ -236,7 +236,7 @@ void _Timer_Manager_initialization(void);
  */
 rtems_status_code rtems_timer_create(
   rtems_name    name,
-  Objects_Id   *id
+  rtems_id     *id
 );
 
 /**
@@ -249,7 +249,7 @@ rtems_status_code rtems_timer_create(
  */
 rtems_status_code rtems_timer_ident(
   rtems_name    name,
-  Objects_Id   *id
+  rtems_id     *id
 );
 
 /**
@@ -259,7 +259,7 @@ rtems_status_code rtems_timer_ident(
  *  to stop the timer associated with ID from firing.
  */
 rtems_status_code rtems_timer_cancel(
-  Objects_Id id
+  rtems_id   id
 );
 
 /**
@@ -269,7 +269,7 @@ rtems_status_code rtems_timer_cancel(
  *  timer indicated by ID is deleted.
  */
 rtems_status_code rtems_timer_delete(
-  Objects_Id id
+  rtems_id   id
 );
 
 /**
@@ -282,7 +282,7 @@ rtems_status_code rtems_timer_delete(
  *  part of servicing a periodic interupt.
  */
 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
@@ -298,7 +298,7 @@ rtems_status_code rtems_timer_fire_after(
  *  clock tick interrupt.
  */
 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
@@ -314,7 +314,7 @@ rtems_status_code rtems_timer_server_fire_after(
  *  part of servicing a periodic interupt.
  */
 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
@@ -330,7 +330,7 @@ rtems_status_code rtems_timer_fire_when(
  *  clock tick interrupt.
  */
 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
@@ -345,7 +345,7 @@ rtems_status_code rtems_timer_server_fire_when(
  *  were used to initiate this timer.
  */
 rtems_status_code rtems_timer_reset(
-  Objects_Id id
+  rtems_id   id
 );
 
 /**
@@ -390,7 +390,7 @@ typedef struct {
  *  This directive returns information about the timer.
  */
 rtems_status_code rtems_timer_get_information(
-  Objects_Id               id,
+  rtems_id                 id,
   rtems_timer_information *the_info
 );