Commit 826ff38c authored by julien.delange's avatar julien.delange

* Add ASN1_Module_Name property

 * remove TASTE specific properties in devices library, use deployment name space instead



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@2089 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent c49404c8
......@@ -29,26 +29,24 @@ public
with GRSPW;
with TCP_IP_Protocol;
with TASTE;
------------------------
-- Configuration Type --
------------------------
data configuration_type_ip
properties
Type_Source_Name => "IP-Conf-T";
Deployment::Module_Name => "POHICDRIVER-IP";
Source_Language => ASN1;
Source_Text => ("OCARINA_INCLUDE_PATH/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/ip.asn" , "drivers/configuration/ip.h");
Type_Source_Name => "IP-Conf-T";
Deployment::ASN1_Module_Name => "POHICDRIVER-IP";
Source_Language => ASN1;
Source_Text => ("OCARINA_INCLUDE_PATH/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/ip.asn" , "drivers/configuration/ip.h");
end configuration_type_ip;
data configuration_type_serial
properties
Type_Source_Name => "Serial-Conf-T";
Deployment::Module_Name => "POHICDRIVER-UART";
Source_Language => ASN1;
Source_Text => ("OCARINA_INCLUDE_PATH/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/serial.asn", "drivers/configuration/serial.h");
Type_Source_Name => "Serial-Conf-T";
Deployment::ASN1_Module_Name => "POHICDRIVER-UART";
Source_Language => ASN1;
Source_Text => ("OCARINA_INCLUDE_PATH/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/serial.asn", "drivers/configuration/serial.h");
end configuration_type_serial;
--------------
......@@ -75,8 +73,6 @@ public
device leon_serial
features
serialaccess : requires bus access ocarina_buses::serial.generic;
properties
TASTE::Help => "help leon serial";
end leon_serial;
device implementation leon_serial.raw
......@@ -100,8 +96,6 @@ public
----------------
device rasta_1553
properties
TASTE::Help => "help rasta 1553";
end rasta_1553;
device implementation rasta_1553.terminal
......@@ -127,8 +121,6 @@ public
device rasta_serial
features
serialaccess : requires bus access ocarina_buses::serial.generic;
properties
TASTE::Help => "help rasta serial";
end rasta_serial;
device implementation rasta_serial.raw
......@@ -154,8 +146,6 @@ public
device rasta_spacewire
features
spwaccess : requires bus access ocarina_buses::spacewire.generic;
properties
TASTE::Help => "help rasta spw";
end rasta_spacewire;
device implementation rasta_spacewire.pohic
......@@ -181,8 +171,6 @@ public
device generic_serial
features
serialaccess : requires bus access ocarina_buses::serial.generic;
properties
TASTE::Help => "help generic serial";
end generic_serial;
device implementation generic_serial.raw
......@@ -216,8 +204,6 @@ public
device generic_sockets_ip
features
thebus : requires bus access ocarina_buses::ip.i;
properties
TASTE::Help => "help generic sockets";
end generic_sockets_ip;
device implementation generic_sockets_ip.pohic
......@@ -226,7 +212,6 @@ public
Device_Driver => classifier (ocarina_drivers_ip_pohic::sockets_impl.i);
Initialize_Entrypoint => classifier (ocarina_drivers_ip_pohic::spg_sockets_init);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c));
TASTE::Help => "help generic sockets";
end generic_sockets_ip.pohic;
device implementation generic_sockets_ip.pohiada
......@@ -244,8 +229,6 @@ public
device rtems_ne2000
features
thebus : requires bus access ocarina_buses::ip.i;
properties
TASTE::Help => "help ne2000 sockets";
end rtems_ne2000;
device implementation rtems_ne2000.ip_pohic
......
......@@ -3,6 +3,7 @@ package ocarina_drivers_exarm_ni_6071e_analog
public
with Base_Types;
with Deployment;
subprogram spg_init
properties
......
......@@ -3,6 +3,7 @@ package ocarina_drivers_exarm_ni_6071e_digital
public
with Base_Types;
with Deployment;
subprogram spg_init
properties
......@@ -45,6 +46,9 @@ abstract driver
features
data1 : out data port Base_Types::Unsigned_32;
data2 : out data port Base_Types::Unsigned_32;
properties
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end driver;
abstract implementation driver.i
......
......@@ -3,6 +3,7 @@ package ocarina_drivers_generic_keyboard
public
with Base_Types;
with Deployment;
subprogram spg_generic_keyboard_init
properties
......@@ -40,6 +41,9 @@ end spg_generic_keyboard_poller;
abstract generic_keyboard_driver
features
key_pressed : out data port Base_Types::Integer;
properties
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end generic_keyboard_driver;
......
......@@ -19,6 +19,7 @@ public
with GR_CPCI_X4CV;
with Generic_Bus;
with Deployment;
------------
-- DEVICE --
......@@ -50,6 +51,9 @@ public
-- using an abstract component.
abstract Driver_GRSPW_Protocol
properties
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end Driver_GRSPW_Protocol;
abstract implementation Driver_GRSPW_Protocol.impl
......
......@@ -18,6 +18,7 @@ package GRUART
public
with Generic_Bus;
with Deployment;
------------
-- DEVICE --
......@@ -49,6 +50,9 @@ public
-- using an abstract component.
abstract Driver_GRUART_Protocol
properties
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end Driver_GRUART_Protocol;
abstract implementation Driver_GRUART_Protocol.impl
......
......@@ -48,6 +48,8 @@ end serial_poller.leon;
abstract serial_driver
properties
Deployment::Configuration_Type => classifier (ocarina_drivers::configuration_type_serial);
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end serial_driver;
abstract implementation serial_driver.leon
......
......@@ -17,6 +17,7 @@ package Native_UART
public
with Generic_Bus;
with Deployment;
------------
-- DEVICE --
......@@ -48,6 +49,9 @@ public
-- using an abstract component.
abstract Driver_Native_UART_Protocol
properties
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end Driver_Native_UART_Protocol;
abstract implementation Driver_Native_UART_Protocol.impl
......
package ocarina_drivers_rasta_1553
public
with Deployment;
subprogram spg_1553_controller_rasta
properties
......@@ -71,6 +72,9 @@ end if1553_controller.rasta;
abstract if1553_driver
properties
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end if1553_driver;
abstract implementation if1553_driver.rasta_terminal
......
......@@ -46,6 +46,8 @@ end serial_poller.rasta;
abstract serial_driver
properties
Deployment::Configuration_Type => classifier (ocarina_drivers::configuration_type_serial);
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end serial_driver;
abstract implementation serial_driver.rasta
......
......@@ -3,6 +3,7 @@ package ocarina_drivers_rasta_spacewire
public
with ocarina_buses;
with Deployment;
subprogram spg_spacewire_poller_rasta
properties
......@@ -38,6 +39,9 @@ end spacewire_poller.rasta;
abstract spacewire_driver
properties
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end spacewire_driver;
abstract implementation spacewire_driver.rasta
......
......@@ -54,6 +54,8 @@ end serial_poller.linux;
abstract serial_driver
properties
Deployment::Configuration_Type => classifier (ocarina_drivers::configuration_type_serial);
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end serial_driver;
abstract implementation serial_driver.linux
......
......@@ -23,6 +23,8 @@ end spg_eth_linux_sender.i;
abstract sockets_impl
properties
Deployment::Configuration_Type => classifier (ocarina_drivers::configuration_type_ip);
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end sockets_impl;
abstract implementation sockets_impl.i
......
......@@ -2,6 +2,8 @@ package ocarina_drivers_rtems_ne2000
public
with Deployment;
subprogram init
properties
Source_Language => C;
......@@ -37,6 +39,9 @@ end spg_sender;
abstract driver
properties
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end driver;
......
......@@ -16,6 +16,7 @@ package TCP_IP_Protocol
public
with Generic_Native;
with Deployment;
------------
-- DEVICE --
......@@ -47,6 +48,9 @@ public
-- using an abstract component.
abstract Driver_TCP_IP_Protocol
properties
Deployment::Version => "0.1beta";
Deployment::Help => "Write your ASN.1 configuration here";
end Driver_TCP_IP_Protocol;
abstract implementation Driver_TCP_IP_Protocol.impl
......
......@@ -37,10 +37,6 @@ FS_Default_Value : aadlstring applies to (data);
device,
subprogram access);
Help : aadlstring applies to (device);
ASN1_Type : aadlstring applies to (device);
Driver_Id_And_Version : aadlstring applies to (device);
----------------------------
-- Types and enumerations --
----------------------------
......
......@@ -54,9 +54,14 @@ property set Deployment is
Driver_Name : aadlstring applies to (device);
Configuration : aadlstring applies to (device);
Config : aadlstring applies to (device);
Module_Name : aadlstring applies to (all);
ASN1_Module_Name : aadlstring applies to (all);
Help : aadlstring applies to (all);
Version : aadlstring applies to (all);
Configuration_Type : classifier (data) applies to (all);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment