Commit 6049283f authored by Maxime Perrotin's avatar Maxime Perrotin

Fix mismatch between IV and DV versions

parent c276c23d
......@@ -69,6 +69,6 @@ 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");
Taste::HWLibraries => ("/home/taste/tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
END deploymentview::DV;
---------------------------------------------------
-- AADL2.0
-- TASTE
--
-- AADL2.1
-- TASTE type interfaceview
--
-- generated code: do not edit
---------------------------------------------------
PACKAGE interfaceview::FV::Function1
PACKAGE interfaceview::IV::Function1
PUBLIC
WITH interfaceview::IV::Function2;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
......@@ -17,6 +18,8 @@ PROPERTIES
END PI_pulse;
SUBPROGRAM IMPLEMENTATION PI_pulse.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_pulse.others;
SUBPROGRAM RI_Blink
......@@ -29,68 +32,54 @@ END RI_Blink;
SUBPROGRAM IMPLEMENTATION RI_Blink.others
END RI_Blink.others;
END interfaceview::FV::Function1;
PACKAGE interfaceview::FV::Function2
PUBLIC
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_Blink
FEATURES
EnableDisable : IN PARAMETER DataView::MyBool {
Taste::encoding => NATIVE;
};
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_Blink;
SUBPROGRAM IMPLEMENTATION PI_Blink.others
END PI_Blink.others;
END interfaceview::FV::Function2;
PACKAGE interfaceview::IV
PUBLIC
WITH interfaceview::FV::Function1;
WITH interfaceview::FV::Function2;
WITH interfaceview::FV;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SYSTEM Function1
FEATURES
PI_pulse : PROVIDES SUBPROGRAM ACCESS interfaceview::FV::Function1::PI_pulse.others {
Taste::coordinates => "308 559";
PI_pulse : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Function1::PI_pulse.others {
Taste::coordinates => "314 577";
Taste::RCMoperationKind => cyclic;
Taste::RCMperiod => 1000 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "pulse";
};
RI_Blink : REQUIRES SUBPROGRAM ACCESS interfaceview::FV::Function2::PI_Blink.others {
Taste::coordinates => "1165 595";
RI_Blink : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::Function2::PI_Blink.others {
Taste::coordinates => "1171 613";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "Blink";
Taste::labelInheritance => "true";
};
PROPERTIES
Source_Language => (SDL);
Taste::Active_Interfaces => enabled;
END Function1;
SYSTEM IMPLEMENTATION Function1.others
SUBCOMPONENTS
pulse_impl : SUBPROGRAM interfaceview::FV::Function1::PI_pulse.others {
Compute_Execution_Time => 0 ms .. 0 ms;
};
CONNECTIONS
OpToPICnx_pulse_impl : SUBPROGRAM ACCESS pulse_impl -> PI_pulse;
END Function1.others;
END interfaceview::IV::Function1;
PACKAGE interfaceview::IV::Function2
PUBLIC
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_Blink
FEATURES
EnableDisable : IN PARAMETER DataView::MyBool {
Taste::encoding => NATIVE;
};
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_Blink;
SUBPROGRAM IMPLEMENTATION PI_Blink.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_Blink.others;
SYSTEM Function2
FEATURES
PI_Blink : PROVIDES SUBPROGRAM ACCESS interfaceview::FV::Function2::PI_Blink.others {
PI_Blink : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Function2::PI_Blink.others {
Taste::coordinates => "1534 616";
Taste::RCMoperationKind => unprotected;
Taste::RCMperiod => 0 ms;
......@@ -99,31 +88,39 @@ FEATURES
};
PROPERTIES
Source_Language => (Ada);
Taste::Active_Interfaces => enabled;
END Function2;
SYSTEM IMPLEMENTATION Function2.others
SUBCOMPONENTS
Blink_impl : SUBPROGRAM interfaceview::FV::Function2::PI_Blink.others {
Compute_Execution_Time => 0 ms .. 0 ms;
};
CONNECTIONS
OpToPICnx_Blink_impl : SUBPROGRAM ACCESS Blink_impl -> PI_Blink;
END Function2.others;
END interfaceview::IV::Function2;
PACKAGE interfaceview::IV
PUBLIC
WITH interfaceview::IV::Function1;
WITH interfaceview::IV::Function2;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SYSTEM interfaceview
PROPERTIES
Taste::dataView => ("DataView");
Taste::dataViewPath => ("DataView.aadl");
END interfaceview;
SYSTEM IMPLEMENTATION interfaceview.others
SUBCOMPONENTS
Function1 : SYSTEM interfaceview::IV::Function1.others {
Taste::coordinates => "308 421 1165 1247";
Function1 : SYSTEM interfaceview::IV::Function1::Function1.others {
Taste::coordinates => "314 439 1171 1265";
};
Function2 : SYSTEM interfaceview::IV::Function2.others {
Function2 : SYSTEM interfaceview::IV::Function2::Function2.others {
Taste::coordinates => "1534 415 2334 1205";
};
CONNECTIONS
Function2_Blink_Function1_Blink : SUBPROGRAM ACCESS Function2.PI_Blink -> Function1.RI_Blink {
Taste::coordinates => "1165 595 1347 595 1347 616 1534 616";
Function2_PI_Blink_Function1_RI_Blink : SUBPROGRAM ACCESS Function2.PI_Blink -> Function1.RI_Blink {
Taste::coordinates => "1171 613 1347 613 1347 616 1534 616";
};
END interfaceview.others;
......@@ -131,14 +128,6 @@ PROPERTIES
Taste::dataView => ("DataView");
Taste::dataViewPath => ("DataView.aadl");
Taste::coordinates => "0 0 2970 2100";
Taste::version => "1.3.19";
Taste::version => "2.0";
END interfaceview::IV;
PACKAGE interfaceview::FV
PUBLIC
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
END interfaceview::FV;
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