One more step towards tsp

templates/concurrency_view/aadl_2_threads/node.tmplt

@@ -7,13 +7,31 @@
 @@--   VP_Package_Names  :    |_ Corresponding package name
 @@--   VP_Platforms      :    |_ Corresponding platform name
 @@--   VP_Classifiers    :    |_ Corresponding aadl classifier
-@@-- @_CPU_Name_@, _Platform_@, _Classifier_@, _Ada_Runtime_@ : Info about CPU
+@@-- @_CPU_Name_@, _Family_@, Instance_@, _Platform_@, _Classifier_@, _Ada_Runtime_@ : Info about CPU
 @@-- In standard TASTE systems there is only one partition per node
 
 --  DEBUG : NODE_Name: @_Node_Name_@ CPU_Name : @_CPU_Name_@ Platform : @_CPU_Platform_@
---  Classifier : @_CPU_Classifier_@  Packagename : @_Package_Name_@ CPU Kind: @_CPU_Kind_@
+--  Classifier : @_CPU_Classifier_@  Packagename : @_Package_Name_@ CPU : @_CPU_Family_@
 --  VP Names: @_VP_Names_@
 --  @_VP_Package_Names_@
 --  @_VP_Platforms_@
 --  @_VP_Classifiers_@
+@@-- Test if the node contains several partitions (virtual processors)
+@@-- If that's the case we need to generate a new AADL processor for TSP support
+@@IF@@ @_VP_Names'Length_@ > 0
+processor @_Node_Name_@_@_CPU_Name_@ extends @_Package_Name_@::@_CPU_Family_@
+end @_Node_Name_@_@_CPU_Name_@;
+
+processor implementation @_Node_Name_@_@_CPU_Name_@.final extends @_CPU_Classifier_@
+subcomponents
+@@TABLE@@
+   @_VP_Names_@ : virtual processor deploymentview::DV::@_Node_Name_@::@_VP_Names_@.others;
+@@END_TABLE@@
+properties
+@@TABLE@@
+   Scheduling_Protocol => (POSIX_1003_Highest_Priority_First_Protocol) applies to @_VP_Names_@;
+   Arinc653::DAL => Level_A applies to @_VP_Names_@;
+@@END_TABLE@@
+end @_Node_Name_@_@_CPU_Name_@.final;
+@@END_IF@@
 @_Partitions_@

templates/concurrency_view/aadl_2_threads/partition.tmplt

@@ -8,7 +8,9 @@
 @@-- @_Block_Names@      : Tag: list of block (user functions) names
 @@-- @_Coverage_@        : True if user requested code coverage enable
 @@-- @_Package_Name_@    : AADL Package name for the target (e.g. ocarina_porocessors_x86)
-@@-- @_CPU_Name_@        : CPU Name (e.g. x86_linux)
+@@-- @_CPU_Name_@        : CPU AADL Identifier (e.g. x86_inst)
+@@-- @_CPU_Family_@      : CPU Kind (e.g. leon3)
+@@-- @_CPU_Instance_@    : AADL component instance (e.g. rtems_posix)
 @@-- @_CPU_Platform_@    : AADL CPU_Platform (e.g. PLATFORM_NATIVE)
 @@-- @_CPU_Classifier_@  : AADL CPU Classifier (e.g. ocarina_processors_x86::x86.linux)
 @@-- @_VP_Name_@         : Virtual processor name on which the partition is bounded

templates/concurrency_view/aadl_2_threads/system.tmplt

@@ -21,10 +21,15 @@
 
 package Process_Package
 public
+   with arinc653;
    with Deployment;
    with DataView;
    with interfaceview::IV;
    with deploymentview::DV;
+@@-- Add "with" of the node, this is at least needed for TSP systems
+@@TABLE@@
+   with deploymentview::DV::@_Node_Names_@;
+@@END_TABLE@@
 @@TABLE@@
    with @_CAPITALIZE:Thread_Names_@_Thread;
 @@END_TABLE@@

templates/concurrency_view/aadl_4_makefile/partition.tmplt

@@ -40,7 +40,7 @@ with @_CAPITALIZE:Block_Names_@;
 package adainit is end adainit;' >@_LOWER:Name_@_adainit/tasteada.ads && \
 @@END_INLINE@@
         cd @_LOWER:Name_@_adainit && \
-@@INLINE(    )(:)( )@@
+@@INLINE(    )(:)(\\)@@
 ADA_INCLUDE_PATH=../../dataview/Ada
 @@TABLE'TERSE@@
 @@IF@@ @_LOWER:Block_Languages_@ = sdl

templates/skeletons/makefile.tmplt

@@ -59,8 +59,9 @@ build-rtems-ada: dataview
 	    @@TABLE@@
                @_REPLACE(,/ ):CP_Files_@
 	    @@END_TABLE@@
-	 @@END_INLINE@@
-         @@TABLE@@
+	@@END_INLINE@@
+	
+        @@TABLE@@
 	   @@IF@@ @_Unique_Languages_@ = "Ada" or @_Unique_Languages_@ = "SDL"
               @@SET@@ Enable=FALSE
               @@SET@@ Need_Ada=TRUE
@@ -88,8 +89,9 @@ build-rtems-ada: dataview
 	    @@TABLE@@
                @_REPLACE(,/ ):CP_Files_@
 	    @@END_TABLE@@
-	 @@END_INLINE@@
-	 cd dataview/Ada && rm -f gnat.cfg GPS_project.gpr IgnoredExaminerWarnings.wrn runSpark.sh
+	@@END_INLINE@@
+
+	cd dataview/Ada && rm -f gnat.cfg GPS_project.gpr IgnoredExaminerWarnings.wrn runSpark.sh
         @@END_IF@@
 	cp $(shell taste-config --prefix)/share/AutoGUI/debug_messages.? dataview/C
 	cp $(shell taste-config --prefix)/share/AutoGUI/timeInMS.? dataview/C