Merge https://github.com/openaadl/ocarina

resources/AADLv2/TASTE_DV_Properties.aadl

--- mapping TASTE : AADL
--- Node : System
--- Processor : Processor
--- Process : Function
--- Bus : Bus
--- Device : Device
--- Driver : Driver
-property set TASTE_DV_Properties is
---  MyBoolean: aadlboolean applies to (System, Processor, Process);
-    CoverageEnabled: aadlboolean applies to (Process);
-    Comment: aadlstring applies to (Device, Bus);
---  MyInt: aadlinteger applies to (System);
---  MyReal: aadlreal applies to (Bus);
---  MyEnum: enumeration  (val1, val2, val3, val4) applies to (Device);
-end TASTE_DV_Properties;

resources/AADLv2/TASTE_IV_Properties.aadl

--- mapping TASTE : AADL
--- Container : Package
--- Function : System
--- Interface : Subprogram
-property set TASTE_IV_Properties is
---  MyBoolean: aadlboolean applies to (System, Package);
---  MyString: aadlstring applies to (System, Subprogram);
-    Version: aadlstring applies to (System);
---  MyInt: aadlinteger applies to (System);
---  MyReal: aadlreal applies to (System);
---  MyEnum: enumeration  (val1, val2, val3, val4) applies to (System);
-    MSCFiles : aadlstring applies to (Subprogram);
-    is_Component_Type : aadlboolean applies to (System);
-    is_instance_of    : aadlstring applies to (System);
---    MSCFiles : list of aadlstring applies to (Subprogram);
-end TASTE_IV_Properties;

resources/Makefile.am

@@ -30,9 +30,6 @@ AADL_V2_PROPERTIES = $(srcdir)/AADLv2/aadl_project.aadl	\
 	$(srcdir)/AADLv2/base_types.aadl		\
 	$(srcdir)/AADLv2/replication_properties.aadl	\
 	$(srcdir)/AADLv2/errorlibrary.aadl		\
-	$(srcdir)/AADLv2/taste_properties.aadl		\
-	$(srcdir)/AADLv2/TASTE_IV_Properties.aadl	\
-	$(srcdir)/AADLv2/TASTE_DV_Properties.aadl	\
 	$(srcdir)/AADLv2/transformations.aadl		\
 	$(srcdir)/AADLv2/ocarina_library.aadl		\
 	$(srcdir)/AADLv2/fmi.aadl

src/backends/po_hi_c/ocarina-backends-po_hi_c-activity.adb

@@ -1556,6 +1556,11 @@ package body Ocarina.Backends.PO_HI_C.Activity is
                    (Map_C_Enumerator_Name
                       (S,
                        Custom_Parent => Current_Device));
+               N1 :=
+                 Make_Defining_Identifier
+                   (Map_C_Enumerator_Name
+                      (S,
+                       Custom_Parent => Current_Device));
             else
                N := Make_Defining_Identifier (Map_C_Enumerator_Name (S));
                N1 := Make_Defining_Identifier (Map_C_Enumerator_Name (S));