Commit 988c7f77 authored by yoogx's avatar yoogx
Browse files

* Remove useless properties

parent c14a5ead
-- This AADL model is derived from the AADL model published in the -- 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 407 2007-06-19 15:24:28Z delange $ -- $Id: toy_example.aadl 407 2007-06-19 15:24:28Z delange $
...@@ -206,9 +206,8 @@ end toy_example; ...@@ -206,9 +206,8 @@ end toy_example;
system implementation toy_example.sample_1 system implementation toy_example.sample_1
subcomponents subcomponents
P1 : processor the_processor; P1 : processor the_processor;
GNC_TMTC_POS : process Toy_Example_Proc.Impl GNC_TMTC_POS : process Toy_Example_Proc.Impl;
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
properties properties
Actual_Processor_Binding => reference P1 applies to GNC_TMTC_POS; Actual_Processor_Binding => reference P1 applies to GNC_TMTC_POS;
end toy_example.sample_1; end toy_example.sample_1;
...@@ -8,7 +8,7 @@ properties ...@@ -8,7 +8,7 @@ properties
end the_processor; end the_processor;
processor implementation the_processor.Impl processor implementation the_processor.Impl
properties properties
Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol); Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
Cheddar_Properties::Scheduler_Quantum => 0 Ms; Cheddar_Properties::Scheduler_Quantum => 0 Ms;
Cheddar_Properties::Preemptive_Scheduler => true; Cheddar_Properties::Preemptive_Scheduler => true;
...@@ -38,9 +38,7 @@ end PING; ...@@ -38,9 +38,7 @@ end PING;
system implementation PING.Local system implementation PING.Local
subcomponents subcomponents
Node_A : process A.Impl Node_A : process A.Impl;
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
CPU : processor the_processor.Impl; CPU : processor the_processor.Impl;
properties properties
......
...@@ -21,13 +21,10 @@ end Sunseekercontrolsystem_Type; ...@@ -21,13 +21,10 @@ end Sunseekercontrolsystem_Type;
system implementation Sunseekercontrolsystem_Type.Local system implementation Sunseekercontrolsystem_Type.Local
subcomponents subcomponents
Sunseeker : process sunseeker_local.Impl;
Sunseeker : process sunseeker_local.Impl
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Platform: processor LEON_Type.LEON; Platform: processor LEON_Type.LEON;
properties properties
Actual_Processor_Binding => reference Platform Actual_Processor_Binding => reference Platform
applies to Sunseeker; applies to Sunseeker;
end Sunseekercontrolsystem_Type.Local; end Sunseekercontrolsystem_Type.Local;
-- This AADL model is derived from the AADL model published in the -- 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 407 2007-06-19 15:24:28Z delange $ -- $Id: toy_example.aadl 407 2007-06-19 15:24:28Z delange $
...@@ -73,7 +73,7 @@ features ...@@ -73,7 +73,7 @@ features
end GNC_Thread_Wrapper; end GNC_Thread_Wrapper;
subprogram implementation GNC_Thread_Wrapper.Impl subprogram implementation GNC_Thread_Wrapper.Impl
calls calls
Mycalls: { Mycalls: {
Welcome : subprogram GNC_Identity; Welcome : subprogram GNC_Identity;
Update_POS : subprogram POS.Update; Update_POS : subprogram POS.Update;
...@@ -92,7 +92,7 @@ features ...@@ -92,7 +92,7 @@ features
end TMTC_Thread_Wrapper; end TMTC_Thread_Wrapper;
subprogram implementation TMTC_Thread_Wrapper.Impl subprogram implementation TMTC_Thread_Wrapper.Impl
calls calls
Mycalls: { Mycalls: {
Welcome : subprogram TMTC_Identity; Welcome : subprogram TMTC_Identity;
TMTC_Job : subprogram TMTC_Job; TMTC_Job : subprogram TMTC_Job;
...@@ -113,7 +113,7 @@ features ...@@ -113,7 +113,7 @@ features
end GNC_Thread; end GNC_Thread;
thread implementation GNC_Thread.Impl thread implementation GNC_Thread.Impl
calls calls
Mycalls: { Mycalls: {
GNC_Thread_Wrapper : subprogram GNC_Thread_Wrapper.Impl; GNC_Thread_Wrapper : subprogram GNC_Thread_Wrapper.Impl;
}; };
...@@ -133,7 +133,7 @@ features ...@@ -133,7 +133,7 @@ features
end TMTC_Thread; end TMTC_Thread;
thread implementation TMTC_Thread.Impl thread implementation TMTC_Thread.Impl
calls calls
Mycalls: { Mycalls: {
TMTC_Thread_Wrapper : subprogram TMTC_Thread_Wrapper.Impl; TMTC_Thread_Wrapper : subprogram TMTC_Thread_Wrapper.Impl;
}; };
...@@ -184,9 +184,7 @@ end toy_example; ...@@ -184,9 +184,7 @@ end toy_example;
system implementation toy_example.sample_1 system implementation toy_example.sample_1
subcomponents subcomponents
P1 : processor the_processor; P1 : processor the_processor;
GNC_TMTC_POS : process Toy_Example_Proc.Impl GNC_TMTC_POS : process Toy_Example_Proc.Impl;
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
properties properties
Actual_Processor_Binding => reference (P1) applies to GNC_TMTC_POS; Actual_Processor_Binding => reference (P1) applies to GNC_TMTC_POS;
end toy_example.sample_1; end toy_example.sample_1;
...@@ -219,7 +217,7 @@ data implementation POS.Impl ...@@ -219,7 +217,7 @@ data implementation POS.Impl
subcomponents subcomponents
Field : data POS_Internal_Type; Field : data POS_Internal_Type;
spgUpdate : subprogram Update; spgUpdate : subprogram Update;
spgRead : subprogram Read_POS; spgRead : subprogram Read_POS;
connections connections
Cnx_Pos_1 : subprogram access SpgUpdate -> Update; Cnx_Pos_1 : subprogram access SpgUpdate -> Update;
......
-- This AADL model is derived from the AADL model published in the -- 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 407 2007-06-19 15:24:28Z delange $ -- $Id: toy_example.aadl 407 2007-06-19 15:24:28Z delange $
...@@ -73,7 +73,7 @@ features ...@@ -73,7 +73,7 @@ features
end GNC_Thread_Wrapper; end GNC_Thread_Wrapper;
subprogram implementation GNC_Thread_Wrapper.Impl subprogram implementation GNC_Thread_Wrapper.Impl
calls calls
Mycalls: { Mycalls: {
Welcome : subprogram GNC_Identity; Welcome : subprogram GNC_Identity;
Update_POS : subprogram POS.Update; Update_POS : subprogram POS.Update;
...@@ -92,7 +92,7 @@ features ...@@ -92,7 +92,7 @@ features
end TMTC_Thread_Wrapper; end TMTC_Thread_Wrapper;
subprogram implementation TMTC_Thread_Wrapper.Impl subprogram implementation TMTC_Thread_Wrapper.Impl
calls calls
Mycalls: { Mycalls: {
Welcome : subprogram TMTC_Identity; Welcome : subprogram TMTC_Identity;
TMTC_Job : subprogram TMTC_Job; TMTC_Job : subprogram TMTC_Job;
...@@ -113,7 +113,7 @@ features ...@@ -113,7 +113,7 @@ features
end GNC_Thread; end GNC_Thread;
thread implementation GNC_Thread.Impl thread implementation GNC_Thread.Impl
calls calls
Mycalls: { Mycalls: {
GNC_Thread_Wrapper : subprogram GNC_Thread_Wrapper.Impl; GNC_Thread_Wrapper : subprogram GNC_Thread_Wrapper.Impl;
}; };
...@@ -133,7 +133,7 @@ features ...@@ -133,7 +133,7 @@ features
end TMTC_Thread; end TMTC_Thread;
thread implementation TMTC_Thread.Impl thread implementation TMTC_Thread.Impl
calls calls
Mycalls: { Mycalls: {
TMTC_Thread_Wrapper : subprogram TMTC_Thread_Wrapper.Impl; TMTC_Thread_Wrapper : subprogram TMTC_Thread_Wrapper.Impl;
}; };
...@@ -184,9 +184,8 @@ end toy_example; ...@@ -184,9 +184,8 @@ end toy_example;
system implementation toy_example.sample_1 system implementation toy_example.sample_1
subcomponents subcomponents
P1 : processor the_processor; P1 : processor the_processor;
GNC_TMTC_POS : process Toy_Example_Proc.Impl GNC_TMTC_POS : process Toy_Example_Proc.Impl;
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
properties properties
Actual_Processor_Binding => reference (P1) applies to GNC_TMTC_POS; Actual_Processor_Binding => reference (P1) applies to GNC_TMTC_POS;
end toy_example.sample_1; end toy_example.sample_1;
...@@ -219,7 +218,7 @@ data implementation POS.Impl ...@@ -219,7 +218,7 @@ data implementation POS.Impl
subcomponents subcomponents
Field : data POS_Internal_Type; Field : data POS_Internal_Type;
spgUpdate : subprogram Update; spgUpdate : subprogram Update;
spgRead : subprogram Read_POS; spgRead : subprogram Read_POS;
connections connections
Cnx_Pos_1 : subprogram access SpgUpdate -> Update; Cnx_Pos_1 : subprogram access SpgUpdate -> Update;
......
-- This AADL model is derived from the AADL model published in the -- 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 407 2007-06-19 15:24:28Z delange $ -- $Id: toy_example.aadl 407 2007-06-19 15:24:28Z delange $
...@@ -73,7 +73,7 @@ features ...@@ -73,7 +73,7 @@ features
end GNC_Thread_Wrapper; end GNC_Thread_Wrapper;
subprogram implementation GNC_Thread_Wrapper.Impl subprogram implementation GNC_Thread_Wrapper.Impl
calls calls
Mycalls: { Mycalls: {
Welcome : subprogram GNC_Identity; Welcome : subprogram GNC_Identity;
Update_POS : subprogram POS.Update; Update_POS : subprogram POS.Update;
...@@ -92,7 +92,7 @@ features ...@@ -92,7 +92,7 @@ features
end TMTC_Thread_Wrapper; end TMTC_Thread_Wrapper;
subprogram implementation TMTC_Thread_Wrapper.Impl subprogram implementation TMTC_Thread_Wrapper.Impl
calls calls
Mycalls: { Mycalls: {
Welcome : subprogram TMTC_Identity; Welcome : subprogram TMTC_Identity;
TMTC_Job : subprogram TMTC_Job; TMTC_Job : subprogram TMTC_Job;
...@@ -113,7 +113,7 @@ features ...@@ -113,7 +113,7 @@ features
end GNC_Thread; end GNC_Thread;
thread implementation GNC_Thread.Impl thread implementation GNC_Thread.Impl
calls calls
Mycalls: { Mycalls: {
GNC_Thread_Wrapper : subprogram GNC_Thread_Wrapper.Impl; GNC_Thread_Wrapper : subprogram GNC_Thread_Wrapper.Impl;
}; };
...@@ -133,7 +133,7 @@ features ...@@ -133,7 +133,7 @@ features
end TMTC_Thread; end TMTC_Thread;
thread implementation TMTC_Thread.Impl thread implementation TMTC_Thread.Impl
calls calls
Mycalls: { Mycalls: {
TMTC_Thread_Wrapper : subprogram TMTC_Thread_Wrapper.Impl; TMTC_Thread_Wrapper : subprogram TMTC_Thread_Wrapper.Impl;
}; };
...@@ -184,9 +184,8 @@ end toy_example; ...@@ -184,9 +184,8 @@ end toy_example;
system implementation toy_example.sample_1 system implementation toy_example.sample_1
subcomponents subcomponents
P1 : processor the_processor; P1 : processor the_processor;
GNC_TMTC_POS : process Toy_Example_Proc.Impl GNC_TMTC_POS : process Toy_Example_Proc.Impl;
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
properties properties
Actual_Processor_Binding => reference (P1) applies to GNC_TMTC_POS; Actual_Processor_Binding => reference (P1) applies to GNC_TMTC_POS;
end toy_example.sample_1; end toy_example.sample_1;
...@@ -219,7 +218,7 @@ data implementation POS.Impl ...@@ -219,7 +218,7 @@ data implementation POS.Impl
subcomponents subcomponents
Field : data POS_Internal_Type; Field : data POS_Internal_Type;
spgUpdate : subprogram Update; spgUpdate : subprogram Update;
spgRead : subprogram Read_POS; spgRead : subprogram Read_POS;
connections connections
Cnx_Pos_1 : subprogram access SpgUpdate -> Update; Cnx_Pos_1 : subprogram access SpgUpdate -> Update;
......
...@@ -13,7 +13,7 @@ properties ...@@ -13,7 +13,7 @@ properties
end the_processor; end the_processor;
processor implementation the_processor.Impl processor implementation the_processor.Impl
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;
end the_processor.Impl; end the_processor.Impl;
...@@ -42,9 +42,7 @@ end PING; ...@@ -42,9 +42,7 @@ end PING;
system implementation PING.Local system implementation PING.Local
subcomponents subcomponents
Node_A : process A.Impl Node_A : process A.Impl;
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
CPU : processor the_processor.Impl; CPU : processor the_processor.Impl;
properties properties
......
...@@ -13,7 +13,7 @@ properties ...@@ -13,7 +13,7 @@ properties
end the_processor; end the_processor;
processor implementation the_processor.Impl processor implementation the_processor.Impl
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;
end the_processor.Impl; end the_processor.Impl;
...@@ -42,11 +42,9 @@ end PING; ...@@ -42,11 +42,9 @@ end PING;
system implementation PING.Local system implementation PING.Local
subcomponents subcomponents
Node_A : process A.Impl Node_A : process A.Impl;
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
CPU : processor the_processor.Impl; CPU : processor the_processor.Impl;
properties properties
actual_processor_binding => (reference (CPU)) applies to Node_A; actual_processor_binding => (reference (CPU)) applies to Node_A;
end PING.Local; end PING.Local;
......
...@@ -13,7 +13,7 @@ properties ...@@ -13,7 +13,7 @@ properties
end the_processor; end the_processor;
processor implementation the_processor.Impl processor implementation the_processor.Impl
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;
end the_processor.Impl; end the_processor.Impl;
...@@ -42,11 +42,9 @@ end PING; ...@@ -42,11 +42,9 @@ end PING;
system implementation PING.Local system implementation PING.Local
subcomponents subcomponents
Node_A : process A.Impl Node_A : process A.Impl;
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
CPU : processor the_processor.Impl; CPU : processor the_processor.Impl;
properties properties
actual_processor_binding => (reference (CPU)) applies to Node_A; actual_processor_binding => (reference (CPU)) applies to Node_A;
end PING.Local; end PING.Local;
......
...@@ -27,13 +27,11 @@ end Sunseekercontrolsystem_Type; ...@@ -27,13 +27,11 @@ end Sunseekercontrolsystem_Type;
system implementation Sunseekercontrolsystem_Type.Local system implementation Sunseekercontrolsystem_Type.Local
subcomponents subcomponents
Sunseeker : process Sunseeker::sunseeker_local.Impl Sunseeker : process Sunseeker::sunseeker_local.Impl;
{Deployment::Channel_Address => 2;
Deployment::Process_Id => 1200;};
Platform: processor LEON_Type.LEON; Platform: processor LEON_Type.LEON;
properties properties
Actual_Processor_Binding => reference (Platform) Actual_Processor_Binding => reference (Platform)
applies to Sunseeker; applies to Sunseeker;
end Sunseekercontrolsystem_Type.Local; end Sunseekercontrolsystem_Type.Local;
......
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