Ignore:
Timestamp:
Feb 16, 2011, 3:53:16 PM (10 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, 5, master
Children:
0f7b6eff
Parents:
1987020
Message:

2011-02-16 Joel Sherrill <joel.sherrill@…>

  • ada-tests/mptests/mp01/mp01.adb, ada-tests/mptests/mp01/mptest.adb, ada-tests/mptests/mp01/mptest.ads, ada-tests/mptests/mp01/node1/mp01_node1.adb, ada-tests/mptests/mp01/node2/mp01_node2.adb, ada-tests/mptests/mp02/mptest.adb, ada-tests/mptests/mp02/mptest.ads, ada-tests/mptests/mp02/node1/mp02_node1.adb, ada-tests/mptests/mp02/node2/mp02_node2.adb, ada-tests/mptests/mp03/mptest.adb, ada-tests/mptests/mp03/mptest.ads, ada-tests/mptests/mp03/node1/mp03_node1.adb, ada-tests/mptests/mp03/node2/mp03_node2.adb, ada-tests/mptests/mp04/mptest.adb, ada-tests/mptests/mp04/mptest.ads, ada-tests/mptests/mp04/node1/mp04_node1.adb, ada-tests/mptests/mp04/node2/mp04_node2.adb, ada-tests/mptests/mp05/mptest.adb, ada-tests/mptests/mp05/mptest.ads, ada-tests/mptests/mp05/node1/mp05_node1.adb, ada-tests/mptests/mp05/node2/mp05_node2.adb, ada-tests/mptests/mp06/mptest.adb, ada-tests/mptests/mp06/mptest.ads, ada-tests/mptests/mp06/node1/mp06_node1.adb, ada-tests/mptests/mp06/node2/mp06_node2.adb, ada-tests/mptests/mp07/mptest.adb, ada-tests/mptests/mp07/mptest.ads, ada-tests/mptests/mp07/node1/mp07_node1.adb, ada-tests/mptests/mp07/node2/mp07_node2.adb, ada-tests/mptests/mp08/mptest.adb, ada-tests/mptests/mp08/mptest.ads, ada-tests/mptests/mp08/node1/mp08_node1.adb, ada-tests/mptests/mp08/node2/mp08_node2.adb, ada-tests/mptests/mp09/mptest.adb, ada-tests/mptests/mp09/mptest.ads, ada-tests/mptests/mp09/node1/mp09_node1.adb, ada-tests/mptests/mp09/node2/mp09_node2.adb, ada-tests/mptests/mp10/mptest.adb, ada-tests/mptests/mp10/mptest.ads, ada-tests/mptests/mp10/node1/mp10_node1.adb, ada-tests/mptests/mp10/node2/mp10_node2.adb, ada-tests/mptests/mp11/mptest.adb, ada-tests/mptests/mp11/mptest.ads, ada-tests/mptests/mp11/node1/mp11_node1.adb, ada-tests/mptests/mp11/node2/mp11_node2.adb, ada-tests/mptests/mp12/mptest.adb, ada-tests/mptests/mp12/mptest.ads, ada-tests/mptests/mp12/node1/mp12_node1.adb, ada-tests/mptests/mp12/node2/mp12_node2.adb, ada-tests/mptests/mp13/mptest.adb, ada-tests/mptests/mp13/mptest.ads, ada-tests/mptests/mp13/node1/mp13_node1.adb, ada-tests/mptests/mp13/node2/mp13_node2.adb, ada-tests/mptests/mp14/mptest.adb, ada-tests/mptests/mp14/mptest.ads, ada-tests/mptests/mp14/node1/mp14_node1.adb, ada-tests/mptests/mp14/node2/mp14_node2.adb, ada-tests/samples/base_mp/mptest.adb, ada-tests/samples/base_mp/mptest.ads, ada-tests/samples/base_sp/base_sp.adb, ada-tests/samples/base_sp/sptest.adb, ada-tests/samples/base_sp/sptest.ads, ada-tests/samples/hello/hello.adb, ada-tests/samples/hello/sptest.adb, ada-tests/samples/hello/sptest.ads, ada-tests/samples/nsecs/nsecs.adb, ada-tests/samples/nsecs/sptest.adb, ada-tests/samples/nsecs/sptest.ads, ada-tests/samples/ticker/sptest.adb, ada-tests/samples/ticker/sptest.ads, ada-tests/samples/ticker/ticker.adb, ada-tests/sptests/sp01/sp01.adb, ada-tests/sptests/sp01/sptest.adb, ada-tests/sptests/sp01/sptest.ads, ada-tests/sptests/sp02/sp02.adb, ada-tests/sptests/sp02/sptest.adb, ada-tests/sptests/sp02/sptest.ads, ada-tests/sptests/sp03/sp03.adb, ada-tests/sptests/sp03/sptest.adb, ada-tests/sptests/sp03/sptest.ads, ada-tests/sptests/sp04/sp04.adb, ada-tests/sptests/sp04/sptest.adb, ada-tests/sptests/sp04/sptest.ads, ada-tests/sptests/sp05/sp05.adb, ada-tests/sptests/sp05/sptest.adb, ada-tests/sptests/sp05/sptest.ads, ada-tests/sptests/sp06/sp06.adb, ada-tests/sptests/sp06/sptest.adb, ada-tests/sptests/sp06/sptest.ads, ada-tests/sptests/sp07/sp07.adb, ada-tests/sptests/sp07/sptest.adb, ada-tests/sptests/sp07/sptest.ads, ada-tests/sptests/sp08/sp08.adb, ada-tests/sptests/sp08/sptest.adb, ada-tests/sptests/sp08/sptest.ads, ada-tests/sptests/sp09/sp09.adb, ada-tests/sptests/sp09/sptest.adb, ada-tests/sptests/sp09/sptest.ads, ada-tests/sptests/sp11/sp11.adb, ada-tests/sptests/sp11/sptest.adb, ada-tests/sptests/sp11/sptest.ads, ada-tests/sptests/sp12/sp12.adb, ada-tests/sptests/sp12/sptest.adb, ada-tests/sptests/sp12/sptest.ads, ada-tests/sptests/sp13/sp13.adb, ada-tests/sptests/sp13/sptest.adb, ada-tests/sptests/sp13/sptest.ads, ada-tests/sptests/sp14/sp14.adb, ada-tests/sptests/sp14/sptest.adb, ada-tests/sptests/sp14/sptest.ads, ada-tests/sptests/sp15/sp15.adb, ada-tests/sptests/sp15/sptest.adb, ada-tests/sptests/sp15/sptest.ads, ada-tests/sptests/sp16/sp16.adb, ada-tests/sptests/sp16/sptest.adb, ada-tests/sptests/sp16/sptest.ads, ada-tests/sptests/sp17/sp17.adb, ada-tests/sptests/sp17/sptest.adb, ada-tests/sptests/sp17/sptest.ads, ada-tests/sptests/sp19/sp19.adb, ada-tests/sptests/sp19/sptest.adp, ada-tests/sptests/sp19/sptest.ads, ada-tests/sptests/sp20/sp20.adb, ada-tests/sptests/sp20/sptest.adb, ada-tests/sptests/sp20/sptest.ads, ada-tests/sptests/sp22/sp22.adb, ada-tests/sptests/sp22/sptest.adb, ada-tests/sptests/sp22/sptest.ads, ada-tests/sptests/sp23/sp23.adb, ada-tests/sptests/sp23/sptest.adb, ada-tests/sptests/sp23/sptest.ads, ada-tests/sptests/sp24/sp24.adb, ada-tests/sptests/sp24/sptest.adb, ada-tests/sptests/sp24/sptest.ads, ada-tests/sptests/sp25/sp25.adb, ada-tests/sptests/sp25/sptest.adb, ada-tests/sptests/sp25/sptest.ads, ada-tests/support/test_support.adb, ada-tests/tmtests/tm01/tm01.adb, ada-tests/tmtests/tm01/tmtest.adb, ada-tests/tmtests/tm01/tmtest.ads, ada-tests/tmtests/tm02/tm02.adb, ada-tests/tmtests/tm02/tmtest.adb, ada-tests/tmtests/tm02/tmtest.ads, ada-tests/tmtests/tm03/tm03.adb, ada-tests/tmtests/tm03/tmtest.adb, ada-tests/tmtests/tm03/tmtest.ads, ada-tests/tmtests/tm04/tm04.adb, ada-tests/tmtests/tm04/tmtest.adb, ada-tests/tmtests/tm04/tmtest.ads, ada-tests/tmtests/tm05/tm05.adb, ada-tests/tmtests/tm05/tmtest.adb, ada-tests/tmtests/tm05/tmtest.ads, ada-tests/tmtests/tm06/tm06.adb, ada-tests/tmtests/tm06/tmtest.adb, ada-tests/tmtests/tm06/tmtest.ads, ada-tests/tmtests/tm07/tm07.adb, ada-tests/tmtests/tm07/tmtest.adb, ada-tests/tmtests/tm07/tmtest.ads, ada-tests/tmtests/tm08/tm08.adb, ada-tests/tmtests/tm08/tmtest.adb, ada-tests/tmtests/tm08/tmtest.ads, ada-tests/tmtests/tm09/tm09.adb, ada-tests/tmtests/tm09/tmtest.adb, ada-tests/tmtests/tm09/tmtest.ads, ada-tests/tmtests/tm10/tm10.adb, ada-tests/tmtests/tm10/tmtest.adb, ada-tests/tmtests/tm10/tmtest.ads, ada-tests/tmtests/tm11/tm11.adb, ada-tests/tmtests/tm11/tmtest.adb, ada-tests/tmtests/tm11/tmtest.ads, ada-tests/tmtests/tm12/tm12.adb, ada-tests/tmtests/tm12/tmtest.adb, ada-tests/tmtests/tm12/tmtest.ads, ada-tests/tmtests/tm13/tm13.adb, ada-tests/tmtests/tm13/tmtest.adb, ada-tests/tmtests/tm13/tmtest.ads, ada-tests/tmtests/tm14/tm14.adb, ada-tests/tmtests/tm14/tmtest.adb, ada-tests/tmtests/tm14/tmtest.ads, ada-tests/tmtests/tm15/tm15.adb, ada-tests/tmtests/tm15/tmtest.adb, ada-tests/tmtests/tm15/tmtest.ads, ada-tests/tmtests/tm16/tm16.adb, ada-tests/tmtests/tm16/tmtest.adb, ada-tests/tmtests/tm16/tmtest.ads, ada-tests/tmtests/tm17/tm17.adb, ada-tests/tmtests/tm17/tmtest.adb, ada-tests/tmtests/tm17/tmtest.ads, ada-tests/tmtests/tm18/tm18.adb, ada-tests/tmtests/tm18/tmtest.adb, ada-tests/tmtests/tm18/tmtest.ads, ada-tests/tmtests/tm19/tm19.adb, ada-tests/tmtests/tm19/tmtest.adb, ada-tests/tmtests/tm19/tmtest.ads, ada-tests/tmtests/tm20/tm20.adb, ada-tests/tmtests/tm20/tmtest.adb, ada-tests/tmtests/tm20/tmtest.ads, ada-tests/tmtests/tm21/tm21.adb, ada-tests/tmtests/tm21/tmtest.adb, ada-tests/tmtests/tm21/tmtest.ads, ada-tests/tmtests/tm22/tm22.adb, ada-tests/tmtests/tm22/tmtest.adb, ada-tests/tmtests/tm22/tmtest.ads, ada-tests/tmtests/tm23/tm23.adb, ada-tests/tmtests/tm23/tmtest.adb, ada-tests/tmtests/tm23/tmtest.ads, ada-tests/tmtests/tm24/tm24.adb, ada-tests/tmtests/tm24/tmtest.adb, ada-tests/tmtests/tm24/tmtest.ads, ada-tests/tmtests/tm25/tm25.adb, ada-tests/tmtests/tm25/tmtest.adb, ada-tests/tmtests/tm25/tmtest.ads, ada-tests/tmtests/tm28/tm28.adb, ada-tests/tmtests/tm28/tmtest.adb, ada-tests/tmtests/tm28/tmtest.ads, ada-tests/tmtests/tm29/tm29.adb, ada-tests/tmtests/tm29/tmtest.adb, ada-tests/tmtests/tm29/tmtest.ads, ada-tests/tmtests/tmck/tmck.adb, ada-tests/tmtests/tmck/tmtest.adb, ada-tests/tmtests/tmck/tmtest.ads, ada-tests/tmtests/tmoverhd/dummy_rtems.adb, ada-tests/tmtests/tmoverhd/dummy_rtems.ads, ada-tests/tmtests/tmoverhd/tmoverhd.adb, ada-tests/tmtests/tmoverhd/tmtest.adb, ada-tests/tmtests/tmoverhd/tmtest.ads: Account for RTEMS binding child package rework. Eliminate all warnings.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • c/src/ada-tests/mptests/mp03/mptest.adb

    r1987020 r3c4d8cd1  
    77-- 
    88--
    9 --  COPYRIGHT (c) 1989-1997.
     9--  COPYRIGHT (c) 1989-2011.
    1010--  On-Line Applications Research Corporation (OAR).
    1111--
     
    1919with INTERFACES; use INTERFACES;
    2020with RTEMS;
     21with RTEMS.EVENT;
     22with RTEMS.TASKS;
     23with RTEMS.TIMER;
    2124with TEST_SUPPORT;
    2225with TEXT_IO;
     
    2528package body MPTEST is
    2629
    27 --PAGE
    2830--
    2931--  INIT
     
    3133
    3234   procedure INIT (
    33       ARGUMENT : in     RTEMS.TASK_ARGUMENT
     35      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    3436   ) is
    3537      STATUS : RTEMS.STATUS_CODES;
     
    4850
    4951      TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
    50       RTEMS.TASK_CREATE(
     52      RTEMS.TASKS.CREATE(
    5153         MPTEST.TASK_NAME( TEST_SUPPORT.NODE ),
    5254         1,
     
    6062
    6163      TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
    62       RTEMS.TASK_START(
     64      RTEMS.TASKS.START(
    6365         MPTEST.TASK_ID( 1 ),
    6466         MPTEST.TEST_TASK'ACCESS,
     
    7072      MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
    7173
    72       RTEMS.TIMER_CREATE(
     74      RTEMS.TIMER.CREATE(
    7375         MPTEST.TIMER_NAME( 1 ),
    7476         MPTEST.TIMER_ID( 1 ),
     
    7880
    7981      TEXT_IO.PUT_LINE( "Deleting initialization task" );
    80       RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
     82      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
    8183      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
    8284
    8385   end INIT;
    8486
    85 --PAGE
    8687--
    8788--  DELAYED_SEND_EVENT
     
    9596   begin
    9697
    97       RTEMS.EVENT_SEND( MPTEST.TASK_ID( 1 ), RTEMS.EVENT_16, STATUS );
     98      RTEMS.EVENT.SEND( MPTEST.TASK_ID( 1 ), RTEMS.EVENT_16, STATUS );
    9899      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" );
    99100
    100101   end DELAYED_SEND_EVENT;
    101102
    102 --PAGE
    103103--
    104104--  TEST_TASK
     
    106106
    107107   procedure TEST_TASK (
    108       ARGUMENT : in     RTEMS.TASK_ARGUMENT
     108      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    109109   ) is
    110110      TID         : RTEMS.ID;
     
    112112   begin
    113113
    114       RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
     114      RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
    115115      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
    116116   
     
    127127      loop
    128128
    129          RTEMS.TASK_IDENT(
     129         RTEMS.TASKS.IDENT(
    130130            MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
    131131            RTEMS.SEARCH_ALL_NODES,
     
    138138      end loop;
    139139
    140       RTEMS.TIMER_FIRE_AFTER(
     140      RTEMS.TIMER.FIRE_AFTER(
    141141         MPTEST.TIMER_ID( 1 ),
    142142         10 * TEST_SUPPORT.TICKS_PER_SECOND,
     
    149149      MPTEST.TEST_TASK_SUPPORT( 1 );
    150150
    151       RTEMS.TIMER_FIRE_AFTER(
     151      RTEMS.TIMER.FIRE_AFTER(
    152152         MPTEST.TIMER_ID( 1 ),
    153153         11 * TEST_SUPPORT.TICKS_PER_SECOND,
     
    160160      if TEST_SUPPORT.NODE = 2 then
    161161         
    162          RTEMS.TASK_WAKE_AFTER(
     162         RTEMS.TASKS.WAKE_AFTER(
    163163            2 * TEST_SUPPORT.TICKS_PER_SECOND,
    164164            STATUS
     
    176176   end TEST_TASK;
    177177
    178 --PAGE
    179178--
    180179--  TEST_TASK_SUPPORT
     
    193192         loop
    194193
    195             RTEMS.EVENT_RECEIVE(
     194            RTEMS.EVENT.RECEIVE(
    196195               RTEMS.EVENT_16,
    197196               RTEMS.NO_WAIT,
     
    209208            );
    210209
    211             RTEMS.TASK_WAKE_AFTER(
     210            RTEMS.TASKS.WAKE_AFTER(
    212211               2 * TEST_SUPPORT.TICKS_PER_SECOND,
    213212               STATUS
     
    217216            TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( NODE ), FALSE );
    218217            TEXT_IO.PUT_LINE( " - Suspending remote task" );
    219             RTEMS.TASK_SUSPEND( MPTEST.REMOTE_TID, STATUS );
     218            RTEMS.TASKS.SUSPEND( MPTEST.REMOTE_TID, STATUS );
    220219            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
    221220
    222             RTEMS.TASK_WAKE_AFTER(
     221            RTEMS.TASKS.WAKE_AFTER(
    223222               2 * TEST_SUPPORT.TICKS_PER_SECOND,
    224223               STATUS
     
    229228            TEXT_IO.PUT_LINE( " - Resuming remote task" );
    230229
    231             RTEMS.TASK_RESUME( MPTEST.REMOTE_TID, STATUS );
     230            RTEMS.TASKS.RESUME( MPTEST.REMOTE_TID, STATUS );
    232231            TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" );
    233232
     
    238237         loop
    239238
    240             RTEMS.EVENT_RECEIVE(
     239            RTEMS.EVENT.RECEIVE(
    241240               RTEMS.EVENT_16,
    242241               RTEMS.NO_WAIT,
     
    256255            TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( REMOTE_NODE ), FALSE );
    257256            TEXT_IO.PUT_LINE( " - have I been suspended???" );
    258             RTEMS.TASK_WAKE_AFTER(
     257            RTEMS.TASKS.WAKE_AFTER(
    259258               TEST_SUPPORT.TICKS_PER_SECOND / 2,
    260259               STATUS
Note: See TracChangeset for help on using the changeset viewer.