Merge remote-tracking branch 'git-svn'

resources/AADLv2/components/devices.aadl

@@ -163,7 +163,7 @@ public
   device implementation rasta_serial.pohiada
   properties
     Deployment::Driver_Name    => "serial_rasta";
-    Implemented_As =>  classifier (GRUART::Driver_GRUART_Protocol.impl);
+    Device_Driver =>  classifier (GRUART::Driver_GRUART_Protocol.impl);
     Initialize_Entrypoint => classifier (GRUART::Initialize);
     Provided_Virtual_Bus_Class => (classifier (ocarina_buses::raw.i));
   end rasta_serial.pohiada;
@@ -205,7 +205,7 @@ public
   device implementation rasta_spacewire.pohiada
   properties
     Deployment::Driver_Name       => "spacewire_rasta";
-    Implemented_As =>  classifier (GRSPW::Driver_GRSPW_Protocol.impl);
+    Device_Driver =>  classifier (GRSPW::Driver_GRSPW_Protocol.impl);
     Initialize_Entrypoint => classifier (GRSPW::Initialize);
     Provided_Virtual_Bus_Class    => (classifier (ocarina_buses::pohi.c));
   end rasta_spacewire.pohiada;
@@ -248,7 +248,7 @@ public
   device implementation generic_serial.pohiada
   properties
     Deployment::Driver_Name       => "serial_linux";
-    Implemented_As =>
+    Device_Driver =>
          classifier (Native_UART::Driver_Native_UART_Protocol.impl);
     Initialize_Entrypoint => classifier (Native_UART::Initialize);
     Provided_Virtual_Bus_Class    => (classifier (ocarina_buses::raw.i));
@@ -290,7 +290,6 @@ public
   device implementation generic_sockets_ip.pohiada
   properties
     Deployment::Driver_Name       => "socketsnew";
-    Implemented_As => classifier (TCP_IP_Protocol::Driver_TCP_IP_Protocol.impl);
     Device_Driver => classifier (TCP_IP_Protocol::Driver_TCP_IP_Protocol.impl);
     Initialize_Entrypoint => classifier (TCP_IP_Protocol::Initialize);
     Provided_Virtual_Bus_Class    => (classifier (ocarina_buses::pohi.c));

resources/AADLv2/components/devices/grspw.aadl

@@ -38,7 +38,7 @@ public
 
    device implementation GRSPW_Device.impl
    properties
-      Implemented_As =>
+      Device_Driver =>
          classifier (GRSPW::Driver_GRSPW_Protocol.impl);
       Initialize_Entrypoint => classifier (GRSPW::Initialize);
    end GRSPW_Device.impl;

resources/AADLv2/components/devices/gruart.aadl

@@ -38,7 +38,7 @@ public
 
    device implementation GRUART_Device.impl
    properties
-      Implemented_As =>
+      Device_Driver =>
          classifier (GRUART::Driver_GRUART_Protocol.impl);
       Initialize_Entrypoint => classifier (GRUART::Initialize);
    end GRUART_Device.impl;

resources/AADLv2/components/devices/native_uart.aadl

@@ -36,7 +36,7 @@ public
 
    device implementation Native_UART_Device.impl
    properties
-      Implemented_As =>
+      Device_Driver =>
          classifier (Native_UART::Driver_Native_UART_Protocol.impl);
       Initialize_Entrypoint => classifier (Native_UART::Initialize);
    end Native_UART_Device.impl;

resources/AADLv2/components/devices/tcp_protocol.aadl

@@ -35,7 +35,7 @@ public
 
    device implementation TCP_IP_Device.impl
    properties
-      Implemented_As =>
+      Device_Driver =>
          classifier (TCP_IP_Protocol::Driver_TCP_IP_Protocol.impl);
       Initialize_Entrypoint => classifier (TCP_IP_Protocol::Initialize);
    end TCP_IP_Device.impl;

resources/AADLv2/taste_properties.aadl

@@ -218,6 +218,10 @@ dataview : list of aadlstring applies to (package);
 
 dataviewpath : list of aadlstring applies to (package);
 
+version: aadlstring applies to (package);
+
+interfacename: aadlstring applies to (subprogram access);
+
 Encoding_type : type enumeration (native, uper, acn);
 
 Encoding : Taste::Encoding_type applies to (parameter);
@@ -234,4 +238,6 @@ Associated_Queue_Size : aadlinteger applies to (subprogram);
 
 EncodingDefinitionFile : classifier (data) applies to (data);
 
+labelInheritance : aadlstring applies to (subprogram access);
+
 end Taste;