| [pok-devel] [36] * Fix AADL models with new properties definition |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/pok-devel Archives
]
Revision: 36
Author: julien
Date: 2012-07-12 17:39:14 +0200 (Thu, 12 Jul 2012)
Log Message:
-----------
* Fix AADL models with new properties definition
Modified Paths:
--------------
trunk/examples/arinc653-errors/model.aadl
trunk/examples/arinc653-events/model.aadl
trunk/examples/arinc653-queueing/model.aadl
trunk/examples/arinc653-sampling/model.aadl
trunk/examples/arinc653-threads/model.aadl
trunk/examples/case-study-aerotech09/model.aadl
trunk/examples/case-study-ardupilot/execution-platform.aadl
trunk/examples/case-study-fcc/memories.aadl
trunk/examples/case-study-mils/memories.aadl
trunk/examples/case-study-osadl11/model-distributed.aadl
trunk/examples/case-study-osadl11/model.aadl
trunk/examples/case-study-sigada09/model.aadl
trunk/examples/network/memories.aadl
Modified: trunk/examples/arinc653-errors/model.aadl
===================================================================
--- trunk/examples/arinc653-errors/model.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/arinc653-errors/model.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -225,7 +225,7 @@
memory partitionmemory
properties
- Word_Count => 80000;
+ Byte_Count => 80000;
ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;
end partitionmemory;
Modified: trunk/examples/arinc653-events/model.aadl
===================================================================
--- trunk/examples/arinc653-events/model.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/arinc653-events/model.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -97,7 +97,7 @@
memory partitionmemory
properties
- Word_Count => 80000;
+ Byte_Count => 80000;
ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;
end partitionmemory;
Modified: trunk/examples/arinc653-queueing/model.aadl
===================================================================
--- trunk/examples/arinc653-queueing/model.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/arinc653-queueing/model.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -184,7 +184,7 @@
memory partitionmemory
properties
- Word_Count => 80000;
+ Byte_Count => 80000;
ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;
end partitionmemory;
Modified: trunk/examples/arinc653-sampling/model.aadl
===================================================================
--- trunk/examples/arinc653-sampling/model.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/arinc653-sampling/model.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -178,7 +178,7 @@
memory partitionmemory
properties
- Word_Count => 80000;
+ Byte_Count => 80000;
ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;
end partitionmemory;
Modified: trunk/examples/arinc653-threads/model.aadl
===================================================================
--- trunk/examples/arinc653-threads/model.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/arinc653-threads/model.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -148,7 +148,7 @@
memory partitionmemory
properties
- Word_Count => 80000;
+ Byte_Count => 80000;
ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;
end partitionmemory;
Modified: trunk/examples/case-study-aerotech09/model.aadl
===================================================================
--- trunk/examples/case-study-aerotech09/model.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/case-study-aerotech09/model.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -189,7 +189,7 @@
memory partition_memory
properties
- Word_Count => 140000;
+ Byte_Count => 140000;
end partition_memory;
memory implementation partition_memory.i
Modified: trunk/examples/case-study-ardupilot/execution-platform.aadl
===================================================================
--- trunk/examples/case-study-ardupilot/execution-platform.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/case-study-ardupilot/execution-platform.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -25,10 +25,10 @@
memory implementation mem.i extends poklib::pok_memory.x86_main
subcomponents
- segment1 : memory poklib::pok_memory.x86_segment {Word_Count => 100000;};
- segment2 : memory poklib::pok_memory.x86_segment {Word_Count => 100000;};
- segment3 : memory poklib::pok_memory.x86_segment {Word_Count => 100000;};
- segment4 : memory poklib::pok_memory.x86_segment {Word_Count => 100000;};
+ segment1 : memory poklib::pok_memory.x86_segment {Byte_Count => 100000;};
+ segment2 : memory poklib::pok_memory.x86_segment {Byte_Count => 100000;};
+ segment3 : memory poklib::pok_memory.x86_segment {Byte_Count => 100000;};
+ segment4 : memory poklib::pok_memory.x86_segment {Byte_Count => 100000;};
end mem.i;
end ardupilot_platform;
Modified: trunk/examples/case-study-fcc/memories.aadl
===================================================================
--- trunk/examples/case-study-fcc/memories.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/case-study-fcc/memories.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -22,7 +22,7 @@
memory implementation memory_segment.i
properties
- Word_Count => 80000;
+ Byte_Count => 80000;
end memory_segment.i;
memory ram
@@ -32,7 +32,7 @@
subcomponents
calculator : memory memory_segment.i;
negociation : memory memory_segment.i;
- netif : memory memory_segment.i {Word_Count => 95000;};
+ netif : memory memory_segment.i {Byte_Count => 95000;};
end ram.position;
memory implementation ram.pilot
@@ -43,6 +43,6 @@
reu : memory memory_segment.i;
errordisplay : memory memory_segment.i;
inceptor : memory memory_segment.i;
- netif : memory memory_segment.i {Word_Count => 95000;};
+ netif : memory memory_segment.i {Byte_Count => 95000;};
end ram.pilot;
end memories;
Modified: trunk/examples/case-study-mils/memories.aadl
===================================================================
--- trunk/examples/case-study-mils/memories.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/case-study-mils/memories.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -22,7 +22,7 @@
memory implementation memory_segment.i
properties
- Word_Count => 1100000;
+ Byte_Count => 1100000;
end memory_segment.i;
memory ram
@@ -33,14 +33,14 @@
topsecret : memory memory_segment.i;
secret : memory memory_segment.i;
unclassified : memory memory_segment.i;
- driver : memory memory_segment.i {Word_Count => 124000;};
+ driver : memory memory_segment.i {Byte_Count => 124000;};
end ram.sender;
memory implementation ram.receiver
subcomponents
topsecretandsecret : memory memory_segment.i;
unclassified : memory memory_segment.i;
- driver : memory memory_segment.i {Word_Count => 120000;};
+ driver : memory memory_segment.i {Byte_Count => 120000;};
end ram.receiver;
end memories;
Modified: trunk/examples/case-study-osadl11/model-distributed.aadl
===================================================================
--- trunk/examples/case-study-osadl11/model-distributed.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/case-study-osadl11/model-distributed.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -71,7 +71,7 @@
memory segment
properties
- Word_Count => 80000;
+ Byte_Count => 80000;
end segment;
memory implementation segment.i
Modified: trunk/examples/case-study-osadl11/model.aadl
===================================================================
--- trunk/examples/case-study-osadl11/model.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/case-study-osadl11/model.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -25,7 +25,7 @@
memory segment
properties
- Word_Count => 80000;
+ Byte_Count => 80000;
end segment;
memory implementation segment.i
Modified: trunk/examples/case-study-sigada09/model.aadl
===================================================================
--- trunk/examples/case-study-sigada09/model.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/case-study-sigada09/model.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -92,7 +92,7 @@
memory implementation segment.i
properties
- Word_Count => 80000;
+ Byte_Count => 80000;
ARINC653::Memory_Type => (code_memory);
ARINC653::Access_Type => read;
end segment.i;
Modified: trunk/examples/network/memories.aadl
===================================================================
--- trunk/examples/network/memories.aadl 2012-06-01 17:31:37 UTC (rev 35)
+++ trunk/examples/network/memories.aadl 2012-07-12 15:39:14 UTC (rev 36)
@@ -21,7 +21,7 @@
memory implementation memory_segment.i
properties
- Word_Count => 80000;
+ Byte_Count => 80000;
end memory_segment.i;
memory main_memory
@@ -32,7 +32,7 @@
topsecret : memory memory_segment.i;
secret : memory memory_segment.i;
unclassified : memory memory_segment.i;
- driver : memory memory_segment.i {Word_Count => 95000;};
+ driver : memory memory_segment.i {Byte_Count => 95000;};
end main_memory.i;
end memories;