diff options
author | Joel Sherrill <joel@rtems.org> | 2016-03-22 17:13:30 -0500 |
---|---|---|
committer | Joel Sherrill <joel@rtems.org> | 2016-04-14 16:36:53 -0500 |
commit | e65c45c4b6cf6dfb485bef48385e39969de8b361 (patch) | |
tree | 2ef5f976ff45c59bd29ce006f2c2585cd0e05e23 /cpukit/rtems | |
parent | conddefaultattributes.c: Add default clock to structure. (diff) | |
download | rtems-e65c45c4b6cf6dfb485bef48385e39969de8b361.tar.bz2 |
Obsolete rtems_clock_get() directive.
This service was marked as deprecated long prior to the 4.11 release
series and is now being removed.
closes #2676.
Diffstat (limited to '')
-rw-r--r-- | cpukit/rtems/Makefile.am | 1 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/clock.h | 41 | ||||
-rw-r--r-- | cpukit/rtems/src/clockget.c | 67 |
3 files changed, 0 insertions, 109 deletions
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index c92a7c8bc8..6515a08449 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -142,7 +142,6 @@ librtems_a_SOURCES += src/barrierrelease.c librtems_a_SOURCES += src/barrierwait.c ## CLOCK_C_FILES -librtems_a_SOURCES += src/clockget.c librtems_a_SOURCES += src/clockgetsecondssinceepoch.c librtems_a_SOURCES += src/clockgettickspersecond.c librtems_a_SOURCES += src/clockgettod.c diff --git a/cpukit/rtems/include/rtems/rtems/clock.h b/cpukit/rtems/include/rtems/rtems/clock.h index 453d001698..b1ae8845a6 100644 --- a/cpukit/rtems/include/rtems/rtems/clock.h +++ b/cpukit/rtems/include/rtems/rtems/clock.h @@ -53,47 +53,6 @@ extern "C" { #endif /** - * List of things which can be returned by the rtems_clock_get directive. - */ -typedef enum { - /** This value indicates obtain TOD in Classic API format. */ - RTEMS_CLOCK_GET_TOD, - /** This value indicates obtain the number of seconds since the epoch. */ - RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, - /** This value indicates obtain the number of ticks since system boot. */ - RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, - /** This value indicates obtain the number of ticks per second. */ - RTEMS_CLOCK_GET_TICKS_PER_SECOND, - /** This value indicates obtain the TOD in struct timeval format. */ - RTEMS_CLOCK_GET_TIME_VALUE -} rtems_clock_get_options; - -/** - * @brief Obtain Current Time of Day - * - * @deprecated rtems_clock_get() is deprecated. Use the more explicit - * function calls rtems_clock_get_xxx(). - * - * This routine implements the rtems_clock_get directive. It returns - * one of the following: - * + current time of day - * + seconds since epoch - * + ticks since boot - * + ticks per second - * - * @param[in] option is the format of time to return - * @param[in] time_buffer points to the output area - * - * @retval This method returns RTEMS_SUCCESSFUL if there was not an - * error. Otherwise, a status code is returned indicating the - * source of the error. - */ -rtems_status_code rtems_clock_get( - rtems_clock_get_options option, - void *time_buffer -) RTEMS_DEPRECATED; - -/** * @brief Obtain Current Time of Day (Classic TOD) * * This routine implements the rtems_clock_get_tod directive. It returns diff --git a/cpukit/rtems/src/clockget.c b/cpukit/rtems/src/clockget.c deleted file mode 100644 index 860e93021a..0000000000 --- a/cpukit/rtems/src/clockget.c +++ /dev/null @@ -1,67 +0,0 @@ -/** - * @file - * - * @brief Obtain Current Time of Day - * @ingroup ClassicClock - */ - -/* - * COPYRIGHT (c) 1989-2009. - * 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 - -#include <rtems/system.h> -#include <rtems/rtems/status.h> -#include <rtems/rtems/clock.h> -#include <rtems/score/isr.h> -#include <rtems/score/thread.h> -#include <rtems/score/watchdog.h> - -/* - * Ignore deprecated warning when compiling this method. We know - * this method is deprecated. - */ -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -rtems_status_code rtems_clock_get( - rtems_clock_get_options option, - void *time_buffer -) -{ - if ( !time_buffer ) - return RTEMS_INVALID_ADDRESS; - - if ( option == RTEMS_CLOCK_GET_TOD ) - return rtems_clock_get_tod( (rtems_time_of_day *)time_buffer ); - - if ( option == RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH ) - return rtems_clock_get_seconds_since_epoch((rtems_interval *)time_buffer); - - if ( option == RTEMS_CLOCK_GET_TICKS_SINCE_BOOT ) { - rtems_interval *interval = (rtems_interval *)time_buffer; - - *interval = rtems_clock_get_ticks_since_boot(); - return RTEMS_SUCCESSFUL; - } - - if ( option == RTEMS_CLOCK_GET_TICKS_PER_SECOND ) { - rtems_interval *interval = (rtems_interval *)time_buffer; - - *interval = rtems_clock_get_ticks_per_second(); - return RTEMS_SUCCESSFUL; - } - - if ( option == RTEMS_CLOCK_GET_TIME_VALUE ) - return rtems_clock_get_tod_timeval( (struct timeval *)time_buffer ); - - return RTEMS_INVALID_NUMBER; - -} |