diff options
Diffstat (limited to 'cpukit/rtems/src')
| -rw-r--r-- | cpukit/rtems/src/rtemstimer.c | 22 | ||||
| -rw-r--r-- | cpukit/rtems/src/rtemstimerdata.c | 23 |
2 files changed, 12 insertions, 33 deletions
diff --git a/cpukit/rtems/src/rtemstimer.c b/cpukit/rtems/src/rtemstimer.c index 259a81c2fb..f591c25af2 100644 --- a/cpukit/rtems/src/rtemstimer.c +++ b/cpukit/rtems/src/rtemstimer.c @@ -20,13 +20,16 @@ #include <rtems/system.h> #include <rtems/config.h> +#include <rtems/sysinit.h> #include <rtems/rtems/status.h> #include <rtems/rtems/support.h> -#include <rtems/score/thread.h> #include <rtems/rtems/timerimpl.h> -#include <rtems/score/watchdog.h> -void _Timer_Manager_initialization(void) +Timer_server_Control *volatile _Timer_server; + +Objects_Information _Timer_Information; + +static void _Timer_Manager_initialization(void) { _Objects_Initialize_information( &_Timer_Information, /* object information table */ @@ -43,11 +46,10 @@ void _Timer_Manager_initialization(void) NULL /* Proxy extraction support callout */ #endif ); - - /* - * Initialize the pointer to the default timer server control block to NULL - * indicating that task-based timer support is not initialized. - */ - - _Timer_server = NULL; } + +RTEMS_SYSINIT_ITEM( + _Timer_Manager_initialization, + RTEMS_SYSINIT_CLASSIC_TIMER, + RTEMS_SYSINIT_ORDER_MIDDLE +); diff --git a/cpukit/rtems/src/rtemstimerdata.c b/cpukit/rtems/src/rtemstimerdata.c deleted file mode 100644 index 522e9cb0bf..0000000000 --- a/cpukit/rtems/src/rtemstimerdata.c +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file - * - * @brief Instantiate RTEMS Timer Data - * @ingroup ClassicTimer - */ - -/* - * COPYRIGHT (c) 1989-2007. - * 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.rtems.org/license/LICENSE. - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#define RTEMS_TIMER_EXTERN - -#include <rtems/rtems/timerimpl.h> |