Commit 490f7ddc authored by yoogx's avatar yoogx

* Remove obsolete and unused properties

parent dd857e4a
-- This AADL model is derived from the AADL model published in the
-- IST-ASSERT d3.3.1-3 deliverable.
-- IST-ASSERT d3.3.1-3 deliverable.
-- $Id: toy_example.aadl 6979 2009-09-01 13:47:17Z hugues $
......@@ -171,9 +171,7 @@ system implementation toy_example.leon
subcomponents
P1 : processor the_processor
{Deployment::Execution_Platform => LEON_ORK;};
GNC_TMTC_POS : process Toy_Example_Proc.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
GNC_TMTC_POS : process Toy_Example_Proc.Impl;
properties
Actual_Processor_Binding => reference P1 applies to GNC_TMTC_POS;
end toy_example.leon;
......@@ -182,9 +180,7 @@ system implementation toy_example.leon_gnat
subcomponents
P1 : processor the_processor
{Deployment::Execution_Platform => LEON_GNAT;};
GNC_TMTC_POS : process Toy_Example_Proc.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
GNC_TMTC_POS : process Toy_Example_Proc.Impl;
properties
Actual_Processor_Binding => reference P1 applies to GNC_TMTC_POS;
end toy_example.leon_gnat;
......
......@@ -15,7 +15,7 @@ properties
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
......@@ -45,9 +45,7 @@ end PING;
system implementation PING.LEON
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl;
properties
......
......@@ -45,20 +45,14 @@ end MPC;
system implementation MPC.LEON
subcomponents
SC_1 : process Sender_Process.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
SC_2 : process Receiver_Process.Impl
{Deployment::Channel_Address => 3;
Deployment::Process_Id => 1201;};
SC_3 : process Receiver_Process.Impl
{Deployment::Channel_Address => 4;
Deployment::Process_Id => 1204;};
SC_1 : process Sender_Process.Impl;
SC_2 : process Receiver_Process.Impl;
SC_3 : process Receiver_Process.Impl;
-- The CPUs
CPU_SC_1 : processor Complex_CPU.P4;
CPU_SC_2 : processor Simple_CPU.P4;
CPU_SC_1 : processor Complex_CPU.P4;
CPU_SC_2 : processor Simple_CPU.P4;
CPU_SC_3 : processor Simple_CPU.P4;
-- The SpaceWire buses
......
......@@ -49,9 +49,7 @@ end Multiple_Instances;
system implementation Multiple_Instances.LEON
subcomponents
Node_A : process Send_Receive.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process Send_Receive.Impl;
CPU : processor the_processor.Impl;
properties
......
......@@ -13,7 +13,7 @@ processor the_processor
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
......@@ -43,9 +43,7 @@ end PING;
system implementation PING.LEON
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl
{Deployment::Execution_Platform => LEON_ORK;};
......@@ -55,9 +53,7 @@ end PING.LEON;
system implementation PING.LEON_GNAT
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl
{Deployment::Execution_Platform => LEON_GNAT;};
......
......@@ -46,9 +46,7 @@ end Prime_Numbers;
system implementation Prime_Numbers.LEON
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl;
properties
......
......@@ -22,12 +22,8 @@ end C_Bus.Impl;
system implementation RAP.LEON
subcomponents
software : process Monolithic_RAP.LEON
{ARAO::Channel_Address => 2;
ARAO::Process_Id => 1200;};
hardware : process Hardware_Emulator.Impl
{ARAO::Channel_Address => 3;
ARAO::Process_Id => 1201;};
software : process Monolithic_RAP.LEON;
hardware : process Hardware_Emulator.Impl;
s_cpu : processor cpu.LEON;
h_cpu : processor cpu.LEON;
......
......@@ -6,7 +6,7 @@ features
properties
Deployment::Execution_Platform => LEON_ORK;
Cheddar_Properties::Preemptive_Scheduler => true;
Scheduling_Protocol =>
Scheduling_Protocol =>
POSIX_1003_HIGHEST_PRIORITY_FIRST_PROTOCOL;
end The_Processor;
......@@ -20,12 +20,8 @@ end Case_Study;
system implementation Case_Study.LEON
subcomponents
WoM : process Workload_Manager.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
InS : process Interrupt_Simulator.Impl
{Deployment::Channel_Address => 3;
Deployment::Process_Id => 1201;};
WoM : process Workload_Manager.Impl;
InS : process Interrupt_Simulator.Impl;
CPU_1 : processor The_Processor;
CPU_2 : processor The_Processor;
B : bus Ethernet_Bus;
......
......@@ -4,7 +4,7 @@ processor The_Processor
properties
Deployment::Execution_Platform => LEON_ORK;
Cheddar_Properties::Preemptive_Scheduler => true;
Scheduling_Protocol =>
Scheduling_Protocol =>
POSIX_1003_HIGHEST_PRIORITY_FIRST_PROTOCOL;
end The_Processor;
......@@ -13,9 +13,7 @@ end Case_Study;
system implementation Case_Study.LEON_Local
subcomponents
WoM : process Workload_Manager.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
WoM : process Workload_Manager.Impl;
CPU_1 : processor The_Processor;
properties
Actual_Processor_Binding => reference CPU_1 applies to WoM;
......
......@@ -15,27 +15,23 @@ end Sunseekercontrolsystem_Type;
system implementation Sunseekercontrolsystem_Type.LEON
subcomponents
Sunseeker : process sunseeker_local.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Sunseeker : process sunseeker_local.Impl;
Platform: processor LEON_Type
{Deployment::Execution_Platform => LEON_ORK;};
properties
Actual_Processor_Binding => reference Platform
Actual_Processor_Binding => reference Platform
applies to Sunseeker;
end Sunseekercontrolsystem_Type.LEON;
system implementation Sunseekercontrolsystem_Type.LEON_GNAT
subcomponents
Sunseeker : process sunseeker_local.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Sunseeker : process sunseeker_local.Impl;
Platform: processor LEON_Type
{Deployment::Execution_Platform => LEON_GNAT;};
properties
Actual_Processor_Binding => reference Platform
Actual_Processor_Binding => reference Platform
applies to Sunseeker;
end Sunseekercontrolsystem_Type.LEON_GNAT;
......@@ -180,9 +180,7 @@ subcomponents
P1 : processor the_processor
{Priority_Range => 0 .. 255;
Deployment::Execution_Platform => LEON_ORK;};
GNC_TMTC_POS : process Toy_Example_Proc.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
GNC_TMTC_POS : process Toy_Example_Proc.Impl;
properties
Actual_Processor_Binding => reference (P1) applies to GNC_TMTC_POS;
end toy_example.leon;
......@@ -192,9 +190,7 @@ subcomponents
P1 : processor the_processor
{Priority_Range => 0 .. 255;
Deployment::Execution_Platform => LEON_GNAT;};
GNC_TMTC_POS : process Toy_Example_Proc.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
GNC_TMTC_POS : process Toy_Example_Proc.Impl;
properties
Actual_Processor_Binding => reference (P1) applies to GNC_TMTC_POS;
end toy_example.leon_gnat;
......
......@@ -52,9 +52,7 @@ end Delayed_Connections;
system implementation Delayed_Connections.LEON
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl
{Priority_Range => 0 .. 255;};
......
......@@ -19,7 +19,7 @@ properties
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
......@@ -49,9 +49,7 @@ end PING;
system implementation PING.LEON
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl
{Priority_Range => 0 .. 255;};
......
......@@ -49,20 +49,14 @@ end MPC;
system implementation MPC.LEON
subcomponents
SC_1 : process Sender_Process.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
SC_2 : process Receiver_Process.Impl
{Deployment::Channel_Address => 3;
Deployment::Process_Id => 1201;};
SC_3 : process Receiver_Process.Impl
{Deployment::Channel_Address => 4;
Deployment::Process_Id => 1204;};
SC_1 : process Sender_Process.Impl;
SC_2 : process Receiver_Process.Impl;
SC_3 : process Receiver_Process.Impl;
-- The CPUs
CPU_SC_1 : processor Complex_CPU.P4;
CPU_SC_2 : processor Simple_CPU.P4;
CPU_SC_1 : processor Complex_CPU.P4;
CPU_SC_2 : processor Simple_CPU.P4;
CPU_SC_3 : processor Simple_CPU.P4;
-- The SpaceWire buses
......
......@@ -53,9 +53,7 @@ end Multiple_Instances;
system implementation Multiple_Instances.LEON
subcomponents
Node_A : process Send_Receive.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process Send_Receive.Impl;
CPU : processor the_processor.Impl
{Priority_Range => 0 .. 255;};
......
......@@ -20,11 +20,11 @@ processor the_processor
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
end the_processor.Impl;
---------------
......@@ -51,9 +51,7 @@ end PING;
system implementation PING.LEON
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl
{Priority_Range => 0 .. 255;
......@@ -64,9 +62,7 @@ end PING.LEON;
system implementation PING.LEON_GNAT
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl
{Priority_Range => 0 .. 255;
......@@ -77,9 +73,7 @@ end PING.LEON_GNAT;
system implementation PING.MARTE
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl
{Priority_Range => 0 .. 255;
......
......@@ -20,11 +20,11 @@ processor the_processor
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
end the_processor.Impl;
---------------
......@@ -53,9 +53,7 @@ end PING;
system implementation PING.NATIVE
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl
{Priority_Range => 0 .. 255;
......
......@@ -50,9 +50,7 @@ end Prime_Numbers;
system implementation Prime_Numbers.LEON
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl
{Priority_Range => 0 .. 255;};
......
......@@ -11,7 +11,7 @@ features
properties
Deployment::Execution_Platform => LEON_ORK;
Cheddar_Properties::Preemptive_Scheduler => true;
Scheduling_Protocol =>
Scheduling_Protocol =>
POSIX_1003_HIGHEST_PRIORITY_FIRST_PROTOCOL;
Priority_Range => 0 .. 255;
end The_Processor;
......@@ -26,12 +26,8 @@ end Case_Study;
system implementation Case_Study.LEON
subcomponents
WoM : process RavenscarExample::Workload_Manager.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
InS : process RavenscarExample::Interrupt_Simulator.Impl
{Deployment::Channel_Address => 3;
Deployment::Process_Id => 1201;};
WoM : process RavenscarExample::Workload_Manager.Impl;
InS : process RavenscarExample::Interrupt_Simulator.Impl;
CPU_1 : processor The_Processor;
CPU_2 : processor The_Processor;
B : bus Ethernet_Bus;
......
......@@ -9,7 +9,7 @@ processor The_Processor
properties
Deployment::Execution_Platform => LEON_ORK;
Cheddar_Properties::Preemptive_Scheduler => true;
Scheduling_Protocol =>
Scheduling_Protocol =>
POSIX_1003_HIGHEST_PRIORITY_FIRST_PROTOCOL;
Priority_Range => 0 .. 255;
end The_Processor;
......@@ -19,9 +19,7 @@ end Case_Study;
system implementation Case_Study.LEON_Local
subcomponents
WoM : process RavenscarExample::Workload_Manager.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
WoM : process RavenscarExample::Workload_Manager.Impl;
CPU_1 : processor The_Processor;
properties
Actual_Processor_Binding => reference (CPU_1) applies to WoM;
......
......@@ -22,28 +22,24 @@ end Sunseekercontrolsystem_Type;
system implementation Sunseekercontrolsystem_Type.LEON
subcomponents
Sunseeker : process sunseeker::sunseeker_local.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Sunseeker : process sunseeker::sunseeker_local.Impl;
Platform: processor LEON_Type
{Deployment::Execution_Platform => LEON_ORK;};
properties
Actual_Processor_Binding => (reference (Platform))
Actual_Processor_Binding => (reference (Platform))
applies to Sunseeker;
end Sunseekercontrolsystem_Type.LEON;
system implementation Sunseekercontrolsystem_Type.LEON_GNAT
subcomponents
Sunseeker : process sunseeker::sunseeker_local.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Sunseeker : process sunseeker::sunseeker_local.Impl;
Platform: processor LEON_Type
{Deployment::Execution_Platform => LEON_GNAT;};
properties
Actual_Processor_Binding => (reference (Platform))
Actual_Processor_Binding => (reference (Platform))
applies to Sunseeker;
end Sunseekercontrolsystem_Type.LEON_GNAT;
......
......@@ -22,7 +22,7 @@ properties
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
......@@ -54,9 +54,7 @@ end PING;
system implementation PING.ERC32
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl;
properties
......
......@@ -123,9 +123,7 @@ public
system implementation PING.ERC32
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl;
properties
......
......@@ -22,7 +22,7 @@ properties
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
......@@ -39,7 +39,7 @@ end A;
process implementation A.Impl
subcomponents
Pinger : thread s::P.Impl;
Pinger2 : thread s::P.Impl;
Pinger2 : thread s::P.Impl;
Ping_Me : thread s::Q.Impl;
Ping_Me2 : thread s::Q.Impl;
connections
......@@ -56,9 +56,7 @@ end PING;
system implementation PING.ERC32
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl;
properties
......
......@@ -22,7 +22,7 @@ properties
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
......@@ -39,7 +39,7 @@ end A;
process implementation A.Impl
subcomponents
Pinger : thread s::P.Impl;
Pinger2 : thread s::P.Impl;
Pinger2 : thread s::P.Impl;
Ping_Me : thread s::Q.Impl;
Ping_Me2 : thread s::Q.Impl;
connections
......@@ -56,9 +56,7 @@ end PING;
system implementation PING.ERC32
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl;
properties
......
......@@ -22,7 +22,7 @@ properties
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
......@@ -55,9 +55,7 @@ end PING;
system implementation PING.ERC32
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl;
properties
......
......@@ -22,7 +22,7 @@ properties
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
......@@ -53,9 +53,7 @@ end PING;
system implementation PING.ERC32
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl;
properties
......
......@@ -22,7 +22,7 @@ properties
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
......@@ -56,9 +56,7 @@ end PING;
system implementation PING.ERC32
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Node_A : process A.Impl;
CPU : processor the_processor.Impl;
properties
......
......@@ -22,7 +22,7 @@ properties
end the_processor;
processor implementation the_processor.Impl
properties
properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true;
......@@ -54,9 +54,7 @@ end PING;
system implementation PING.ERC32
subcomponents
Node_A : process A.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};