This service was marked as deprecated long prior to the 4.11 release
series and is now being removed.
closes #2676.
---
c/src/ada-tests/mptests/mp01/mptest.adb | 8 +-
c/src/ada-tests/samples/ticker/sptest.adb | 4 +-
c/src/ada-tests/sptests/sp01/sptest.adb | 4 +-
c/src/ada-tests/sptests/sp03/sptest.adb | 8 +-
c/src/ada-tests/sptests/sp04/sptest.adb | 28 ++--
c/src/ada-tests/sptests/sp09/sptest.adb | 27 ++--
c/src/ada-tests/sptests/sp11/sptest.adb | 16 +-
c/src/ada-tests/sptests/sp19/sptest.adp | 8 +-
c/src/ada-tests/sptests/sp20/sptest.adb | 10 +-
c/src/ada-tests/sptests/sp22/sptest.adb | 12 +-
c/src/ada-tests/sptests/sp24/sptest.adb | 4 +-
c/src/ada-tests/tmtests/tm08/tmtest.adb | 5 +-
c/src/ada-tests/tmtests/tm08/tmtest.ads | 1 -
c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb | 8 +-
c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads | 5 +-
c/src/ada-tests/tmtests/tmoverhd/tmtest.adb | 4 +-
c/src/ada/rtems-clock.adb | 16 --
c/src/ada/rtems-clock.ads | 22 ---
.../make/custom/xilinx_zynq_a9_qemu.cfg | 3 +
cpukit/rtems/Makefile.am | 1 -
cpukit/rtems/include/rtems/rtems/clock.h | 41 -----
cpukit/rtems/src/clockget.c | 67 --------
doc/user/clock.t | 167 ++++----------------
testsuites/sptests/Makefile.am | 2 +-
testsuites/sptests/configure.ac | 1 -
testsuites/sptests/spclockget/Makefile.am | 22 ---
testsuites/sptests/spclockget/init.c | 99 ------------
testsuites/sptests/spclockget/spclockget.doc | 19 ---
testsuites/sptests/spclockget/spclockget.scn | 8 -
testsuites/tmtests/tmoverhd/dumrtems.h | 2 +-
testsuites/tmtests/tmoverhd/testtask.c | 9 +-
31 files changed, 109 insertions(+), 522 deletions(-)
delete mode 100644 cpukit/rtems/src/clockget.c
delete mode 100644 testsuites/sptests/spclockget/Makefile.am
delete mode 100644 testsuites/sptests/spclockget/init.c
delete mode 100644 testsuites/sptests/spclockget/spclockget.doc
delete mode 100644 testsuites/sptests/spclockget/spclockget.scn
diff --git a/c/src/ada-tests/mptests/mp01/mptest.adb
b/c/src/ada-tests/mptests/mp01/mptest.adb
index 779d124..b76a1af 100644
--- a/c/src/ada-tests/mptests/mp01/mptest.adb
+++ b/c/src/ada-tests/mptests/mp01/mptest.adb
@@ -146,8 +146,8 @@ package body MPTEST is
RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PUT_NAME(
MPTEST.TASK_NAME( TEST_SUPPORT.TASK_NUMBER( TID ) ),
@@ -164,8 +164,8 @@ package body MPTEST is
);
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PUT_NAME(
MPTEST.TASK_NAME( TEST_SUPPORT.TASK_NUMBER( TID ) ),
diff --git a/c/src/ada-tests/samples/ticker/sptest.adb
b/c/src/ada-tests/samples/ticker/sptest.adb
index cfc33c7..2de8b35 100644
--- a/c/src/ada-tests/samples/ticker/sptest.adb
+++ b/c/src/ada-tests/samples/ticker/sptest.adb
@@ -129,8 +129,8 @@ package body SPTEST is
loop
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
if TIME.SECOND >= 35 then
TEXT_IO.PUT_LINE( "*** END OF CLOCK TICK TEST ***" );
diff --git a/c/src/ada-tests/sptests/sp01/sptest.adb
b/c/src/ada-tests/sptests/sp01/sptest.adb
index 53dc5dd..46e48e9 100644
--- a/c/src/ada-tests/sptests/sp01/sptest.adb
+++ b/c/src/ada-tests/sptests/sp01/sptest.adb
@@ -129,8 +129,8 @@ package body SPTEST is
loop
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
if TIME.SECOND >= 35 then
TEXT_IO.PUT_LINE( "*** END OF TEST 1 ***" );
diff --git a/c/src/ada-tests/sptests/sp03/sptest.adb
b/c/src/ada-tests/sptests/sp03/sptest.adb
index f29168d..24be47e 100644
--- a/c/src/ada-tests/sptests/sp03/sptest.adb
+++ b/c/src/ada-tests/sptests/sp03/sptest.adb
@@ -108,8 +108,8 @@ package body SPTEST is
loop
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PUT_NAME( SPTEST.TASK_NAME( 1 ), FALSE );
TEST_SUPPORT.PRINT_TIME( "going to sleep: ", TIME, "" );
@@ -150,8 +150,8 @@ package body SPTEST is
RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
if TIME.SECOND >= 17 then
TEXT_IO.PUT_LINE( "*** END OF TEST 3 ***" );
diff --git a/c/src/ada-tests/sptests/sp04/sptest.adb
b/c/src/ada-tests/sptests/sp04/sptest.adb
index 33fc680..01283d3 100644
--- a/c/src/ada-tests/sptests/sp04/sptest.adb
+++ b/c/src/ada-tests/sptests/sp04/sptest.adb
@@ -193,20 +193,12 @@ package body SPTEST is
TEXT_IO.PUT_LINE( "TA1 - killing time" );
- RTEMS.CLOCK.GET(
- RTEMS.CLOCK.GET_SECONDS_SINCE_EPOCH,
- START_TIME'ADDRESS,
- STATUS
- );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_SECONDS_SINCE_EPOCH( START_TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_SECONDS_SINCE_EPOCH" );
loop
- RTEMS.CLOCK.GET(
- RTEMS.CLOCK.GET_SECONDS_SINCE_EPOCH,
- END_TIME'ADDRESS,
- STATUS
- );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_SECONDS_SINCE_EPOCH( START_TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED(STATUS,
"CLOCK_GET_SECONDS_SINCE_EPOCH");
exit when END_TIME > (START_TIME + 2);
end loop;
@@ -234,8 +226,8 @@ package body SPTEST is
);
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
OLD_SECONDS := TIME.SECOND;
@@ -244,8 +236,8 @@ package body SPTEST is
exit when SECONDS >= 6;
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
if TIME.SECOND /= OLD_SECONDS then
OLD_SECONDS := TIME.SECOND;
@@ -338,8 +330,8 @@ package body SPTEST is
when 1 | 2 | 3 =>
SPTEST.RUN_COUNT( INDEX ) := SPTEST.RUN_COUNT( INDEX ) + 1;
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
Log_Task_Event ( INDEX, TIME );
diff --git a/c/src/ada-tests/sptests/sp09/sptest.adb
b/c/src/ada-tests/sptests/sp09/sptest.adb
index 0eb96e8..47cffe2 100644
--- a/c/src/ada-tests/sptests/sp09/sptest.adb
+++ b/c/src/ada-tests/sptests/sp09/sptest.adb
@@ -300,8 +300,7 @@ package body SPTEST is
-- errors before clock is set
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
-
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
if RTEMS.IS_STATUS_SUCCESSFUL( STATUS ) then
TEXT_IO.PUT_LINE(
"TA1 - clock_get - NOT_DEFINED -- DID THE BSP SET THE TIME OF DAY?"
@@ -461,8 +460,8 @@ package body SPTEST is
);
TEXT_IO.PUT_LINE( " - INVALID_CLOCK" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PRINT_TIME( "TA1 - current time - ", TIME, "" );
TEXT_IO.NEW_LINE;
@@ -2552,8 +2551,8 @@ package body SPTEST is
TEXT_IO.NEW_LINE;
RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PRINT_TIME(
"TA1 - clock_get - ",
TIME,
@@ -2572,8 +2571,8 @@ package body SPTEST is
TEXT_IO.NEW_LINE;
RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PRINT_TIME(
"TA1 - clock_get - ",
TIME,
@@ -2592,8 +2591,8 @@ package body SPTEST is
TEXT_IO.NEW_LINE;
RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PRINT_TIME(
"TA1 - clock_get - ",
TIME,
@@ -2612,8 +2611,8 @@ package body SPTEST is
TEXT_IO.NEW_LINE;
RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PRINT_TIME(
"TA1 - clock_get - ",
TIME,
@@ -2632,8 +2631,8 @@ package body SPTEST is
TEXT_IO.NEW_LINE;
RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET SUCCESSFUL" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PRINT_TIME(
"TA1 - clock_get - ",
TIME,
diff --git a/c/src/ada-tests/sptests/sp11/sptest.adb
b/c/src/ada-tests/sptests/sp11/sptest.adb
index 6974663..95dd178 100644
--- a/c/src/ada-tests/sptests/sp11/sptest.adb
+++ b/c/src/ada-tests/sptests/sp11/sptest.adb
@@ -193,8 +193,8 @@ package body SPTEST is
RTEMS.EVENT.SEND( SPTEST.TASK_ID( 2 ), RTEMS.EVENT_19, STATUS );
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND of 19" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PRINT_TIME( "TA1 - clock_get - ", TIME, "" );
TEXT_IO.NEW_LINE;
@@ -224,8 +224,8 @@ package body SPTEST is
);
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 18" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEXT_IO.PUT( "TA1 - EVENT_18 received - eventout => ");
UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
@@ -368,8 +368,8 @@ package body SPTEST is
);
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 1" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEXT_IO.PUT( "TA1 - EVENT_1 received - eventout => ");
UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
@@ -726,8 +726,8 @@ package body SPTEST is
);
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_RECEIVE of 10" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TA1 CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEXT_IO.PUT( "TA2 - EVENT_10 received - eventout => ");
UNSIGNED32_IO.PUT( EVENTOUT, BASE => 16, WIDTH => 8 );
diff --git a/c/src/ada-tests/sptests/sp19/sptest.adp
b/c/src/ada-tests/sptests/sp19/sptest.adp
index a5f5069..d49bf41 100644
--- a/c/src/ada-tests/sptests/sp19/sptest.adp
+++ b/c/src/ada-tests/sptests/sp19/sptest.adp
@@ -298,8 +298,8 @@ package body SPTEST is
loop
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
if TIME.SECOND >= 16 then
@@ -369,8 +369,8 @@ package body SPTEST is
loop
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PUT_NAME(
SPTEST.TASK_NAME( TEST_SUPPORT.TASK_NUMBER( TID ) ),
diff --git a/c/src/ada-tests/sptests/sp20/sptest.adb
b/c/src/ada-tests/sptests/sp20/sptest.adb
index a6627b0..8acb6c7 100644
--- a/c/src/ada-tests/sptests/sp20/sptest.adb
+++ b/c/src/ada-tests/sptests/sp20/sptest.adb
@@ -241,14 +241,8 @@ package body SPTEST is
);
-- timestamp
- RTEMS.CLOCK.GET(
- RTEMS.CLOCK.GET_TICKS_SINCE_BOOT,
- Time( INDEX )'ADDRESS,
- STATUS
- );
- TEST_SUPPORT.DIRECTIVE_FAILED(
- STATUS, "clock_get of TA6"
- );
+ RTEMS.CLOCK.GET_TICKS_SINCE_BOOT( Time( INDEX ), STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "clock_get of TA6" );
end loop;
for INDEX in 1 .. 10 loop
diff --git a/c/src/ada-tests/sptests/sp22/sptest.adb
b/c/src/ada-tests/sptests/sp22/sptest.adb
index f2287d8..a947628 100644
--- a/c/src/ada-tests/sptests/sp22/sptest.adb
+++ b/c/src/ada-tests/sptests/sp22/sptest.adb
@@ -113,8 +113,8 @@ package body SPTEST is
STATUS : RTEMS.STATUS_CODES;
begin
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TEST_SUPPORT.PUT_NAME(
SPTEST.TASK_NAME( 1 ),
@@ -229,8 +229,8 @@ TEST_SUPPORT.PAUSE;
SPTEST.PRINT_TIME;
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TIME.SECOND := TIME.SECOND + 3;
@@ -252,8 +252,8 @@ TEST_SUPPORT.PAUSE;
-- when which is canceled
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
TIME.SECOND := TIME.SECOND + 3;
diff --git a/c/src/ada-tests/sptests/sp24/sptest.adb
b/c/src/ada-tests/sptests/sp24/sptest.adb
index a577b72..4245036 100644
--- a/c/src/ada-tests/sptests/sp24/sptest.adb
+++ b/c/src/ada-tests/sptests/sp24/sptest.adb
@@ -141,8 +141,8 @@ package body SPTEST is
);
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
- TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
if TIME.SECOND >= 35 then
TEXT_IO.PUT_LINE( "*** END OF TEST 24 ***" );
diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.adb
b/c/src/ada-tests/tmtests/tm08/tmtest.adb
index e4c9d90..c1dbcb3 100644
--- a/c/src/ada-tests/tmtests/tm08/tmtest.adb
+++ b/c/src/ada-tests/tmtests/tm08/tmtest.adb
@@ -254,11 +254,12 @@ package body TMTEST is
TIMER_DRIVER.INITIALIZE;
for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
loop
- RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
+ RTEMS.CLOCK.GET_TOD( TIME, STATUS );
+ TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET_TOD" );
end loop;
TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
TIME_TEST_SUPPORT.PUT_TIME(
- "CLOCK_GET",
+ "CLOCK_GET_TOD",
TMTEST.END_TIME,
TIME_TEST_SUPPORT.OPERATION_COUNT,
OVERHEAD,
diff --git a/c/src/ada-tests/tmtests/tm08/tmtest.ads
b/c/src/ada-tests/tmtests/tm08/tmtest.ads
index 062e810..695235f 100644
--- a/c/src/ada-tests/tmtests/tm08/tmtest.ads
+++ b/c/src/ada-tests/tmtests/tm08/tmtest.ads
@@ -70,7 +70,6 @@ package TMTEST is
-- + TASK_MODE which does require a reschedule
-- + TASK_MODE which causes a preemption *** TEST_TASK1 executes
-- + CLOCK_SET
--- + CLOCK_GET
--
procedure TEST_TASK (
diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb
b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb
index 5b4260a..64fd09d 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb
+++ b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.adb
@@ -189,18 +189,16 @@ package body DUMMY_RTEMS is
-- Clock Manager
- procedure CLOCK_GET (
- OPTION : in RTEMS.CLOCK.GET_OPTIONS;
- TIME_BUFFER : in RTEMS.ADDRESS;
+ procedure CLOCK_GET_TOD (
+ TIME_BUFFER : out RTEMS.ADDRESS;
RESULT : out RTEMS.STATUS_CODES
) is
- pragma Unreferenced(OPTION);
pragma Unreferenced(TIME_BUFFER);
begin
RESULT := RTEMS.SUCCESSFUL;
- end CLOCK_GET;
+ end CLOCK_GET_TOD;
procedure CLOCK_SET (
TIME_BUFFER : in RTEMS.TIME_OF_DAY;
diff --git a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads
b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads
index d560c4a..da7f077 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads
+++ b/c/src/ada-tests/tmtests/tmoverhd/dummy_rtems.ads
@@ -108,9 +108,8 @@ package DUMMY_RTEMS is
-- Clock Manager
- procedure CLOCK_GET (
- OPTION : in RTEMS.CLOCK.GET_OPTIONS;
- TIME_BUFFER : in RTEMS.ADDRESS;
+ procedure CLOCK_GET_TOD (
+ TIME_BUFFER : out RTEMS.ADDRESS;
RESULT : out RTEMS.STATUS_CODES
);
diff --git a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb
b/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb
index a6050ea..ce5b7a3 100644
--- a/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb
+++ b/c/src/ada-tests/tmtests/tmoverhd/tmtest.adb
@@ -396,12 +396,12 @@ package body TMTEST is
-- 0
-- );
--- CLOCK_GET
+-- CLOCK_GET_TOD
TIMER_DRIVER.INITIALIZE;
for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT
loop
- DUMMY_RTEMS.CLOCK_GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
+ DUMMY_RTEMS.CLOCK_GET_TOD( TIME, STATUS );
end loop;
TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER;
diff --git a/c/src/ada/rtems-clock.adb b/c/src/ada/rtems-clock.adb
index 59a6d7d..6f85d4a 100644
--- a/c/src/ada/rtems-clock.adb
+++ b/c/src/ada/rtems-clock.adb
@@ -41,22 +41,6 @@ package body RTEMS.Clock is
end Set;
- procedure Get
- (Option : in RTEMS.Clock.Get_Options;
- Time_Buffer : in RTEMS.Address;
- Result : out RTEMS.Status_Codes)
- is
- function Get_Base
- (Option : RTEMS.Clock.Get_Options;
- Time_Buffer : RTEMS.Address)
- return RTEMS.Status_Codes;
- pragma Import (C, Get_Base, "rtems_clock_get");
- begin
-
- Result := Get_Base (Option, Time_Buffer);
-
- end Get;
-
procedure Get_TOD
(Time : out RTEMS.Time_Of_Day;
Result : out RTEMS.Status_Codes)
diff --git a/c/src/ada/rtems-clock.ads b/c/src/ada/rtems-clock.ads
index fcfcd50..36ccfba 100644
--- a/c/src/ada/rtems-clock.ads
+++ b/c/src/ada/rtems-clock.ads
@@ -32,22 +32,6 @@ package RTEMS.Clock is
Microseconds : RTEMS.Unsigned32;
end record;
- type Clock_Get_Options is (
- Clock_Get_TOD,
- Clock_Get_Seconds_Since_Epoch,
- Clock_Get_Ticks_Since_Boot,
- Clock_Get_Ticks_Per_Second,
- Clock_Get_Time_Value
- );
-
- type Get_Options is (
- Get_TOD,
- Get_Seconds_Since_Epoch,
- Get_Ticks_Since_Boot,
- Get_Ticks_Per_Second,
- Get_Time_Value
- );
-
--
-- Clock Manager
--
@@ -57,12 +41,6 @@ package RTEMS.Clock is
Result : out RTEMS.Status_Codes
);
- procedure Get (
- Option : in RTEMS.Clock.Get_Options;
- Time_Buffer : in RTEMS.Address;
- Result : out RTEMS.Status_Codes
- );
-
procedure Get_TOD (
Time : out RTEMS.Time_Of_Day;
Result : out RTEMS.Status_Codes
diff --git
a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_a9_qemu.cfg
b/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_a9_qemu.cfg
index 5b63eed..013ae6f 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_a9_qemu.cfg
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_a9_qemu.cfg
@@ -5,3 +5,6 @@ RTEMS_CPU = arm
CPU_CFLAGS = -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard
-mtune=cortex-a9
CFLAGS_OPTIMIZE_V ?= -O0 -g
+CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections
+
+LDFLAGS = -Wl,--gc-sections
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am
index c92a7c8..6515a08 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 453d001..b1ae884 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 860e930..0000000
--- 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;
-
-}
diff --git a/doc/user/clock.t b/doc/user/clock.t
index f67003c..451337d 100644
--- a/doc/user/clock.t
+++ b/doc/user/clock.t
@@ -15,7 +15,6 @@ the clock manager are:
@itemize @bullet
@item @code{@value{DIRPREFIX}clock_set} - Set date and time
-@item @code{@value{DIRPREFIX}clock_get} - Get date and time information
@item @code{@value{DIRPREFIX}clock_get_tod} - Get date and time in TOD format
@item @code{@value{DIRPREFIX}clock_get_tod_timeval} - Get date and time in
timeval format
@item @code{@value{DIRPREFIX}clock_get_seconds_since_epoch} - Get seconds
since epoch
@@ -91,9 +90,7 @@ supported when setting the system date and time using the
@code{@value{DIRPREFIX}clock_set} directive. Some applications
expect to operate on a "UNIX-style" date and time data structure. The
@code{@value{DIRPREFIX}clock_get_tod_timeval} always returns
-the date and time in @code{struct timeval} format. The
-@code{@value{DIRPREFIX}clock_get} directive can optionally return
-the current date and time in this format.
+the date and time in @code{struct timeval} format.
The @code{struct timeval} data structure has two fields: @code{tv_sec}
and @code{tv_usec} which are seconds and microseconds, respectively.
@@ -182,42 +179,47 @@ the @code{@value{DIRPREFIX}clock_set} directive.
@subsection Obtaining the Time
-The @code{@value{DIRPREFIX}clock_get} directive allows a task or an ISR to
-obtain the current date and time or date and time related
-information. The current date and time can be returned in
-either native or UNIX-style format. Additionally, the
-application can obtain date and time related information such as
-the number of seconds since the RTEMS epoch, the number of ticks
-since the executive was initialized, and the number of ticks per
-second. The information returned by the
-@code{@value{DIRPREFIX}clock_get} directive is
-dependent on the option selected by the caller. This
-is specified using one of the following constants
-associated with the enumerated type
-@code{@value{DIRPREFIX}clock_get_options}:
-
-@findex rtems_clock_get_options
+RTEMS provides a variety of methods to allot a task or an ISR to obtain
+the current time or time related information in various formats.
+
+The @code{@value{DIRPREFIX}clock_get_tod} directive allows a task or an ISR to
+obtain the current date and time in Classic API format.
+
+The @code{@value{DIRPREFIX}clock_get_tod_timeval} directive can be used
+to obtain the date and time in either UNIX-style @code{struct timeval} format.
+
+Additionally, the application can obtain date and time related
+information such as the number of seconds since the RTEMS epoch
+(@code{@value{DIRPREFIX}clock_get_seconds_since_epoch}, the number
+of ticks since RTEMS was initialized
+(@code{@value{DIRPREFIX}clock_get_ticks_since_boot}), and the number of ticks
+per second (@code{@value{DIRPREFIX}clock_get_ticks_since_boot}).
+
+Calendar time operations will return an error code if invoked before
+the date and time have been set.
+
+The @code{@value{DIRPREFIX}clock_get} directive was removed after
+the RTEMS 4.11 release series. All uses of this directive can be
+replaced with a corresponding strongly typed method:
@itemize @bullet
-@item @code{@value{RPREFIX}CLOCK_GET_TOD} - obtain native style date and time
+@item @code{@value{RPREFIX}CLOCK_GET_TOD} -
+ @code{@value{DIRPREFIX}clock_get_tod}
-@item @code{@value{RPREFIX}CLOCK_GET_TIME_VALUE} - obtain UNIX-style
-date and time
+@item @code{@value{RPREFIX}CLOCK_GET_TIME_VALUE} -
+ @code{@value{DIRPREFIX}clock_get_tod_timeval}
-@item @code{@value{RPREFIX}CLOCK_GET_TICKS_SINCE_BOOT} - obtain number of ticks
-since RTEMS was initialized
+@item @code{@value{RPREFIX}CLOCK_GET_TICKS_SINCE_BOOT} -
+ @item @code{@value{DIRPREFIX}clock_get_ticks_since_boot}
-@item @code{@value{RPREFIX}CLOCK_GET_SECONDS_SINCE_EPOCH} - obtain number
-of seconds since RTEMS epoch
+@item @code{@value{RPREFIX}CLOCK_GET_SECONDS_SINCE_EPOCH} -
+ @item @code{@value{DIRPREFIX}clock_get_seconds_since_epoch}
-@item @code{@value{RPREFIX}CLOCK_GET_TICKS_PER_SECOND} - obtain number of clock
-ticks per second
+@item @code{@value{RPREFIX}CLOCK_GET_TICKS_PER_SECOND} -
+@item @code{@value{DIRPREFIX}clock_get_ticks_per_second}
@end itemize
-Calendar time operations will return an error code if
-invoked before the date and time have been set.
-
@section Directives
This section details the clock manager's directives.
@@ -286,109 +288,6 @@ the system date and time to application specific
specifications.
@c
@c
@page
-@subsection CLOCK_GET - Get date and time information
-
-@cindex obtain the time of day
-
-@subheading CALLING SEQUENCE:
-
-@ifset is-C
-@findex rtems_clock_get
-@example
-rtems_status_code rtems_clock_get(
- rtems_clock_get_options option,
- void *time_buffer
-);
-@end example
-@end ifset
-
-@ifset is-Ada
-@example
-procedure Clock_Get (
- Option : in RTEMS.Clock_Get_Options;
- Time_Buffer : in RTEMS.Address;
- Result : out RTEMS.Status_Codes
-);
-@end example
-@end ifset
-
-@subheading DIRECTIVE STATUS CODES:
-@code{@value{RPREFIX}SUCCESSFUL} - current time obtained successfully@*
-@code{@value{RPREFIX}NOT_DEFINED} - system date and time is not set@*
-@code{@value{RPREFIX}INVALID_ADDRESS} - @code{time_buffer} is NULL
-
-@subheading DESCRIPTION:
-
-This directive is deprecated.
-
-This directive obtains the system date and time. If
-the caller is attempting to obtain the date and time (i.e.
-option is set to either @code{@value{RPREFIX}CLOCK_GET_SECONDS_SINCE_EPOCH},
-@code{@value{RPREFIX}CLOCK_GET_TOD}, or
-@code{@value{RPREFIX}CLOCK_GET_TIME_VALUE}) and the date and time
-has not been set with a previous call to
-@code{@value{DIRPREFIX}clock_set}, then the
-@code{@value{RPREFIX}NOT_DEFINED} status code is returned.
-The caller can always obtain the number of ticks per second (option is
-@code{@value{RPREFIX}CLOCK_GET_TICKS_PER_SECOND}) and the number of
-ticks since the executive was initialized option is
-@code{@value{RPREFIX}CLOCK_GET_TICKS_SINCE_BOOT}).
-
-The @code{option} argument may taken on any value of the enumerated
-type @code{rtems_clock_get_options}. The data type expected for
-@code{time_buffer} is based on the value of @code{option} as
-indicated below:
-
-@findex rtems_clock_get_options
-@ifset is-C
-@itemize @bullet
-@item @code{@value{RPREFIX}CLOCK_GET_TOD} - (rtems_time_of_day *)
-
-@item @code{@value{RPREFIX}CLOCK_GET_SECONDS_SINCE_EPOCH} - (rtems_interval *)
-
-@item @code{@value{RPREFIX}CLOCK_GET_TICKS_SINCE_BOOT} - (rtems_interval *)
-
-@item @code{@value{RPREFIX}CLOCK_GET_TICKS_PER_SECOND} - (rtems_interval *)
-
-@item @code{@value{RPREFIX}CLOCK_GET_TIME_VALUE} - (struct timeval *)
-
-@end itemize
-@end ifset
-
-@ifset is-Ada
-@itemize @bullet
-@item @code{@value{RPREFIX}Clock_Get_TOD} - Address of an variable of
-type RTEMS.Time_Of_Day
-
-@item @code{@value{RPREFIX}Clock_Get_Seconds_Since_Epoch} - Address of an
-variable of type RTEMS.Interval
-
-@item @code{@value{RPREFIX}Clock_Get_Ticks_Since_Boot} - Address of an
-variable of type RTEMS.Interval
-
-@item @code{@value{RPREFIX}Clock_Get_Ticks_Per_Second} - Address of an
-variable of type RTEMS.Interval
-
-@item @code{@value{RPREFIX}Clock_Get_Time_Value} - Address of an variable of
-type RTEMS.Clock_Time_Value
-
-@end itemize
-@end ifset
-
-@subheading NOTES:
-
-This directive is callable from an ISR.
-
-This directive will not cause the running task to be
-preempted. Re-initializing RTEMS causes the system date and
-time to be reset to an uninitialized state. Another call to
-@code{@value{DIRPREFIX}clock_set} is required to re-initialize the
-system date and time to application specific specifications.
-
-@c
-@c
-@c
-@page
@subsection CLOCK_GET_TOD - Get date and time in TOD format
@cindex obtain the time of day
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index 43f3d82..f88e74a 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -11,7 +11,7 @@ _SUBDIRS = \
sp50 sp51 sp52 sp53 sp54 sp55 sp56 sp57 sp58 sp59 \
sp60 sp62 sp63 sp64 sp65 sp66 sp67 sp68 sp69 \
sp70 sp71 sp72 sp73 sp74 sp75 sp76 sp77 sp2038 \
- spassoc01 spchain spclockget spcoverage spobjgetnext \
+ spassoc01 spchain spcoverage spobjgetnext \
spprintk spprivenv01 sprbtree01 spsize spstkalloc \
spstkalloc02 spthreadq01 spwatchdog spwkspace \
sperror01 sperror02 sperror03 \
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index eeebc91..2089406 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -160,7 +160,6 @@ spcbssched01/Makefile
spcbssched02/Makefile
spcbssched03/Makefile
spchain/Makefile
-spclockget/Makefile
spclock_err01/Makefile
spclock_err02/Makefile
spcoverage/Makefile
diff --git a/testsuites/sptests/spclockget/Makefile.am
b/testsuites/sptests/spclockget/Makefile.am
deleted file mode 100644
index 5cf417c..0000000
--- a/testsuites/sptests/spclockget/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = spclockget
-spclockget_SOURCES = init.c
-
-dist_rtems_tests_DATA = spclockget.scn
-dist_rtems_tests_DATA += spclockget.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(spclockget_OBJECTS)
-LINK_LIBS = $(spclockget_LDLIBS)
-
-spclockget$(EXEEXT): $(spclockget_OBJECTS) $(spclockget_DEPENDENCIES)
- @rm -f spclockget$(EXEEXT)
- $(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spclockget/init.c
b/testsuites/sptests/spclockget/init.c
deleted file mode 100644
index 8cdae21..0000000
--- a/testsuites/sptests/spclockget/init.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * COPYRIGHT (c) 1989-2012.
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <tmacros.h>
-#include "pritime.h"
-
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-const char rtems_test_name[] = "SPCLOCKGET";
-
-/* forward declarations to avoid warnings */
-rtems_task Init(rtems_task_argument argument);
-
-rtems_task Init(
- rtems_task_argument ignored
-)
-{
- rtems_status_code sc;
- rtems_time_of_day time;
- rtems_interval interval;
- struct timeval timev;
-
- TEST_BEGIN();
-
- puts( "Init - clock_set_time" );
- build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
- sc = rtems_clock_set( &time );
- directive_failed( sc, "rtems_clock_set" );
-
- /* NULL parameter */
- sc = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, NULL );
- fatal_directive_status( sc, RTEMS_INVALID_ADDRESS, "null pointer" );
- puts( "TA1 - rtems_clock_get - RTEMS_INVALID_ADDRESS" );
-
- /* arbitrary bad value for switch */
- sc = rtems_clock_get( 0xff, &timev );
- fatal_directive_status( sc, RTEMS_INVALID_NUMBER, "bad case" );
- puts( "TA1 - rtems_clock_get - RTEMS_INVALID_NUMBER" );
-
- sc = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
- directive_failed( sc, "rtems_clock_get -- TOD" );
- print_time( "Init - rtems_clock_get - ", &time, "\n" );
-
- sc = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &interval );
- directive_failed( sc, "rtems_clock_get -- Seconds Since Epoch" );
- printf(
- "Init - rtems_clock_get - Seconds Since Epoch = %" PRIdrtems_interval "\n",
- interval
- );
-
- sc = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &interval );
- directive_failed( sc, "rtems_clock_get -- Ticks Since Boot" );
- printf(
- "Init - rtems_clock_get - Ticks Since Boot = %" PRIdrtems_interval "\n",
- interval
- );
-
- sc = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &interval );
- directive_failed( sc, "rtems_clock_get -- Ticks Per Second" );
- printf(
- "Init - rtems_clock_get - Ticks Per Second = %" PRIdrtems_interval "\n",
- interval
- );
-
- sc = rtems_clock_get( RTEMS_CLOCK_GET_TIME_VALUE, &timev );
- directive_failed( sc, "rtems_clock_get -- Time Value" );
- printf(
- "Init - rtems_clock_get - Time Value = %" PRIdtime_t "\n",
- timev.tv_sec
- );
-
- TEST_END();
- rtems_test_exit(0);
-}
-
-/* configuration information */
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS 1
-#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_INIT
-#include <rtems/confdefs.h>
-
-/* global variables */
diff --git a/testsuites/sptests/spclockget/spclockget.doc
b/testsuites/sptests/spclockget/spclockget.doc
deleted file mode 100644
index b5a6b28..0000000
--- a/testsuites/sptests/spclockget/spclockget.doc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-#
-
-This file describes the directives and concepts tested by this test set.
-
-test set name: spclockget
-
-directives:
-
- rtems_clock_get() - LEGACY
-
-concepts:
-
-+ Exercise the legacy rtems_clock_get() method.
diff --git a/testsuites/sptests/spclockget/spclockget.scn
b/testsuites/sptests/spclockget/spclockget.scn
deleted file mode 100644
index ce0d73f..0000000
--- a/testsuites/sptests/spclockget/spclockget.scn
+++ /dev/null
@@ -1,8 +0,0 @@
-*** TEST LEGACY RTEMS_CLOCK_GET ***
-Init - clock_set_time
-Init - rtems_clock_get - 09:00:00 12/31/1988
-Init - rtems_clock_get - Seconds Since Epoch = 599562000
-Init - rtems_clock_get - Ticks Since Boot = 0
-Init - rtems_clock_get - Ticks Per Second = 100
-Init - rtems_clock_get - Time Value = 599562000
-*** END OF TEST LEGACY RTEMS_CLOCK_GET ***
diff --git a/testsuites/tmtests/tmoverhd/dumrtems.h
b/testsuites/tmtests/tmoverhd/dumrtems.h
index eeefb75..4beae9e 100644
--- a/testsuites/tmtests/tmoverhd/dumrtems.h
+++ b/testsuites/tmtests/tmoverhd/dumrtems.h
@@ -197,7 +197,7 @@
#define rtems_task_suspend( tid ) \
Empty_directive()
-#define rtems_clock_get( options, time ) \
+#define rtems_clock_get_tod( tod ) \
Empty_directive()
#define rtems_clock_set( time ) \
Empty_directive()
diff --git a/testsuites/tmtests/tmoverhd/testtask.c
b/testsuites/tmtests/tmoverhd/testtask.c
index 76f4e15..bc73f8b 100644
--- a/testsuites/tmtests/tmoverhd/testtask.c
+++ b/testsuites/tmtests/tmoverhd/testtask.c
@@ -79,7 +79,7 @@ rtems_task Task_1(
rtems_device_minor_number minor RTEMS_GCC_NOWARN_UNUSED;
uint32_t io_result RTEMS_GCC_NOWARN_UNUSED;
uint32_t error RTEMS_GCC_NOWARN_UNUSED;
- rtems_clock_get_options options RTEMS_GCC_NOWARN_UNUSED;
+ rtems_time_of_day tod RTEMS_GCC_NOWARN_UNUSED;
name = rtems_build_name( 'N', 'A', 'M', 'E' );
in_priority = 250;
@@ -90,7 +90,6 @@ rtems_task Task_1(
major = 10;
minor = 0;
error = 100;
- options = 0;
/* rtems_shutdown_executive */
@@ -294,15 +293,15 @@ rtems_task Task_1(
0
);
-/* rtems_clock_get */
+/* rtems_clock_get_tod */
benchmark_timer_initialize();
for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
- (void) rtems_clock_get( options, time );
+ (void) rtems_clock_get_tod( &tod );
end_time = benchmark_timer_read();
put_time(
- "overhead: rtems_clock_get",
+ "overhead: rtems_clock_get_tod",
end_time,
OPERATION_COUNT,
overhead,
--
1.7.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
