Commit 99078ec0 authored by julien.delange's avatar julien.delange
Browse files

update component library to work with the new TASTE version



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@1331 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent bc04bb5d
......@@ -24,8 +24,14 @@ end ip.pohiada;
bus spacewire
end spacewire;
bus implementation spacewire.pohic
end spacewire.pohic;
bus implementation spacewire.generic
end spacewire.generic;
bus serial
end serial;
bus implementation serial.generic
end serial.generic;
----------------------
......
......@@ -51,6 +51,8 @@ end rasta_1553.controller_sender_only;
--------------------
device rasta_serial
features
serialaccess : requires bus access ocarina_buses::serial.generic;
end rasta_serial;
device implementation rasta_serial.raw
......@@ -67,6 +69,8 @@ end rasta_serial.raw;
-----------------------
device rasta_spacewire
features
spwaccess : requires bus access ocarina_buses::spacewire.generic;
end rasta_spacewire;
device implementation rasta_spacewire.pohic
......@@ -83,6 +87,8 @@ end rasta_spacewire.pohic;
-----------------------------
device generic_serial
features
serialaccess : requires bus access ocarina_buses::serial.generic;
end generic_serial;
device implementation generic_serial.raw
......@@ -102,14 +108,24 @@ features
thebus : requires bus access ocarina_buses::ip.i;
end generic_sockets_ip;
device implementation generic_sockets_ip.pohic
device implementation generic_sockets_ip.pohic_old
properties
Deployment::Driver_Name => "sockets";
Device_Driver => classifier (ocarina_drivers_ip_pohic::sockets_impl.i);
Initialize_Entrypoint => classifier (ocarina_drivers_ip_pohic::spg_sockets_init);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c));
end generic_sockets_ip.pohic_old;
device implementation generic_sockets_ip.pohic
properties
Deployment::Driver_Name => "socketsnew";
Device_Driver => classifier (ocarina_drivers_ip_pohic::sockets_impl.inew);
Initialize_Entrypoint => classifier (ocarina_drivers_ip_pohic::spg_sockets_init);
Provided_Virtual_Bus_Class => (classifier (ocarina_buses::pohi.c));
end generic_sockets_ip.pohic;
device implementation generic_sockets_ip.asn1
properties
Deployment::Driver_Name => "sockets_asn1";
......
......@@ -48,4 +48,12 @@ subcomponents
sender : subprogram spg_eth_linux_sender;
end sockets_impl.i;
abstract implementation sockets_impl.i
subcomponents
-- receiver : thread eth_linux_poller.i;
sender : subprogram spg_eth_linux_sender;
end sockets_impl.i;
end ocarina_drivers_ip_pohic;
......@@ -1352,7 +1352,7 @@ package body Ocarina.Backends.C_Common.Types is
Data_Representation := Get_Data_Representation (E);
if Get_Current_Backend_Kind = PolyORB_HI_C then
Add_Include (PHR.RH (RH_Types));
Add_Include (PHR.RH (PHR.RH_Types));
end if;
if Data_Representation = Data_With_Accessors then
......
......@@ -277,7 +277,7 @@ package body Ocarina.Backends.PO_HI_C.Deployment is
---------------------------
procedure Visit_Device_Instance (E : Node_Id) is
N : Node_Id;
N : Node_Id;
Conf_Str : Name_Id := No_Name;
Tmp_Name : Name_Id;
begin
......@@ -335,7 +335,9 @@ package body Ocarina.Backends.PO_HI_C.Deployment is
Get_Name_String_And_Append (Tmp_Name);
Conf_Str := Name_Find;
end if;
elsif Is_Defined_Property (E, "deployment::configuration") then
elsif Is_Defined_Property (E, "deployment::configuration") and then
Get_String_Property
(E, "deployment::configuration") /= No_Name then
Get_Name_String
(Get_String_Property
(E, "deployment::configuration"));
......
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