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/mp13/mptest.adb

    r1987020 r3c4d8cd1  
    1111--
    1212--
    13 --  COPYRIGHT (c) 1989-1997.
     13--  COPYRIGHT (c) 1989-2011.
    1414--  On-Line Applications Research Corporation (OAR).
    1515--
     
    2323with INTERFACES; use INTERFACES;
    2424with RTEMS;
     25with RTEMS.MESSAGE_QUEUE;
     26with RTEMS.SEMAPHORE;
     27with RTEMS.TASKS;
    2528with TEST_SUPPORT;
    2629with TEXT_IO;
     
    2932package body MPTEST is
    3033
    31 --PAGE
    3234--
    3335--  INIT
     
    3537
    3638   procedure INIT (
    37       ARGUMENT : in     RTEMS.TASK_ARGUMENT
     39      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    3840   ) is
    3941      STATUS : RTEMS.STATUS_CODES;
     
    5860
    5961         TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" );
    60          RTEMS.MESSAGE_QUEUE_CREATE(
     62         RTEMS.MESSAGE_QUEUE.CREATE(
    6163            MPTEST.QUEUE_NAME( 1 ),
    6264            3,
     
    6870
    6971         TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" );
    70          RTEMS.SEMAPHORE_CREATE(
     72         RTEMS.SEMAPHORE.CREATE(
    7173            MPTEST.SEMAPHORE_NAME( 1 ),
    7274            1,
     
    7779         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" );
    7880
    79          RTEMS.SEMAPHORE_OBTAIN(
     81         RTEMS.SEMAPHORE.OBTAIN(
    8082            MPTEST.SEMAPHORE_ID( 1 ),
    8183            RTEMS.DEFAULT_OPTIONS,
     
    8890
    8991      TEXT_IO.PUT_LINE( "Creating Test_task 1 (local)" );
    90          RTEMS.TASK_CREATE(
     92         RTEMS.TASKS.CREATE(
    9193         MPTEST.TASK_NAME( 1 ),
    9294         1,
     
    100102
    101103      TEXT_IO.PUT_LINE( "Starting Test_task 1 (local)" );
    102       RTEMS.TASK_START(
     104      RTEMS.TASKS.START(
    103105         MPTEST.TASK_ID( 1 ),
    104106         MPTEST.TEST_TASK_1'ACCESS,
     
    109111
    110112      TEXT_IO.PUT_LINE( "Creating Test_task 2 (local)" );
    111       RTEMS.TASK_CREATE(
     113      RTEMS.TASKS.CREATE(
    112114         MPTEST.TASK_NAME( 2 ),
    113115         1,
     
    121123
    122124      TEXT_IO.PUT_LINE( "Starting Test_task 2 (local)" );
    123       RTEMS.TASK_START(
     125      RTEMS.TASKS.START(
    124126         MPTEST.TASK_ID( 2 ),
    125127         MPTEST.TEST_TASK_2'ACCESS,
     
    131133      if TEST_SUPPORT.NODE = 1 then
    132134
    133          RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
     135         RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
    134136         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
    135137
     
    141143
    142144      TEXT_IO.PUT_LINE( "Deleting initialization task" );
    143       RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
     145      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
    144146      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
    145147
    146148   end INIT;
    147149
    148 --PAGE
    149150--
    150151--  TEST_TASK_1
     
    152153
    153154   procedure TEST_TASK_1 (
    154       ARGUMENT : in     RTEMS.TASK_ARGUMENT
     155      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    155156   ) is
    156157      COUNT               : RTEMS.UNSIGNED32;
     
    167168      loop
    168169
    169          RTEMS.MESSAGE_QUEUE_IDENT(
     170         RTEMS.MESSAGE_QUEUE.IDENT(
    170171            MPTEST.QUEUE_NAME( 1 ),
    171172            RTEMS.SEARCH_ALL_NODES,
     
    181182
    182183         TEXT_IO.PUT_LINE( "Receiving message ..." );
    183          RTEMS.MESSAGE_QUEUE_RECEIVE(
     184         RTEMS.MESSAGE_QUEUE.RECEIVE(
    184185            MPTEST.QUEUE_ID( 1 ),
    185186            RECEIVE_BUFFER,
     
    193194      end if;
    194195
    195       RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
     196      RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
    196197      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
    197198
    198199      TEXT_IO.PUT_LINE( "Receiving message ..." );
    199       RTEMS.MESSAGE_QUEUE_RECEIVE(
     200      RTEMS.MESSAGE_QUEUE.RECEIVE(
    200201         MPTEST.QUEUE_ID( 1 ),
    201202         RECEIVE_BUFFER,
     
    220221
    221222      TEXT_IO.PUT_LINE( "Deleting self" );
    222       RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
     223      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
    223224      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
    224225
    225226   end TEST_TASK_1;
    226227
    227 --PAGE
    228228--
    229229--  TEST_TASK_2
     
    231231
    232232   procedure TEST_TASK_2 (
    233       ARGUMENT : in     RTEMS.TASK_ARGUMENT
     233      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    234234   ) is
    235235      STATUS : RTEMS.STATUS_CODES;
     
    240240      loop
    241241
    242          RTEMS.SEMAPHORE_IDENT(
     242         RTEMS.SEMAPHORE.IDENT(
    243243            MPTEST.SEMAPHORE_NAME( 1 ),
    244244            RTEMS.SEARCH_ALL_NODES,
     
    253253      if TEST_SUPPORT.NODE = 1 then
    254254
    255          RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
     255         RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
    256256         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
    257257
    258258         TEXT_IO.PUT_LINE( "Releasing semaphore ..." );
    259          RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
     259         RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
    260260         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
    261261
    262          RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS );
     262         RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS );
    263263         TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
    264264
    265265         TEXT_IO.PUT_LINE( "Getting semaphore ..." );
    266          RTEMS.SEMAPHORE_OBTAIN(
     266         RTEMS.SEMAPHORE.OBTAIN(
    267267            MPTEST.SEMAPHORE_ID( 1 ),
    268268            RTEMS.DEFAULT_OPTIONS,
     
    273273
    274274         TEXT_IO.PUT_LINE( "Getting semaphore ..." );
    275          RTEMS.SEMAPHORE_OBTAIN(
     275         RTEMS.SEMAPHORE.OBTAIN(
    276276            MPTEST.SEMAPHORE_ID( 1 ),
    277277            RTEMS.DEFAULT_OPTIONS,
     
    284284      end if;
    285285
    286       RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS );
     286      RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS );
    287287      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
    288288
    289289      TEXT_IO.PUT_LINE( "Getting semaphore ..." );
    290       RTEMS.SEMAPHORE_OBTAIN(
     290      RTEMS.SEMAPHORE.OBTAIN(
    291291         MPTEST.SEMAPHORE_ID( 1 ),
    292292         RTEMS.DEFAULT_OPTIONS,
     
    297297
    298298      TEXT_IO.PUT_LINE( "Releasing semaphore ..." );
    299       RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
     299      RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
    300300      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
    301301
    302       RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
     302      RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
    303303      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
    304304
    305305      TEXT_IO.PUT_LINE( "Getting semaphore ..." );
    306       RTEMS.SEMAPHORE_OBTAIN(
     306      RTEMS.SEMAPHORE.OBTAIN(
    307307         MPTEST.SEMAPHORE_ID( 1 ),
    308308         RTEMS.DEFAULT_OPTIONS,
Note: See TracChangeset for help on using the changeset viewer.