Skip to content

GitLab

Commit 1f107d02 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files

Merge remote-tracking branch 'ocarina-ESA/master'

parents 2c2360ee 534729d6
Hide whitespace changes
Inline Side-by-side
resources/AADLv2/components/processors/arm.aadl
View file @ 1f107d02
package ocarina_processors_arm package ocarina_processors_arm
public public
with Deployment; with Deployment;
with Cheddar_Properties;
processor arm processor arm
end arm; end arm;
...@@ -17,8 +15,8 @@ processor implementation cortex_m.i ...@@ -17,8 +15,8 @@ processor implementation cortex_m.i
properties properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol); Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Priority_Range => 0 .. 255; Priority_Range => 0 .. 255;
Cheddar_Properties::Scheduler_Quantum => 0 Ms; Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true; Preemptive_Scheduler => true;
end cortex_m.i; end cortex_m.i;
processor nds extends arm processor nds extends arm
...@@ -28,8 +26,8 @@ processor implementation nds.rtems ...@@ -28,8 +26,8 @@ processor implementation nds.rtems
properties properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol); Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Priority_Range => 0 .. 255; Priority_Range => 0 .. 255;
Cheddar_Properties::Scheduler_Quantum => 0 Ms; Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true; Preemptive_Scheduler => true;
Deployment::Execution_Platform => NDS_RTEMS; Deployment::Execution_Platform => NDS_RTEMS;
end nds.rtems; end nds.rtems;
...@@ -41,8 +39,8 @@ processor implementation gumstix.rtems ...@@ -41,8 +39,8 @@ processor implementation gumstix.rtems
properties properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol); Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Priority_Range => 0 .. 255; Priority_Range => 0 .. 255;
Cheddar_Properties::Scheduler_Quantum => 0 Ms; Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true; Preemptive_Scheduler => true;
Deployment::Execution_Platform => GUMSTIX_RTEMS; Deployment::Execution_Platform => GUMSTIX_RTEMS;
end gumstix.rtems; end gumstix.rtems;
......
resources/AADLv2/components/processors/leon.aadl
View file @ 1f107d02
package ocarina_processors_leon package ocarina_processors_leon
public public
with Deployment; with Deployment;
with Cheddar_Properties;
processor leon processor leon
end leon; end leon;
...@@ -12,8 +10,8 @@ processor implementation leon.rtems ...@@ -12,8 +10,8 @@ processor implementation leon.rtems
properties properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol); Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Priority_Range => 0 .. 255; Priority_Range => 0 .. 255;
Cheddar_Properties::Scheduler_Quantum => 0 Ms; Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true; Preemptive_Scheduler => true;
Deployment::Execution_Platform => LEON_RTEMS; Deployment::Execution_Platform => LEON_RTEMS;
end leon.rtems; end leon.rtems;
...@@ -21,8 +19,8 @@ processor implementation leon.rtems_posix ...@@ -21,8 +19,8 @@ processor implementation leon.rtems_posix
properties properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol); Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Priority_Range => 0 .. 255; Priority_Range => 0 .. 255;
Cheddar_Properties::Scheduler_Quantum => 0 Ms; Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true; Preemptive_Scheduler => true;
Deployment::Execution_Platform => LEON_RTEMS_POSIX; Deployment::Execution_Platform => LEON_RTEMS_POSIX;
end leon.rtems_posix; end leon.rtems_posix;
......
resources/ocarina_config.aadl
View file @ 1f107d02
...@@ -26,9 +26,9 @@ property set Ocarina_Config is ...@@ -26,9 +26,9 @@ property set Ocarina_Config is
AADL_Files : list of aadlstring applies to (system); AADL_Files : list of aadlstring applies to (system);
-- List of the AADL source files used by the current application -- List of the AADL source files used by the current application
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
Data_Model : constant aadlstring => "Data_Model"; Data_Model : constant aadlstring => "Data_Model";
Deployment : constant aadlstring => "Deployment"; Deployment : constant aadlstring => "Deployment";
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
POK_Properties : constant aadlstring => "pok_properties"; POK_Properties : constant aadlstring => "pok_properties";
ARINC653_Properties : constant aadlstring => "arinc653"; ARINC653_Properties : constant aadlstring => "arinc653";
ASSERT_Properties : constant aadlstring => "ASSERT_Properties"; ASSERT_Properties : constant aadlstring => "ASSERT_Properties";
......
tests/real-annexes-parsing/test_real_parse_01.aadl.out
View file @ 1f107d02
...@@ -245,9 +245,9 @@ property set Ocarina_Config is ...@@ -245,9 +245,9 @@ property set Ocarina_Config is
AADL_Files : list of aadlstring AADL_Files : list of aadlstring
applies to (system); applies to (system);
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
Data_Model : constant aadlstring => "Data_Model"; Data_Model : constant aadlstring => "Data_Model";
Deployment : constant aadlstring => "Deployment"; Deployment : constant aadlstring => "Deployment";
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
POK_Properties : constant aadlstring => "pok_properties"; POK_Properties : constant aadlstring => "pok_properties";
ARINC653_Properties : constant aadlstring => "arinc653"; ARINC653_Properties : constant aadlstring => "arinc653";
ASSERT_Properties : constant aadlstring => "ASSERT_Properties"; ASSERT_Properties : constant aadlstring => "ASSERT_Properties";
......
tests/real-annexes-parsing/test_real_parse_02.aadl.out
View file @ 1f107d02
...@@ -245,9 +245,9 @@ property set Ocarina_Config is ...@@ -245,9 +245,9 @@ property set Ocarina_Config is
AADL_Files : list of aadlstring AADL_Files : list of aadlstring
applies to (system); applies to (system);
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
Data_Model : constant aadlstring => "Data_Model"; Data_Model : constant aadlstring => "Data_Model";
Deployment : constant aadlstring => "Deployment"; Deployment : constant aadlstring => "Deployment";
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
POK_Properties : constant aadlstring => "pok_properties"; POK_Properties : constant aadlstring => "pok_properties";
ARINC653_Properties : constant aadlstring => "arinc653"; ARINC653_Properties : constant aadlstring => "arinc653";
ASSERT_Properties : constant aadlstring => "ASSERT_Properties"; ASSERT_Properties : constant aadlstring => "ASSERT_Properties";
......
tests/real-annexes-parsing/test_real_parse_03.aadl.out
View file @ 1f107d02
...@@ -245,9 +245,9 @@ property set Ocarina_Config is ...@@ -245,9 +245,9 @@ property set Ocarina_Config is
AADL_Files : list of aadlstring AADL_Files : list of aadlstring
applies to (system); applies to (system);
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
Data_Model : constant aadlstring => "Data_Model"; Data_Model : constant aadlstring => "Data_Model";
Deployment : constant aadlstring => "Deployment"; Deployment : constant aadlstring => "Deployment";
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
POK_Properties : constant aadlstring => "pok_properties"; POK_Properties : constant aadlstring => "pok_properties";
ARINC653_Properties : constant aadlstring => "arinc653"; ARINC653_Properties : constant aadlstring => "arinc653";
ASSERT_Properties : constant aadlstring => "ASSERT_Properties"; ASSERT_Properties : constant aadlstring => "ASSERT_Properties";
......
tests/real-annexes-parsing/test_real_parse_04.aadl.out
View file @ 1f107d02
...@@ -245,9 +245,9 @@ property set Ocarina_Config is ...@@ -245,9 +245,9 @@ property set Ocarina_Config is
AADL_Files : list of aadlstring AADL_Files : list of aadlstring
applies to (system); applies to (system);
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
Data_Model : constant aadlstring => "Data_Model"; Data_Model : constant aadlstring => "Data_Model";
Deployment : constant aadlstring => "Deployment"; Deployment : constant aadlstring => "Deployment";
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
POK_Properties : constant aadlstring => "pok_properties"; POK_Properties : constant aadlstring => "pok_properties";
ARINC653_Properties : constant aadlstring => "arinc653"; ARINC653_Properties : constant aadlstring => "arinc653";
ASSERT_Properties : constant aadlstring => "ASSERT_Properties"; ASSERT_Properties : constant aadlstring => "ASSERT_Properties";
......
tests/real-annexes-parsing/test_real_parse_05.aadl.out
View file @ 1f107d02
...@@ -245,9 +245,9 @@ property set Ocarina_Config is ...@@ -245,9 +245,9 @@ property set Ocarina_Config is
AADL_Files : list of aadlstring AADL_Files : list of aadlstring
applies to (system); applies to (system);
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
Data_Model : constant aadlstring => "Data_Model"; Data_Model : constant aadlstring => "Data_Model";
Deployment : constant aadlstring => "Deployment"; Deployment : constant aadlstring => "Deployment";
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
POK_Properties : constant aadlstring => "pok_properties"; POK_Properties : constant aadlstring => "pok_properties";
ARINC653_Properties : constant aadlstring => "arinc653"; ARINC653_Properties : constant aadlstring => "arinc653";
ASSERT_Properties : constant aadlstring => "ASSERT_Properties"; ASSERT_Properties : constant aadlstring => "ASSERT_Properties";
......
tests/test042/test.aadl.out
View file @ 1f107d02
...@@ -241,9 +241,9 @@ property set Ocarina_Config is ...@@ -241,9 +241,9 @@ property set Ocarina_Config is
AADL_Files : list of aadlstring AADL_Files : list of aadlstring
applies to (system); applies to (system);
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
Data_Model : constant aadlstring => "Data_Model"; Data_Model : constant aadlstring => "Data_Model";
Deployment : constant aadlstring => "Deployment"; Deployment : constant aadlstring => "Deployment";
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
POK_Properties : constant aadlstring => "pok_properties"; POK_Properties : constant aadlstring => "pok_properties";
ARINC653_Properties : constant aadlstring => "arinc653"; ARINC653_Properties : constant aadlstring => "arinc653";
ASSERT_Properties : constant aadlstring => "ASSERT_Properties"; ASSERT_Properties : constant aadlstring => "ASSERT_Properties";
......
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