summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-05-20 16:16:44 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-05-20 16:16:44 +0000
commit0aeda88267281235a45ec290ec9018aa57ef1c20 (patch)
tree3c4c426b5f40f0d0ee89de090e2cfba76e72e5e9
parentRemoved all post 4.0 changes. (diff)
downloadrtems-0aeda88267281235a45ec290ec9018aa57ef1c20.tar.bz2
Renamed to rtemstimer.c to avoid conflict with timer drivers in EVERY
BSP as we transition to more .o's and less .rel's.
-rw-r--r--c/src/exec/rtems/src/Makefile.in4
-rw-r--r--c/src/exec/rtems/src/timer.c51
2 files changed, 2 insertions, 53 deletions
diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in
index aa7ad5997f..868ac0aca4 100644
--- a/c/src/exec/rtems/src/Makefile.in
+++ b/c/src/exec/rtems/src/Makefile.in
@@ -35,7 +35,7 @@ CLOCK_PIECES=\
clock clockget clockset clocktick
TIMER_PIECES=\
- timer timercancel timercreate timerdelete timerfireafter \
+ rtemstimer timercancel timercreate timerdelete timerfireafter \
timerfirewhen timerident timerreset
MESSAGE_QUEUE_PIECES=\
@@ -55,7 +55,7 @@ SIGNAL_PIECES=\
REGION_PIECES=\
region regioncreate regiondelete regionextend regiongetsegment \
- regiongetsegmentsize regionident regionreturnsegemnt regionreturnsegemnt
+ regiongetsegmentsize regionident regionreturnsegment regionreturnsegment
PARTITION_PIECES=\
part partcreate partdelete partgetbuffer partident partreturnbuffer
diff --git a/c/src/exec/rtems/src/timer.c b/c/src/exec/rtems/src/timer.c
deleted file mode 100644
index 67d9c4ce89..0000000000
--- a/c/src/exec/rtems/src/timer.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Timer Manager
- *
- *
- * COPYRIGHT (c) 1989-1998.
- * On-Line Applications Research Corporation (OAR).
- * Copyright assigned to U.S. Government, 1994.
- *
- * 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$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/score/object.h>
-#include <rtems/score/thread.h>
-#include <rtems/rtems/timer.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
-
-/*PAGE
- *
- * _Timer_Manager_initialization
- *
- * This routine initializes all timer manager related data structures.
- *
- * Input parameters:
- * maximum_timers - number of timers to initialize
- *
- * Output parameters: NONE
- */
-
-void _Timer_Manager_initialization(
- unsigned32 maximum_timers
-)
-{
- _Objects_Initialize_information(
- &_Timer_Information,
- OBJECTS_RTEMS_TIMERS,
- FALSE,
- maximum_timers,
- sizeof( Timer_Control ),
- FALSE,
- RTEMS_MAXIMUM_NAME_LENGTH,
- FALSE
- );
-}