5 files changed, 23 insertions, 16 deletions
diff --git a/testsuites/ada/sptests/sp09/sptest.adb b/testsuites/ada/sptests/sp09/sptest.adb
index 519d0ad4cb..7ebb67b54e 100644
--- a/testsuites/ada/sptests/sp09/sptest.adb
+++ b/testsuites/ada/sptests/sp09/sptest.adb
@@ -30,6 +30,8 @@ with RTEMS.RATE_MONOTONIC;
 with RTEMS.REGION;
 with RTEMS.SEMAPHORE;
 with RTEMS.TIMER;
+with Interfaces.C;
+use Interfaces.C;
 
 package body SPTEST is
 
@@ -1126,7 +1128,7 @@ package body SPTEST is
       BUFFER         : SPTEST.BUFFER;
       BUFFER_POINTER : RTEMS.ADDRESS;
       COUNT          : RTEMS.UNSIGNED32;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32 := 0;
+      MESSAGE_SIZE   : RTEMS.Size := 0;
       STATUS         : RTEMS.STATUS_CODES;
    begin
 
@@ -3035,7 +3037,7 @@ package body SPTEST is
       pragma Unreferenced(ARGUMENT);
       BUFFER         : SPTEST.BUFFER;
       BUFFER_POINTER : RTEMS.ADDRESS;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32 := 0;
+      MESSAGE_SIZE   : RTEMS.Size := 0;
       STATUS         : RTEMS.STATUS_CODES;
    begin
 
diff --git a/testsuites/ada/sptests/sp09/sptest.ads b/testsuites/ada/sptests/sp09/sptest.ads
index d1bef16c96..7191dd59ce 100644
--- a/testsuites/ada/sptests/sp09/sptest.ads
+++ b/testsuites/ada/sptests/sp09/sptest.ads
@@ -161,12 +161,12 @@ package SPTEST is
 --  starting area and length.
 -- 
 
-   REGION_GOOD_AREA : array ( RTEMS.UNSIGNED32 range 0 .. 4095 )
-      of RTEMS.UNSIGNED32;
+   REGION_GOOD_AREA : array ( RTEMS.Size range 0 .. 4095 )
+      of RTEMS.Size;
    for REGION_GOOD_AREA'ALIGNMENT use RTEMS.STRUCTURE_ALIGNMENT;
 
-   REGION_START_OFFSET : constant RTEMS.UNSIGNED32 := 2048;
-   REGION_LENGTH       : constant RTEMS.UNSIGNED32 := 512;
+   REGION_START_OFFSET : constant RTEMS.Size := 2048;
+   REGION_LENGTH       : constant RTEMS.Size := 512;
 
 --
 --  The following area defines a memory area to be used as the
diff --git a/testsuites/ada/sptests/sp12/sp12.adb b/testsuites/ada/sptests/sp12/sp12.adb
index 62a5761e51..08a39a869b 100644
--- a/testsuites/ada/sptests/sp12/sp12.adb
+++ b/testsuites/ada/sptests/sp12/sp12.adb
@@ -22,6 +22,8 @@ with RTEMS;
 with RTEMS.TASKS;
 with SPTEST;
 with TEST_SUPPORT;
+with Interfaces.C;
+use Interfaces.C;
 
 procedure SP12 is
   INIT_ID : RTEMS.ID;
diff --git a/testsuites/ada/sptests/sp13/sptest.adb b/testsuites/ada/sptests/sp13/sptest.adb
index 96b74618b7..7621af6252 100644
--- a/testsuites/ada/sptests/sp13/sptest.adb
+++ b/testsuites/ada/sptests/sp13/sptest.adb
@@ -25,6 +25,7 @@ with TEST_SUPPORT;
 with TEXT_IO;
 with UNSIGNED32_IO;
 use type RTEMS.STATUS_CODES;
+use type RTEMS.Size;
 
 package body SPTEST is
 
@@ -227,9 +228,9 @@ package body SPTEST is
       BUFFER                     : SPTEST.BUFFER;
       BUFFER_POINTER             : constant RTEMS.ADDRESS := BUFFER'ADDRESS;
       COUNT                      : RTEMS.UNSIGNED32;
-      MESSAGE_SIZE               : RTEMS.UNSIGNED32 := 0;
+      MESSAGE_SIZE               : RTEMS.Size := 0;
       STATUS                     : RTEMS.STATUS_CODES;
-      SIZE                       : RTEMS.UNSIGNED32 := 0;
+      SIZE                       : RTEMS.Size := 0;
    begin
 
       RTEMS.MESSAGE_QUEUE.IDENT( 
@@ -578,7 +579,7 @@ TEST_SUPPORT.PAUSE;
           RTEMS.MESSAGE_QUEUE.CREATE(
               SPTEST.QUEUE_NAME( 1 ),
               2,            -- just 2 msgs each
-              RTEMS.UNSIGNED32( QUEUE_SIZE ),
+              RTEMS.Size( QUEUE_SIZE ),
               RTEMS.DEFAULT_ATTRIBUTES,
               QUEUE_ID( 1 ),
               STATUS
@@ -606,7 +607,7 @@ TEST_SUPPORT.PAUSE;
           RTEMS.MESSAGE_QUEUE.CREATE(
               SPTEST.QUEUE_NAME( 1 ),
               2,            -- just 2 msgs each
-              RTEMS.UNSIGNED32( QUEUE_SIZE ),
+              RTEMS.Size( QUEUE_SIZE ),
               RTEMS.DEFAULT_ATTRIBUTES,
               SPTEST.QUEUE_ID( 1 ),
               STATUS
@@ -620,7 +621,7 @@ TEST_SUPPORT.PAUSE;
           RTEMS.MESSAGE_QUEUE.SEND(
              SPTEST.QUEUE_ID( 1 ),
              BIG_SEND_BUFFER_POINTER,
-             RTEMS.UNSIGNED32( QUEUE_SIZE + 1 ),
+             RTEMS.Size( QUEUE_SIZE + 1 ),
              STATUS
           );
           TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
@@ -631,7 +632,7 @@ TEST_SUPPORT.PAUSE;
           RTEMS.MESSAGE_QUEUE.SEND(
              SPTEST.QUEUE_ID( 1 ),
              BIG_SEND_BUFFER_POINTER,
-             RTEMS.UNSIGNED32( QUEUE_SIZE ),
+             RTEMS.Size( QUEUE_SIZE ),
              STATUS
           );
           TEST_SUPPORT.DIRECTIVE_FAILED(
@@ -639,7 +640,7 @@ TEST_SUPPORT.PAUSE;
           );
 
           -- now read and verify the message just sent
-          SIZE := INTERFACES.UNSIGNED_32(QUEUE_SIZE);
+          SIZE := RTEMS.Size(QUEUE_SIZE);
           RTEMS.MESSAGE_QUEUE.RECEIVE(
              SPTEST.QUEUE_ID( 1 ),
              BIG_RECEIVE_BUFFER_POINTER,
@@ -651,7 +652,7 @@ TEST_SUPPORT.PAUSE;
           TEST_SUPPORT.DIRECTIVE_FAILED(
              STATUS, "message_queue_receive exact size"
           );
-          if SIZE /= RTEMS.UNSIGNED32( QUEUE_SIZE ) then
+          if SIZE /= RTEMS.Size( QUEUE_SIZE ) then
               TEXT_IO.PUT(
                  "TA1 - exact size size match failed for queue_size = "
               );
@@ -694,7 +695,7 @@ TEST_SUPPORT.PAUSE;
       BUFFER            : SPTEST.BUFFER;
       BUFFER_POINTER    : RTEMS.ADDRESS;
       PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY;
-      MESSAGE_SIZE      : RTEMS.UNSIGNED32 := 0;
+      MESSAGE_SIZE      : RTEMS.Size := 0;
       STATUS            : RTEMS.STATUS_CODES;
    begin
 
@@ -830,7 +831,7 @@ TEST_SUPPORT.PAUSE;
       BUFFER         : SPTEST.BUFFER;
       BUFFER_POINTER : RTEMS.ADDRESS;
       COUNT          : RTEMS.UNSIGNED32;
-      MESSAGE_SIZE   : RTEMS.UNSIGNED32 := 0;
+      MESSAGE_SIZE   : RTEMS.Size := 0;
       STATUS         : RTEMS.STATUS_CODES;
    begin
 
diff --git a/testsuites/ada/sptests/sp14/sptest.adb b/testsuites/ada/sptests/sp14/sptest.adb
index eb9ff3c34a..15239e30b4 100644
--- a/testsuites/ada/sptests/sp14/sptest.adb
+++ b/testsuites/ada/sptests/sp14/sptest.adb
@@ -25,6 +25,8 @@ with UNSIGNED32_IO;
 with INTERFACES; use INTERFACES;
 with RTEMS.TIMER;
 with RTEMS.SIGNAL;
+with Interfaces.C;
+use Interfaces.C;
 
 package body SPTEST is