Commit 6871067e authored by julien.delange's avatar julien.delange
Browse files

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

   - Adapt Makefile for multiple user sources dir

 * ocarina/src/backends/ocarina-backends-po_hi_c-deployment.adb
   - Avoid several configuration patterns (string and asn1 based)

 * ocarina/src/backends/ocarina-backends-c_common-mapping.adb
   - Adapt the external variable naming schema
     according to buildsupport





git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@2099 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 826ff38c
...@@ -4105,7 +4105,7 @@ package body Ocarina.Backends.C_Common.Mapping is ...@@ -4105,7 +4105,7 @@ package body Ocarina.Backends.C_Common.Mapping is
is is
begin begin
if AINU.Is_Device (E) then if AINU.Is_Device (E) then
Set_Str_To_Name_Buffer ("__po_hi_c_confvar_"); Set_Str_To_Name_Buffer ("pohidrv_");
Get_Name_String_And_Append Get_Name_String_And_Append
(AIN.Name (AIN.Name
(AIN.Identifier (Parent_Subcomponent (E)))); (AIN.Identifier (Parent_Subcomponent (E))));
......
...@@ -400,19 +400,6 @@ package body Ocarina.Backends.PO_HI_C.Deployment is ...@@ -400,19 +400,6 @@ package body Ocarina.Backends.PO_HI_C.Deployment is
Conf_Str := Name_Find; Conf_Str := Name_Find;
end if; end if;
if Conf_Str /= No_Name then
Append_Node_To_List
(Make_Literal
(CV.New_Pointed_Char_Value (Conf_Str)),
CTN.Values (Devices_Array));
else
Append_Node_To_List
(Make_Literal
(CV.New_Pointed_Char_Value
(Get_String_Name ("noaddr"))),
CTN.Values (Devices_Array));
end if;
-- Now, we look at the amount of buses connected to -- Now, we look at the amount of buses connected to
-- the device and which bus is connected to which -- the device and which bus is connected to which
-- device. As a result, the arrays -- device. As a result, the arrays
...@@ -630,6 +617,11 @@ package body Ocarina.Backends.PO_HI_C.Deployment is ...@@ -630,6 +617,11 @@ package body Ocarina.Backends.PO_HI_C.Deployment is
end loop; end loop;
end if; end if;
end if; end if;
Append_Node_To_List
(Make_Literal
(CV.New_Pointed_Char_Value
(Get_String_Name ("noaddr"))),
CTN.Values (Devices_Array));
Set_Deployment_Header; Set_Deployment_Header;
else else
...@@ -637,6 +629,19 @@ package body Ocarina.Backends.PO_HI_C.Deployment is ...@@ -637,6 +629,19 @@ package body Ocarina.Backends.PO_HI_C.Deployment is
(Make_Literal (Make_Literal
(CV.New_Int_Value (0, 0, 10)), (CV.New_Int_Value (0, 0, 10)),
CTN.Values (Devices_Confvars)); CTN.Values (Devices_Confvars));
if Conf_Str /= No_Name then
Append_Node_To_List
(Make_Literal
(CV.New_Pointed_Char_Value (Conf_Str)),
CTN.Values (Devices_Array));
else
Append_Node_To_List
(Make_Literal
(CV.New_Pointed_Char_Value
(Get_String_Name ("noaddr"))),
CTN.Values (Devices_Array));
end if;
end if; end if;
end if; end if;
Current_Device := No_Node; Current_Device := No_Node;
......
...@@ -223,7 +223,7 @@ package body Ocarina.Backends.PO_HI_C is ...@@ -223,7 +223,7 @@ package body Ocarina.Backends.PO_HI_C is
if Length (User_Source_Dirs) > 0 then if Length (User_Source_Dirs) > 0 then
for J in for J in
Name_Tables.First .. Name_Tables.Last (User_Source_Dirs) loop Name_Tables.First .. Name_Tables.Last (User_Source_Dirs) loop
Write_Str ("-I");
Write_Name (User_Source_Dirs.Table (J)); Write_Name (User_Source_Dirs.Table (J));
exit when J = Name_Tables.Last (User_Source_Dirs); exit when J = Name_Tables.Last (User_Source_Dirs);
......
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