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
31b27603
Commit
31b27603
authored
Sep 01, 2013
by
yoogx
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'git-svn'
parents
12060543
4b9d38d6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
8 deletions
+13
-8
resources/AADLv2/components/devices.aadl
resources/AADLv2/components/devices.aadl
+3
-4
resources/AADLv2/components/devices/grspw.aadl
resources/AADLv2/components/devices/grspw.aadl
+1
-1
resources/AADLv2/components/devices/gruart.aadl
resources/AADLv2/components/devices/gruart.aadl
+1
-1
resources/AADLv2/components/devices/native_uart.aadl
resources/AADLv2/components/devices/native_uart.aadl
+1
-1
resources/AADLv2/components/devices/tcp_protocol.aadl
resources/AADLv2/components/devices/tcp_protocol.aadl
+1
-1
resources/AADLv2/taste_properties.aadl
resources/AADLv2/taste_properties.aadl
+6
-0
No files found.
resources/AADLv2/components/devices.aadl
View file @
31b27603
...
...
@@ -163,7 +163,7 @@ public
device
implementation
rasta_serial
.
pohiada
properties
Deployment
::
Driver_Name
=>
"serial_rasta"
;
Implemented_As
=>
classifier
(
GRUART
::
Driver_GRUART_Protocol
.
impl
);
Device_Driver
=>
classifier
(
GRUART
::
Driver_GRUART_Protocol
.
impl
);
Initialize_Entrypoint
=>
classifier
(
GRUART
::
Initialize
);
Provided_Virtual_Bus_Class
=>
(
classifier
(
ocarina_buses
::
raw
.
i
));
end
rasta_serial
.
pohiada
;
...
...
@@ -205,7 +205,7 @@ public
device
implementation
rasta_spacewire
.
pohiada
properties
Deployment
::
Driver_Name
=>
"spacewire_rasta"
;
Implemented_As
=>
classifier
(
GRSPW
::
Driver_GRSPW_Protocol
.
impl
);
Device_Driver
=>
classifier
(
GRSPW
::
Driver_GRSPW_Protocol
.
impl
);
Initialize_Entrypoint
=>
classifier
(
GRSPW
::
Initialize
);
Provided_Virtual_Bus_Class
=>
(
classifier
(
ocarina_buses
::
pohi
.
c
));
end
rasta_spacewire
.
pohiada
;
...
...
@@ -248,7 +248,7 @@ public
device
implementation
generic_serial
.
pohiada
properties
Deployment
::
Driver_Name
=>
"serial_linux"
;
Implemented_As
=>
Device_Driver
=>
classifier
(
Native_UART
::
Driver_Native_UART_Protocol
.
impl
);
Initialize_Entrypoint
=>
classifier
(
Native_UART
::
Initialize
);
Provided_Virtual_Bus_Class
=>
(
classifier
(
ocarina_buses
::
raw
.
i
));
...
...
@@ -290,7 +290,6 @@ public
device
implementation
generic_sockets_ip
.
pohiada
properties
Deployment
::
Driver_Name
=>
"socketsnew"
;
Implemented_As
=>
classifier
(
TCP_IP_Protocol
::
Driver_TCP_IP_Protocol
.
impl
);
Device_Driver
=>
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
));
...
...
resources/AADLv2/components/devices/grspw.aadl
View file @
31b27603
...
...
@@ -38,7 +38,7 @@ public
device
implementation
GRSPW_Device
.
impl
properties
Implemented_As
=>
Device_Driver
=>
classifier
(
GRSPW
::
Driver_GRSPW_Protocol
.
impl
);
Initialize_Entrypoint
=>
classifier
(
GRSPW
::
Initialize
);
end
GRSPW_Device
.
impl
;
...
...
resources/AADLv2/components/devices/gruart.aadl
View file @
31b27603
...
...
@@ -38,7 +38,7 @@ public
device
implementation
GRUART_Device
.
impl
properties
Implemented_As
=>
Device_Driver
=>
classifier
(
GRUART
::
Driver_GRUART_Protocol
.
impl
);
Initialize_Entrypoint
=>
classifier
(
GRUART
::
Initialize
);
end
GRUART_Device
.
impl
;
...
...
resources/AADLv2/components/devices/native_uart.aadl
View file @
31b27603
...
...
@@ -36,7 +36,7 @@ public
device
implementation
Native_UART_Device
.
impl
properties
Implemented_As
=>
Device_Driver
=>
classifier
(
Native_UART
::
Driver_Native_UART_Protocol
.
impl
);
Initialize_Entrypoint
=>
classifier
(
Native_UART
::
Initialize
);
end
Native_UART_Device
.
impl
;
...
...
resources/AADLv2/components/devices/tcp_protocol.aadl
View file @
31b27603
...
...
@@ -35,7 +35,7 @@ public
device
implementation
TCP_IP_Device
.
impl
properties
Implemented_As
=>
Device_Driver
=>
classifier
(
TCP_IP_Protocol
::
Driver_TCP_IP_Protocol
.
impl
);
Initialize_Entrypoint
=>
classifier
(
TCP_IP_Protocol
::
Initialize
);
end
TCP_IP_Device
.
impl
;
...
...
resources/AADLv2/taste_properties.aadl
View file @
31b27603
...
...
@@ -218,6 +218,10 @@ dataview : list of aadlstring applies to (package);
dataviewpath : list of aadlstring applies to (package);
version: aadlstring applies to (package);
interfacename: aadlstring applies to (subprogram access);
Encoding_type : type enumeration (native, uper, acn);
Encoding : Taste::Encoding_type applies to (parameter);
...
...
@@ -234,4 +238,6 @@ Associated_Queue_Size : aadlinteger applies to (subprogram);
EncodingDefinitionFile : classifier (data) applies to (data);
labelInheritance : aadlstring applies to (subprogram access);
end Taste;
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