Skip to content

GitLab

Commit e6e98aa2 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Refactor Demo_ContextParams with V2

parent 6f91059f
Hide whitespace changes
Inline Side-by-side
Demo_ContextParams/DeploymentView.aadl 0 → 100644
View file @ e6e98aa2
---------------------------------------------------
-- AADL2.1
-- TASTE type deploymentview
--
-- generated code: do not edit
---------------------------------------------------
PACKAGE deploymentview::DV::Node1
PUBLIC
WITH Taste;
WITH Deployment;
WITH TASTE_DV_Properties;
PROCESS demo
END demo;
PROCESS IMPLEMENTATION demo.others
END demo.others;
END deploymentview::DV::Node1;
PACKAGE deploymentview::DV
PUBLIC
WITH interfaceview::IV::cyclic_function;
WITH interfaceview::IV::passive_function;
WITH ocarina_processors_x86;
WITH deploymentview::DV::Node1;
WITH Taste;
WITH Deployment;
WITH interfaceview::IV;
WITH TASTE_DV_Properties;
SYSTEM Node1
END Node1;
SYSTEM IMPLEMENTATION Node1.others
SUBCOMPONENTS
IV_cyclic_function : SYSTEM interfaceview::IV::cyclic_function::cyclic_function.others {
Taste::FunctionName => "cyclic_function";
};
IV_passive_function : SYSTEM interfaceview::IV::passive_function::passive_function.others {
Taste::FunctionName => "passive_function";
};
demo : PROCESS deploymentview::DV::Node1::demo.others {
Taste::coordinates => "113382 63614 152813 89886";
Deployment::Port_Number => 0;
};
x86_linux : PROCESSOR ocarina_processors_x86::x86.linux {
Taste::coordinates => "108453 56108 157742 93639";
};
PROPERTIES
Taste::APLC_Binding => (reference (demo)) APPLIES TO IV_cyclic_function;
Taste::APLC_Binding => (reference (demo)) APPLIES TO IV_passive_function;
Actual_Processor_Binding => (reference (x86_linux)) APPLIES TO demo;
END Node1.others;
SYSTEM deploymentview
END deploymentview;
SYSTEM IMPLEMENTATION deploymentview.others
SUBCOMPONENTS
Node1 : SYSTEM Node1.others {
Taste::coordinates => "102292 45385 163903 99000";
};
interfaceview : SYSTEM interfaceview::IV::interfaceview.others;
END deploymentview.others;
PROPERTIES
Taste::coordinates => "0 0 297000 210000";
Taste::version => "2.0";
Taste::interfaceView => "InterfaceView.aadl";
Taste::HWLibraries => ("../../../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
END deploymentview::DV;
Demo_ContextParams/Inputs/DeploymentView.aadl deleted 100644 → 0
View file @ 6f91059f
PACKAGE deploymentview::DV
PUBLIC
WITH Deployment;
WITH Taste;
WITH interfaceview::IV;
WITH ocarina_processors_x86;
---------------------------------------------------
-- TASTE Deployement View
---------------------------------------------------
----------------------
-- ProcessorBoards --
----------------------
SYSTEM obj60_obj60
END obj60_obj60;
PROCESS demo_obj80
END demo_obj80;
PROCESS IMPLEMENTATION demo_obj80.others
END demo_obj80.others;
MEMORY obj90_obj90
END obj90_obj90;
MEMORY IMPLEMENTATION obj90_obj90.others
END obj90_obj90.others;
SYSTEM IMPLEMENTATION obj60_obj60.others
SUBCOMPONENTS
demo_obj80 : PROCESS demo_obj80.others
{ Taste::Coordinates => "923 396 1280 824";
Deployment::Port_Number => 0;};
cyclic_function_obj186 : SYSTEM interfaceview::IV::cyclic_function
{ Taste::Coordinates => "956 435 1255 618" ;};
passive_function_obj558 : SYSTEM interfaceview::IV::passive_function
{ Taste::Coordinates => "951 641 1259 782" ;};
proc_obj70 : PROCESSOR ocarina_processors_x86::x86.linux
{ Taste::Coordinates => "852 310 1566 1165"; };
obj90_obj90 : MEMORY obj90_obj90.others
{ Taste::Coordinates => "1459 750 2173 1605"; };
PROPERTIES
-- Connexion des CPUs aux process/drivers
Actual_Processor_Binding => (reference (proc_obj70)) applies to demo_obj80;
Taste::APLC_Binding => (reference(demo_obj80)) APPLIES TO cyclic_function_obj186;
Taste::APLC_Binding => (reference(demo_obj80)) APPLIES TO passive_function_obj558;
Actual_Memory_Binding => (reference (obj90_obj90)) applies to demo_obj80;
END obj60_obj60.others;
--------------
-- Devices--
--------------
-----------
-- Buses --
-----------
-----------------
-- Root System --
-----------------
SYSTEM deploymentview
END deploymentview;
SYSTEM IMPLEMENTATION deploymentview.others
SUBCOMPONENTS
-- The processor boards
obj60_obj60 : SYSTEM obj60_obj60.others
{ Taste::Coordinates => "757 134 2488 2002"; };
-- The devices
-- The buses
-- The IV systems
interfaceview_obj150 : SYSTEM interfaceview::IV::interfaceview.others;
END deploymentview.others;
PROPERTIES
Taste::Coordinates => "0 0 2970 2100";
Taste::interfaceView => "InterfaceView.aadl";
END deploymentview::DV;
---------------------------------------
-- copied aadl libraries
-- TASTE requirement
-- Do not edit below this line
---------------------------------------
package ocarina_drivers_ip_pohic
public
subprogram spg_sockets_init
properties
Source_Language => C;
Source_Name => "__po_hi_driver_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
properties
Source_Language => C;
Source_Name => "__po_hi_driver_sockets_send";
end spg_eth_linux_sender;
subprogram implementation spg_eth_linux_sender.i
end spg_eth_linux_sender.i;
abstract sockets_impl
end sockets_impl;
abstract implementation sockets_impl.i
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;
end sockets_impl.inew;
end ocarina_drivers_ip_pohic;
package ocarina_drivers_serial
public
subprogram spg_serial_poller_linux
properties
Source_Language => C;
Source_Name => "__po_hi_c_driver_serial_linux_poller";
end spg_serial_poller_linux;
subprogram spg_serial_sender_linux
properties
Source_Language => C;
Source_Name => "__po_hi_c_driver_serial_linux_sender";
end spg_serial_sender_linux;
subprogram spg_serial_init_linux
properties
Source_Language => C;
Source_Name => "__po_hi_c_driver_serial_linux_init";
end spg_serial_init_linux;
subprogram spg_serial_init_linux_sender
properties
Source_Language => C;
Source_Name => "__po_hi_c_driver_serial_linux_init_sender";
end spg_serial_init_linux_sender;
subprogram spg_serial_init_linux_receiver
properties
Source_Language => C;
Source_Name => "__po_hi_c_driver_serial_linux_init_receiver";
end spg_serial_init_linux_receiver;
thread serial_poller
end serial_poller;
thread implementation serial_poller.linux
calls
mycall : {
pspg : subprogram spg_serial_poller_linux;
};
properties
Period => 1000ms;
Dispatch_Protocol => Periodic;
end serial_poller.linux;
abstract serial_driver
end serial_driver;
abstract implementation serial_driver.linux
subcomponents
serial_linux_receiver : thread serial_poller.linux;
sender : subprogram spg_serial_sender_linux;
end serial_driver.linux;
abstract implementation serial_driver.linux_sender
subcomponents
sender : subprogram spg_serial_sender_linux;
end serial_driver.linux_sender;
abstract implementation serial_driver.linux_receiver
subcomponents
serial_linux_receiver : thread serial_poller.linux;
end serial_driver.linux_receiver;
end ocarina_drivers_serial;
package ocarina_drivers_rasta_serial
public
with ocarina_buses;
subprogram spg_serial_poller_rasta
properties
Source_Language => C;
Source_Name => "__po_hi_c_driver_serial_rasta_poller";
end spg_serial_poller_rasta;
subprogram spg_serial_sender_rasta
properties
Source_Language => C;
Source_Name => "__po_hi_c_driver_serial_rasta_sender";
end spg_serial_sender_rasta;
subprogram spg_serial_init_rasta
properties
Source_Language => C;
Source_Name => "__po_hi_c_driver_serial_rasta_init";
end spg_serial_init_rasta;
thread serial_poller
end serial_poller;
thread implementation serial_poller.rasta
calls
mycall : {
pspg : subprogram spg_serial_poller_rasta;
};
properties
Period => 1000ms;
Dispatch_Protocol => Periodic;
end serial_poller.rasta;
abstract serial_driver
end serial_driver;
abstract implementation serial_driver.rasta
subcomponents
receiver_rasta_serial : thread serial_poller.rasta;
sender : subprogram spg_serial_sender_rasta;
end serial_driver.rasta;
end ocarina_drivers_rasta_serial;
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
public
with deployment;
with ocarina_buses;
with Data_Model;
with Base_Types;
with ocarina_drivers_rasta_1553;
with ocarina_drivers_rasta_serial;
with ocarina_drivers_rasta_spacewire;
with ocarina_drivers_rtems_ne2000;
with ocarina_drivers_udp_exarm;
with ocarina_drivers_serial;
with ocarina_drivers_ip_asn1;
with ocarina_drivers_ip_pohic;
with ocarina_drivers_exarm_ni_6071e_analog;
with ocarina_drivers_exarm_ni_6071e_digital;
with ocarina_drivers_generic_keyboard;
with GRUART;
with GRSPW;
with TCP_IP_Protocol;
--------------
-- Keyboard --
--------------
device generic_keyboard
features
key_pressed : out data port Base_Types::Character;
properties
Deployment::Driver_Name => "generic_keyboard";
Device_Driver => classifier (ocarina_drivers_generic_keyboard::generic_keyboard_driver.i);
Initialize_Entrypoint => classifier (ocarina_drivers_generic_keyboard::spg_generic_keyboard_init);
end generic_keyboard;
device implementation generic_keyboard.linux
end generic_keyboard.linux;
----------------
-- RASTA 1553 --
----------------
device rasta_1553
end rasta_1553;
device implementation rasta_1553.terminal
properties
Deployment::Driver_Name => "1553_rasta";
Device_Driver => classifier (ocarina_drivers_rasta_1553::if1553_driver.rasta_terminal);
Initialize_Entrypoint => classifier (ocarina_drivers_rasta_1553::spg_1553_init_rasta_terminal);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c));
end rasta_1553.terminal;
device implementation rasta_1553.controller_sender_only
properties
Deployment::Driver_Name => "1553_rasta";
Device_Driver => classifier (ocarina_drivers_rasta_1553::if1553_driver.rasta_controller_sender_only);
Initialize_Entrypoint => classifier (ocarina_drivers_rasta_1553::spg_1553_init_rasta_controller);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c));
end rasta_1553.controller_sender_only;
------------------
-- RASTA SERIAL --
------------------
device rasta_serial
features
serialaccess : requires bus access ocarina_buses::serial.generic;
end rasta_serial;
device implementation rasta_serial.raw
properties
Deployment::Driver_Name => "serial_rasta";
Device_Driver => classifier (ocarina_drivers_rasta_serial::serial_driver.rasta);
Initialize_Entrypoint => classifier (ocarina_drivers_rasta_serial::spg_serial_init_rasta);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::raw.i));
end rasta_serial.raw;
device implementation rasta_serial.pohiada
properties
Deployment::Driver_Name => "serial_rasta";
Implemented_As => classifier (GRUART::Driver_GRUART_Protocol.impl);
Initialize_Entrypoint => classifier (GRUART::Initialize);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::raw.i));
end rasta_serial.pohiada;
---------------------
-- RASTA SPACEWIRE --
---------------------
device rasta_spacewire
features
spwaccess : requires bus access ocarina_buses::spacewire.generic;
end rasta_spacewire;
device implementation rasta_spacewire.pohic
properties
Deployment::Driver_Name => "spacewire_rasta";
Device_Driver => classifier (ocarina_drivers_rasta_spacewire::spacewire_driver.rasta);
Initialize_Entrypoint => classifier (ocarina_drivers_rasta_spacewire::spg_spacewire_init_rasta);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c));
end rasta_spacewire.pohic;
device implementation rasta_spacewire.pohiada
properties
Deployment::Driver_Name => "spacewire_rasta";
Implemented_As => classifier (GRSPW::Driver_GRSPW_Protocol.impl);
Initialize_Entrypoint => classifier (GRSPW::Initialize);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c));
end rasta_spacewire.pohiada;
---------------------------
-- Generic serial driver --
---------------------------
device generic_serial
features
serialaccess : requires bus access ocarina_buses::serial.generic;
end generic_serial;
device implementation generic_serial.raw
properties
Deployment::Driver_Name => "serial_linux";
Device_Driver => classifier (ocarina_drivers_serial::serial_driver.linux);
Initialize_Entrypoint => classifier (ocarina_drivers_serial::spg_serial_init_linux);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::raw.i));
end generic_serial.raw;
device implementation generic_serial.raw_sender
properties
Deployment::Driver_Name => "serial_linux_sender";
Device_Driver => classifier (ocarina_drivers_serial::serial_driver.linux_sender);
Initialize_Entrypoint => classifier (ocarina_drivers_serial::spg_serial_init_linux_sender);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::raw.i));
end generic_serial.raw_sender;
device implementation generic_serial.raw_receiver
properties
Deployment::Driver_Name => "serial_linux_receiver";
Device_Driver => classifier (ocarina_drivers_serial::serial_driver.linux_receiver);
Initialize_Entrypoint => classifier (ocarina_drivers_serial::spg_serial_init_linux_receiver);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::raw.i));
end generic_serial.raw_receiver;
-------------------------------
-- Generic sockets/ip driver --
-------------------------------
device generic_sockets_ip
features
thebus : requires bus access ocarina_buses::ip.i;
end generic_sockets_ip;
device implementation generic_sockets_ip.pohic_old
properties
Deployment::Driver_Name => "sockets";
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));
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;
device implementation generic_sockets_ip.pohiada
properties
Deployment::Driver_Name => "socketsnew";
Implemented_As => 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));
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);