Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Ocarina
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
TASTE
Ocarina
Commits
fd58117c
Commit
fd58117c
authored
Sep 08, 2017
by
Maxime Perrotin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into upython
parents
f1616a7a
03460d9d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
13 deletions
+11
-13
resources/AADLv2/components/processors/leon.aadl
resources/AADLv2/components/processors/leon.aadl
+4
-6
resources/ocarina_config.aadl
resources/ocarina_config.aadl
+1
-1
tests/real-annexes-parsing/test_real_parse_01.aadl.out
tests/real-annexes-parsing/test_real_parse_01.aadl.out
+1
-1
tests/real-annexes-parsing/test_real_parse_02.aadl.out
tests/real-annexes-parsing/test_real_parse_02.aadl.out
+1
-1
tests/real-annexes-parsing/test_real_parse_03.aadl.out
tests/real-annexes-parsing/test_real_parse_03.aadl.out
+1
-1
tests/real-annexes-parsing/test_real_parse_04.aadl.out
tests/real-annexes-parsing/test_real_parse_04.aadl.out
+1
-1
tests/real-annexes-parsing/test_real_parse_05.aadl.out
tests/real-annexes-parsing/test_real_parse_05.aadl.out
+1
-1
tests/test042/test.aadl.out
tests/test042/test.aadl.out
+1
-1
No files found.
resources/AADLv2/components/processors/leon.aadl
View file @
fd58117c
package
ocarina_processors_leon
public
with
Deployment
;
with
Cheddar_Properties
;
processor
leon
end
leon
;
...
...
@@ -12,8 +10,8 @@ processor implementation leon.rtems
properties
Scheduling_Protocol
=>
(
Posix_1003_Highest_Priority_First_Protocol
);
Priority_Range
=>
0
..
255
;
Cheddar_Properties
::
Scheduler_Quantum
=>
0
Ms
;
Cheddar_Properties
::
Preemptive_Scheduler
=>
true
;
Scheduler_Quantum
=>
0
Ms
;
Preemptive_Scheduler
=>
true
;
Deployment
::
Execution_Platform
=>
LEON_RTEMS
;
end
leon
.
rtems
;
...
...
@@ -21,8 +19,8 @@ processor implementation leon.rtems_posix
properties
Scheduling_Protocol
=>
(
Posix_1003_Highest_Priority_First_Protocol
);
Priority_Range
=>
0
..
255
;
Cheddar_Properties
::
Scheduler_Quantum
=>
0
Ms
;
Cheddar_Properties
::
Preemptive_Scheduler
=>
true
;
Scheduler_Quantum
=>
0
Ms
;
Preemptive_Scheduler
=>
true
;
Deployment
::
Execution_Platform
=>
LEON_RTEMS_POSIX
;
end
leon
.
rtems_posix
;
...
...
resources/ocarina_config.aadl
View file @
fd58117c
...
...
@@ -26,9 +26,9 @@ property set Ocarina_Config is
AADL_Files : list of aadlstring applies to (system);
-- List of the AADL source files used by the current application
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
Data_Model : constant aadlstring => "Data_Model";
Deployment : constant aadlstring => "Deployment";
Cheddar_Properties : constant aadlstring => "Cheddar_Properties";
POK_Properties : constant aadlstring => "pok_properties";
ARINC653_Properties : constant aadlstring => "arinc653";
ASSERT_Properties : constant aadlstring => "ASSERT_Properties";
...
...
tests/real-annexes-parsing/test_real_parse_01.aadl.out
View file @
fd58117c
...
...
@@ -245,9 +245,9 @@ property set Ocarina_Config is
AADL_Files
:
list
of
aadlstring
applies
to
(
system
);
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
Data_Model
:
constant
aadlstring
=>
"Data_Model"
;
Deployment
:
constant
aadlstring
=>
"Deployment"
;
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
POK_Properties
:
constant
aadlstring
=>
"pok_properties"
;
ARINC653_Properties
:
constant
aadlstring
=>
"arinc653"
;
ASSERT_Properties
:
constant
aadlstring
=>
"ASSERT_Properties"
;
...
...
tests/real-annexes-parsing/test_real_parse_02.aadl.out
View file @
fd58117c
...
...
@@ -245,9 +245,9 @@ property set Ocarina_Config is
AADL_Files
:
list
of
aadlstring
applies
to
(
system
);
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
Data_Model
:
constant
aadlstring
=>
"Data_Model"
;
Deployment
:
constant
aadlstring
=>
"Deployment"
;
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
POK_Properties
:
constant
aadlstring
=>
"pok_properties"
;
ARINC653_Properties
:
constant
aadlstring
=>
"arinc653"
;
ASSERT_Properties
:
constant
aadlstring
=>
"ASSERT_Properties"
;
...
...
tests/real-annexes-parsing/test_real_parse_03.aadl.out
View file @
fd58117c
...
...
@@ -245,9 +245,9 @@ property set Ocarina_Config is
AADL_Files
:
list
of
aadlstring
applies
to
(
system
);
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
Data_Model
:
constant
aadlstring
=>
"Data_Model"
;
Deployment
:
constant
aadlstring
=>
"Deployment"
;
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
POK_Properties
:
constant
aadlstring
=>
"pok_properties"
;
ARINC653_Properties
:
constant
aadlstring
=>
"arinc653"
;
ASSERT_Properties
:
constant
aadlstring
=>
"ASSERT_Properties"
;
...
...
tests/real-annexes-parsing/test_real_parse_04.aadl.out
View file @
fd58117c
...
...
@@ -245,9 +245,9 @@ property set Ocarina_Config is
AADL_Files
:
list
of
aadlstring
applies
to
(
system
);
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
Data_Model
:
constant
aadlstring
=>
"Data_Model"
;
Deployment
:
constant
aadlstring
=>
"Deployment"
;
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
POK_Properties
:
constant
aadlstring
=>
"pok_properties"
;
ARINC653_Properties
:
constant
aadlstring
=>
"arinc653"
;
ASSERT_Properties
:
constant
aadlstring
=>
"ASSERT_Properties"
;
...
...
tests/real-annexes-parsing/test_real_parse_05.aadl.out
View file @
fd58117c
...
...
@@ -245,9 +245,9 @@ property set Ocarina_Config is
AADL_Files
:
list
of
aadlstring
applies
to
(
system
);
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
Data_Model
:
constant
aadlstring
=>
"Data_Model"
;
Deployment
:
constant
aadlstring
=>
"Deployment"
;
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
POK_Properties
:
constant
aadlstring
=>
"pok_properties"
;
ARINC653_Properties
:
constant
aadlstring
=>
"arinc653"
;
ASSERT_Properties
:
constant
aadlstring
=>
"ASSERT_Properties"
;
...
...
tests/test042/test.aadl.out
View file @
fd58117c
...
...
@@ -241,9 +241,9 @@ property set Ocarina_Config is
AADL_Files
:
list
of
aadlstring
applies
to
(
system
);
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
Data_Model
:
constant
aadlstring
=>
"Data_Model"
;
Deployment
:
constant
aadlstring
=>
"Deployment"
;
Cheddar_Properties
:
constant
aadlstring
=>
"Cheddar_Properties"
;
POK_Properties
:
constant
aadlstring
=>
"pok_properties"
;
ARINC653_Properties
:
constant
aadlstring
=>
"arinc653"
;
ASSERT_Properties
:
constant
aadlstring
=>
"ASSERT_Properties"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment