* Update to match new signatures from ORK+

git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/po-hi-ada@2498 129961e7-ef38-4bb5-a8f7-c9a525a55882

src/drivers/polyorb_hi_drivers_grspw.ads

@@ -14,14 +14,11 @@ package PolyORB_HI_Drivers_GRSPW is
 
    procedure Receive;
 
-   pragma Warnings (Off);
    function Send
      (Node    : Node_Type;
       Message : Stream_Element_Array;
       Size    : Stream_Element_Offset)
      return Error_Kind;
-   pragma Export (C, Send, "grspw_device.impl_send");
-   pragma Warnings (On);
 
    task Idle_Task is
       --  Dummy idle task to work around an issue in the GRSPW driver

src/drivers/polyorb_hi_drivers_gruart.adb

 with Interfaces;
 with Ada.Unchecked_Conversion;
-with Ada.Streams;
 
-with Uart.HLInterface;
 with Uart.Core;
+with Uart.HLInterface;
+with Uart.Streams;
 
 with PolyORB_HI.Output;
 with PolyORB_HI.Messages;
@@ -38,12 +38,12 @@ package body PolyORB_HI_Drivers_GRUART is
 
    Nodes : array (Node_Type) of Node_Record;
 
-   subtype AS_Message_Length_Stream is Ada.Streams.Stream_Element_Array
+   subtype AS_Message_Length_Stream is Uart.STreams.Stream_Element_Array
      (1 .. Message_Length_Size);
    subtype Message_Length_Stream is Stream_Element_Array
      (1 .. Message_Length_Size);
 
-   subtype AS_Full_Stream is Ada.Streams.Stream_Element_Array (1 .. PDU_Size);
+   subtype AS_Full_Stream is Uart.Streams.Stream_Element_Array (1 .. PDU_Size);
    subtype Full_Stream is Stream_Element_Array (1 .. PDU_Size);
 
    function To_PO_HI_Message_Length_Stream is new Ada.Unchecked_Conversion
@@ -98,13 +98,13 @@ package body PolyORB_HI_Drivers_GRUART is
    -------------
 
    procedure Receive is
-      use type Ada.Streams.Stream_Element_Offset;
+      use type Uart.Streams.Stream_Element_Offset;
 
       SEL : AS_Message_Length_Stream;
       SEA : AS_Full_Stream;
-      SEO : Ada.Streams.Stream_Element_Offset;
-      Packet_Size : Ada.Streams.Stream_Element_Offset;
-      Data_Received_Index : Ada.Streams.Stream_Element_Offset;
+      SEO : Uart.Streams.Stream_Element_Offset;
+      Packet_Size : Uart.Streams.Stream_Element_Offset;
+      Data_Received_Index : Uart.Streams.Stream_Element_Offset;
    begin
 
       Main_Loop : loop
@@ -118,7 +118,7 @@ package body PolyORB_HI_Drivers_GRUART is
 
          Uart.HLInterface.Read (Nodes (My_Node).UART_Port_Receive, SEL, SEO);
 
-         Packet_Size := Ada.Streams.Stream_Element_Offset
+         Packet_Size := Uart.Streams.Stream_Element_Offset
            (To_Length (To_PO_HI_Message_Length_Stream (SEL)));
          SEO := Packet_Size;
 
@@ -143,7 +143,7 @@ package body PolyORB_HI_Drivers_GRUART is
                "UART #"
                  & Nodes (My_Node).UART_Device_Receive'Img
                  & " received"
-                 & Ada.Streams.Stream_Element_Offset'Image (SEO)
+                 & Uart.Streams.Stream_Element_Offset'Image (SEO)
                  & " bytes");
 
             --  Deliver to the peer handler
@@ -175,8 +175,8 @@ package body PolyORB_HI_Drivers_GRUART is
       --  types are incompatible. The only time efficient manner to do
       --  the casting is to use representation clauses.
 
-      Msg : Ada.Streams.Stream_Element_Array
-        (1 .. Ada.Streams.Stream_Element_Offset (Size));
+      Msg : Uart.Streams.Stream_Element_Array
+        (1 .. Uart.Streams.Stream_Element_Offset (Size));
       pragma Import (Ada, Msg);
       for Msg'Address use Message'Address;
 
@@ -190,7 +190,7 @@ package body PolyORB_HI_Drivers_GRUART is
                               Buffer => Msg);
 
       return Error_Kind'(Error_None);
-      --  Note: we have no way to no there was an error here
+      --  Note: we have no way to know there was an error here
    end Send;
 
 end PolyORB_HI_Drivers_GRUART;

src/drivers/polyorb_hi_drivers_gruart.ads

@@ -3,6 +3,9 @@ with PolyORB_HI_Generated.Deployment;
 with PolyORB_HI.Streams;
 with PolyORB_HI.Utils;
 
+with POHICDRIVER_UART;
+pragma Unreferenced (POHICDRIVER_UART);
+
 package PolyORB_HI_Drivers_GRUART is
 
    use PolyORB_HI.Errors;
@@ -13,13 +16,10 @@ package PolyORB_HI_Drivers_GRUART is
 
    procedure Receive;
 
-   pragma Warnings (Off);
    function Send
      (Node    : Node_Type;
       Message : Stream_Element_Array;
       Size    : Stream_Element_Offset)
      return Error_Kind;
-   pragma Export (C, Send, "gruart_device.impl_send");
-   pragma Warnings (On);
 
 end PolyORB_HI_Drivers_GRUART;

src/drivers/polyorb_hi_drivers_native_tcp_ip.ads

@@ -14,13 +14,10 @@ package PolyORB_HI_Drivers_Native_TCP_IP is
 
    procedure Receive;
 
-   pragma Warnings (Off);
    function Send
      (Node    : Node_Type;
       Message : Stream_Element_Array;
       Size    : Stream_Element_Offset)
      return Error_Kind;
-   pragma Export (C, Send, "tcp_ip_device.impl_send");
-   pragma Warnings (On);
 
 end PolyORB_HI_Drivers_Native_TCP_IP;

src/drivers/polyorb_hi_drivers_native_uart.adb

@@ -109,9 +109,9 @@ package body PolyORB_HI_Drivers_Native_UART is
             --  Data_Bits define the CS8 and CS7 enumerators.
 
             if S (First) = '8' then
-               Bits := GNAT.Serial_Communications.B8;
+               Bits := GNAT.Serial_Communications.CS8;
             elsif S (First) = '7' then
-               Bits := GNAT.Serial_Communications.B7;
+               Bits := GNAT.Serial_Communications.CS7;
             else
                raise Program_Error with "Wrong bits: " & S (First);
             end if;
@@ -279,7 +279,7 @@ package body PolyORB_HI_Drivers_Native_UART is
          Buffer => Msg);
 
       return Error_Kind'(Error_None);
-      --  Note: we have no way to no there was an error here
+      --  Note: we have no way to know there was an error here
 
    end Send;
 

src/drivers/polyorb_hi_drivers_native_uart.ads

@@ -13,13 +13,10 @@ package PolyORB_HI_Drivers_Native_UART is
 
    procedure Receive;
 
-   pragma Warnings (Off);
    function Send
      (Node    : Node_Type;
       Message : Stream_Element_Array;
       Size    : Stream_Element_Offset)
      return Error_Kind;
-   pragma Export (C, Send, "native_uart_device.impl_send");
-   pragma Warnings (On);
 
 end PolyORB_HI_Drivers_Native_UART;