Fixed IO Manager calls to remove an argument which was used in 3.2.1

but not in newer RTEMS.

2 files changed, 9 insertions, 64 deletions

diff --git a/cpukit/ada/rtems.adb b/cpukit/ada/rtems.adb
index 3071a79ecb..80b88bfc27 100644
--- a/cpukit/ada/rtems.adb
+++ b/cpukit/ada/rtems.adb
@@ -1740,140 +1740,90 @@ package body RTEMS is
       Major        : in     RTEMS.Device_Major_Number;
       Minor        : in     RTEMS.Device_Minor_Number;
       Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
       Result       :    out RTEMS.Status_Codes
    ) is
       function IO_Open_Base (
          Major        : RTEMS.Device_Major_Number;
          Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address;
-         Return_Value : access RTEMS.Unsigned32
+         Argument     : RTEMS.Address
       )  return RTEMS.Status_Codes;
       pragma Import (C, IO_Open_Base, "rtems_io_open");
-      Return_Value_Base : aliased RTEMS.Unsigned32 := Return_Value;
    begin
  
-      Result := IO_Open_Base (
-         Major,
-         Minor,
-         Argument,
-         Return_Value_Base'Unchecked_Access
-      );
+      Result := IO_Open_Base (Major, Minor, Argument);
  
-      Return_Value := Return_Value_Base;
-
    end IO_Open;
  
    procedure IO_Close (
       Major        : in     RTEMS.Device_Major_Number;
       Minor        : in     RTEMS.Device_Minor_Number;
       Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
       Result       :    out RTEMS.Status_Codes
    ) is
       function IO_Close_Base (
          Major        : RTEMS.Device_Major_Number;
          Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address;
-         Return_Value : access RTEMS.Unsigned32
+         Argument     : RTEMS.Address
       )  return RTEMS.Status_Codes;
       pragma Import (C, IO_Close_Base, "rtems_io_close");
-      Return_Value_Base : aliased RTEMS.Unsigned32 := Return_Value;
    begin
  
-      Result := IO_Close_Base (
-         Major,
-         Minor,
-         Argument,
-         Return_Value_Base'Unchecked_Access
-      );
+      Result := IO_Close_Base (Major, Minor, Argument);
  
-      Return_Value := Return_Value_Base;
-
    end IO_Close;
  
    procedure IO_Read (
       Major        : in     RTEMS.Device_Major_Number;
       Minor        : in     RTEMS.Device_Minor_Number;
       Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
       Result       :    out RTEMS.Status_Codes
    ) is
       function IO_Read_Base (
          Major        : RTEMS.Device_Major_Number;
          Minor        : RTEMS.Device_Minor_Number;
          Argument     : RTEMS.Address;
-         Return_Value : access RTEMS.Unsigned32
       )  return RTEMS.Status_Codes;
       pragma Import (C, IO_Read_Base, "rtems_io_read");
-      Return_Value_Base : aliased RTEMS.Unsigned32 := Return_Value;
    begin
  
-      Result := IO_Read_Base (
-         Major,
-         Minor,
-         Argument,
-         Return_Value_Base'Unchecked_Access
-      );
+      Result := IO_Read_Base (Major, Minor, Argument);
  
-      Return_Value := Return_Value_Base;
-
    end IO_Read;
  
    procedure IO_Write (
       Major        : in     RTEMS.Device_Major_Number;
       Minor        : in     RTEMS.Device_Minor_Number;
       Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
       Result       :    out RTEMS.Status_Codes
    ) is
       function IO_Write_Base (
          Major        : RTEMS.Device_Major_Number;
          Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address;
-         Return_Value : access RTEMS.Unsigned32
+         Argument     : RTEMS.Address
       )  return RTEMS.Status_Codes;
       pragma Import (C, IO_Write_Base, "rtems_io_write");
-      Return_Value_Base : aliased RTEMS.Unsigned32 := Return_Value;
    begin
  
-      Result := IO_Write_Base (
-         Major,
-         Minor,
-         Argument,
-         Return_Value_Base'Unchecked_Access
-      );
+      Result := IO_Write_Base (Major, Minor, Argument);
  
-      Return_Value := Return_Value_Base;
-
    end IO_Write;
  
    procedure IO_Control (
       Major        : in     RTEMS.Device_Major_Number;
       Minor        : in     RTEMS.Device_Minor_Number;
       Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
       Result       :    out RTEMS.Status_Codes
    ) is
       function IO_Control_Base (
          Major        : RTEMS.Device_Major_Number;
          Minor        : RTEMS.Device_Minor_Number;
-         Argument     : RTEMS.Address;
-         Return_Value : access RTEMS.Unsigned32
+         Argument     : RTEMS.Address
       )  return RTEMS.Status_Codes;
       pragma Import (C, IO_Control_Base, "rtems_io_control");
-      Return_Value_Base : aliased RTEMS.Unsigned32 := Return_Value;
    begin
  
-      Result := IO_Control_Base (
-         Major,
-         Minor,
-         Argument,
-         Return_Value_Base'Unchecked_Access
-      );
+      Result := IO_Control_Base (Major, Minor, Argument);
  
-      Return_Value := Return_Value_Base;
-
    end IO_Control;
  
  
diff --git a/cpukit/ada/rtems.ads b/cpukit/ada/rtems.ads
index 8feba8934e..3e492dad53 100644
--- a/cpukit/ada/rtems.ads
+++ b/cpukit/ada/rtems.ads
@@ -1312,7 +1312,6 @@ package RTEMS is
       Major        : in     RTEMS.Device_Major_Number;
       Minor        : in     RTEMS.Device_Minor_Number;
       Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
       Result       :    out RTEMS.Status_Codes
    );
 
@@ -1320,7 +1319,6 @@ package RTEMS is
       Major        : in     RTEMS.Device_Major_Number;
       Minor        : in     RTEMS.Device_Minor_Number;
       Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
       Result       :    out RTEMS.Status_Codes
    );
 
@@ -1328,7 +1326,6 @@ package RTEMS is
       Major        : in     RTEMS.Device_Major_Number;
       Minor        : in     RTEMS.Device_Minor_Number;
       Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
       Result       :    out RTEMS.Status_Codes
    );
 
@@ -1336,7 +1333,6 @@ package RTEMS is
       Major        : in     RTEMS.Device_Major_Number;
       Minor        : in     RTEMS.Device_Minor_Number;
       Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
       Result       :    out RTEMS.Status_Codes
    );
 
@@ -1344,7 +1340,6 @@ package RTEMS is
       Major        : in     RTEMS.Device_Major_Number;
       Minor        : in     RTEMS.Device_Minor_Number;
       Argument     : in     RTEMS.Address;
-      Return_Value :    out RTEMS.Unsigned32;
       Result       :    out RTEMS.Status_Codes
    );