Commit b31765d6 authored by julien.delange's avatar julien.delange
Browse files

* AADLv2/components/devices/sockets-asn1.aadl

   AADLv2/components/devices/sockets-raw.aadl
   AADLv2/components/devices.aadl
   - Delete the old sockets generic driver
   - Delete the ASN.1 specific driver, has to be rewritten
     soon.
   - Keep only two drivers : one specific to RTEMS (ne2000),
     and another that is configured using ASN.1.



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@2046 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 03232f26
...@@ -18,7 +18,6 @@ public ...@@ -18,7 +18,6 @@ public
with ocarina_drivers_udp_exarm; with ocarina_drivers_udp_exarm;
with ocarina_drivers_serial; with ocarina_drivers_serial;
with ocarina_drivers_ip_asn1;
with ocarina_drivers_ip_pohic; with ocarina_drivers_ip_pohic;
with ocarina_drivers_exarm_ni_6071e_analog; with ocarina_drivers_exarm_ni_6071e_analog;
...@@ -187,20 +186,12 @@ public ...@@ -187,20 +186,12 @@ public
thebus : requires bus access ocarina_buses::ip.i; thebus : requires bus access ocarina_buses::ip.i;
end generic_sockets_ip; end generic_sockets_ip;
device implementation generic_sockets_ip.pohic_old device implementation generic_sockets_ip.pohic
properties properties
Deployment::Driver_Name => "sockets"; Deployment::Driver_Name => "sockets";
Device_Driver => classifier (ocarina_drivers_ip_pohic::sockets_impl.i); Device_Driver => classifier (ocarina_drivers_ip_pohic::sockets_impl.i);
Initialize_Entrypoint => classifier (ocarina_drivers_ip_pohic::spg_sockets_init); Initialize_Entrypoint => classifier (ocarina_drivers_ip_pohic::spg_sockets_init);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c)); Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c));
end generic_sockets_ip.pohic_old;
device implementation generic_sockets_ip.pohic
properties
Deployment::Driver_Name => "socketsnew";
Device_Driver => classifier (ocarina_drivers_ip_pohic::sockets_impl.inew);
Initialize_Entrypoint => classifier (ocarina_drivers_ip_pohic::spg_sockets_init);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c));
end generic_sockets_ip.pohic; end generic_sockets_ip.pohic;
device implementation generic_sockets_ip.pohiada device implementation generic_sockets_ip.pohiada
...@@ -210,16 +201,8 @@ public ...@@ -210,16 +201,8 @@ public
Initialize_Entrypoint => classifier (TCP_IP_Protocol::Initialize); Initialize_Entrypoint => classifier (TCP_IP_Protocol::Initialize);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c)); Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c));
end generic_sockets_ip.pohiada; end generic_sockets_ip.pohiada;
device implementation generic_sockets_ip.asn1 ------------------
properties
Deployment::Driver_Name => "sockets_asn1";
Device_Driver => classifier (ocarina_drivers_ip_asn1::sockets_impl.asn1);
Initialize_Entrypoint => classifier (ocarina_drivers_ip_asn1::spg_sockets_init);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::asn1.i));
end generic_sockets_ip.asn1;
------------------
-- RTEMS NE2000 -- -- RTEMS NE2000 --
------------------ ------------------
......
package ocarina_drivers_ip_asn1
public
subprogram spg_sockets_init
properties
Source_Language => C;
Source_Name => "__po_hi_driver_sockets_asn1_init";
end spg_sockets_init;
thread eth_linux_poller
end eth_linux_poller;
thread implementation eth_linux_poller.asn1
calls
mycall : {
pspg : subprogram spg_eth_linux_poller_asn1;
};
properties
Period => 1000ms;
Dispatch_Protocol => Periodic;
end eth_linux_poller.asn1;
subprogram spg_eth_linux_poller_asn1
properties
Source_Language => C;
Source_Name => "__po_hi_driver_sockets_asn1_poller";
end spg_eth_linux_poller_asn1;
subprogram spg_eth_linux_sender_asn1
properties
Source_Language => C;
Source_Name => "__po_hi_driver_sockets_asn1_send";
end spg_eth_linux_sender_asn1;
abstract sockets_impl
end sockets_impl;
abstract implementation sockets_impl.asn1
subcomponents
-- receiver : thread eth_linux_poller.asn1;
sender : subprogram spg_eth_linux_sender_asn1;
end sockets_impl.asn1;
end ocarina_drivers_ip_asn1;
package ocarina_drivers_ip_pohic package ocarina_drivers_ip_pohic
public public
with Deployment;
subprogram spg_sockets_init subprogram spg_sockets_init
properties properties
...@@ -10,27 +10,6 @@ properties ...@@ -10,27 +10,6 @@ properties
end spg_sockets_init; end spg_sockets_init;
thread eth_linux_poller
end eth_linux_poller;
thread implementation eth_linux_poller.i
calls
mycall : {
pspg : subprogram spg_eth_linux_poller_i;
};
properties
Period => 1000ms;
Dispatch_Protocol => Periodic;
end eth_linux_poller.i;
subprogram spg_eth_linux_poller_i
properties
Source_Language => C;
Source_Name => "__po_hi_sockets_receiver_task";
end spg_eth_linux_poller_i;
subprogram spg_eth_linux_sender subprogram spg_eth_linux_sender
properties properties
Source_Language => C; Source_Language => C;
...@@ -40,23 +19,21 @@ end spg_eth_linux_sender; ...@@ -40,23 +19,21 @@ end spg_eth_linux_sender;
subprogram implementation spg_eth_linux_sender.i subprogram implementation spg_eth_linux_sender.i
end spg_eth_linux_sender.i; end spg_eth_linux_sender.i;
data configuration_type
properties
Type_Source_Name => "__po_hi_c_ip_conf_t";
Source_Text => ("drivers/configuration/ip.h");
end configuration_type;
abstract sockets_impl abstract sockets_impl
properties
Deployment::Configuration_Type => classifier (ocarina_drivers_ip_pohic::configuration_type);
end sockets_impl; end sockets_impl;
abstract implementation sockets_impl.i abstract implementation sockets_impl.i
subcomponents subcomponents
sockets_linux_receiver : thread eth_linux_poller.i;
sender : subprogram spg_eth_linux_sender.i;
end sockets_impl.i;
abstract implementation sockets_impl.inew
subcomponents
-- receiver : thread eth_linux_poller.i;
sender : subprogram spg_eth_linux_sender.i; sender : subprogram spg_eth_linux_sender.i;
end sockets_impl.inew; end sockets_impl.i;
end ocarina_drivers_ip_pohic; end ocarina_drivers_ip_pohic;
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