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 /c | |
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 'c')
19 files changed, 70 insertions, 123 deletions
diff --git a/c/src/ada-tests/mptests/mp01/mptest.adb b/c/src/ada-tests/mptests/mp01/mptest.adb index 779d1242d2..b76a1af8dc 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 cfc33c7b4c..2de8b35b79 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 53dc5dd771..46e48e9b04 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 f29168d10d..24be47eb1c 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 33fc680a41..01283d3fec 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 0eb96e8e3e..47cffe228f 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 69746634f1..95dd17846b 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 a5f50695b6..d49bf41aac 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 a6627b0ee9..8acb6c76dc 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 f2287d8bfa..a947628db5 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 a577b72ae7..4245036995 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 e4c9d90991..c1dbcb3e30 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 062e810181..695235f479 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 5b4260a2bc..64fd09d0c7 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 d560c4a5a1..da7f0773b9 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 a6050ea6c5..ce5b7a37b9 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 59a6d7d220..6f85d4aefc 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 fcfcd5022e..36ccfba2d4 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 5b63eeddee..013ae6f485 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 |