2000-08-25 Joel Sherrill <joel.sherrill@OARcorp.com>

	* inline/rtems/posix/timer.inl, include/rtems/posix/timer.h,
	inline/rtems/posix/Makefile.am, src/ptimer1.c: Redid the
	style of src/ptimer1.c.  Continued effort to make the
	POSIX Timer implementation match that of other managers.
	Added data structures required to use SuperCore Object Handler.

2 files changed, 91 insertions, 1 deletions

diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.am b/c/src/exec/posix/inline/rtems/posix/Makefile.am
index a38f1fa8f1..a479cf611b 100644
--- a/c/src/exec/posix/inline/rtems/posix/Makefile.am
+++ b/c/src/exec/posix/inline/rtems/posix/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
 
 #I_FILES= intr.inl
 I_FILES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \
-    semaphore.inl
+    semaphore.inl timer.inl
 
 noinst_HEADERS = $(I_FILES)
 
diff --git a/c/src/exec/posix/inline/rtems/posix/timer.inl b/c/src/exec/posix/inline/rtems/posix/timer.inl
new file mode 100644
index 0000000000..96bd86f677
--- /dev/null
+++ b/c/src/exec/posix/inline/rtems/posix/timer.inl
@@ -0,0 +1,90 @@
+/*  timer.inl
+ *
+ *  This file contains the static inline implementation of the inlined routines
+ *  from the POSIX Timer Manager.
+ *
+ *  COPYRIGHT (c) 1989-1999.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.OARcorp.com/rtems/license.html.
+ *
+ *  $Id$
+ */
+
+#ifndef __POSIX_TIMER_inl
+#define __POSIX_TIMER_inl
+
+/*PAGE
+ *
+ *  _POSIX_Timer_Allocate
+ *
+ *  DESCRIPTION:
+ *
+ *  This function allocates a timer control block from
+ *  the inactive chain of free timer control blocks.
+ */
+
+RTEMS_INLINE_ROUTINE POSIX_Timer_Control *_POSIX_Timer_Allocate( void )
+{
+  return (POSIX_Timer_Control *) _Objects_Allocate( &_POSIX_Timer_Information );
+}
+
+/*PAGE
+ *
+ *  _POSIX_Timer_Free
+ *
+ *  DESCRIPTION:
+ *
+ *  This routine frees a timer control block to the
+ *  inactive chain of free timer control blocks.
+ */
+
+RTEMS_INLINE_ROUTINE void _POSIX_Timer_Free (
+  POSIX_Timer_Control *the_timer
+)
+{
+  _Objects_Free( &_POSIX_Timer_Information, &the_timer->Object );
+}
+
+/*PAGE
+ *
+ *  _POSIX_Timer_Get
+ *
+ *  DESCRIPTION:
+ *
+ *  This function maps timer IDs to timer control blocks.
+ *  If ID corresponds to a local timer, then it returns
+ *  the timer control pointer which maps to ID and location
+ *  is set to OBJECTS_LOCAL.  Otherwise, location is set
+ *  to OBJECTS_ERROR and the returned value is undefined.
+ */
+
+RTEMS_INLINE_ROUTINE POSIX_Timer_Control *_POSIX_Timer_Get (
+  Objects_Id         id,
+  Objects_Locations *location
+)
+{
+  return (POSIX_Timer_Control *)
+    _Objects_Get( &_POSIX_Timer_Information, id, location );
+}
+
+/*PAGE
+ *
+ *  _POSIX_Timer_Is_null
+ *
+ *  DESCRIPTION:
+ *
+ *  This function returns TRUE if the_timer is NULL and FALSE otherwise.
+ */
+
+RTEMS_INLINE_ROUTINE boolean _POSIX_Timer_Is_null (
+  Timer_Control *the_timer
+)
+{
+  return (the_timer == NULL);
+}
+
+#endif
+/* end of include file */