Commit 27156b33 authored by yoogx's avatar yoogx
Browse files

* Correct usage of Source_Language property

parent 18ed6ad9
...@@ -40,7 +40,7 @@ public ...@@ -40,7 +40,7 @@ public
properties properties
Type_Source_Name => "IP-Conf-T"; Type_Source_Name => "IP-Conf-T";
Deployment::ASN1_Module_Name => "POHICDRIVER-IP"; Deployment::ASN1_Module_Name => "POHICDRIVER-IP";
Source_Language => ASN1; Source_Language => (ASN1);
Source_Text => ("OCARINA_INCLUDE_PATH/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/ip.asn" , "drivers/configuration/ip.h"); Source_Text => ("OCARINA_INCLUDE_PATH/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/ip.asn" , "drivers/configuration/ip.h");
end configuration_type_ip; end configuration_type_ip;
...@@ -48,7 +48,7 @@ public ...@@ -48,7 +48,7 @@ public
properties properties
Type_Source_Name => "Serial-Conf-T"; Type_Source_Name => "Serial-Conf-T";
Deployment::ASN1_Module_Name => "POHICDRIVER-UART"; Deployment::ASN1_Module_Name => "POHICDRIVER-UART";
Source_Language => ASN1; Source_Language => (ASN1);
Source_Text => ("OCARINA_INCLUDE_PATH/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/serial.asn", "drivers/configuration/serial.h"); Source_Text => ("OCARINA_INCLUDE_PATH/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/serial.asn", "drivers/configuration/serial.h");
end configuration_type_serial; end configuration_type_serial;
...@@ -56,7 +56,7 @@ public ...@@ -56,7 +56,7 @@ public
properties properties
Type_Source_Name => "Spacewire-Conf-T"; Type_Source_Name => "Spacewire-Conf-T";
Deployment::ASN1_Module_Name => "POHICDRIVER-SPACEWIRE"; Deployment::ASN1_Module_Name => "POHICDRIVER-SPACEWIRE";
Source_Language => ASN1; Source_Language => (ASN1);
Source_Text => ("OCARINA_INCLUDE_PATH/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/spacewire.asn", "drivers/configuration/spacewire.h"); Source_Text => ("OCARINA_INCLUDE_PATH/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/spacewire.asn", "drivers/configuration/spacewire.h");
end configuration_type_spacewire; end configuration_type_spacewire;
...@@ -395,4 +395,3 @@ public ...@@ -395,4 +395,3 @@ public
end exarm_ni_6071e_digital.i; end exarm_ni_6071e_digital.i;
end ocarina_drivers; end ocarina_drivers;
...@@ -7,7 +7,7 @@ with Deployment; ...@@ -7,7 +7,7 @@ with Deployment;
subprogram spg_init subprogram spg_init
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_exarm_ni_6071e_analog_init"; Source_Name => "__po_hi_c_driver_exarm_ni_6071e_analog_init";
end spg_init; end spg_init;
...@@ -31,7 +31,7 @@ features ...@@ -31,7 +31,7 @@ features
data15 : out parameter Base_Types::Float_64; data15 : out parameter Base_Types::Float_64;
data16 : out parameter Base_Types::Float_64; data16 : out parameter Base_Types::Float_64;
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_exarm_ni_6071e_analog_poller"; Source_Name => "__po_hi_c_driver_exarm_ni_6071e_analog_poller";
end spg_poller; end spg_poller;
...@@ -62,22 +62,22 @@ calls ...@@ -62,22 +62,22 @@ calls
pspg : subprogram spg_poller; pspg : subprogram spg_poller;
}; };
connections connections
parameter pspg.data1 -> data1; parameter pspg.data1 -> data1;
parameter pspg.data2 -> data2; parameter pspg.data2 -> data2;
parameter pspg.data3 -> data3; parameter pspg.data3 -> data3;
parameter pspg.data4 -> data4; parameter pspg.data4 -> data4;
parameter pspg.data5 -> data5; parameter pspg.data5 -> data5;
parameter pspg.data6 -> data6; parameter pspg.data6 -> data6;
parameter pspg.data7 -> data7; parameter pspg.data7 -> data7;
parameter pspg.data8 -> data8; parameter pspg.data8 -> data8;
parameter pspg.data9 -> data9; parameter pspg.data9 -> data9;
parameter pspg.data10 -> data10; parameter pspg.data10 -> data10;
parameter pspg.data11 -> data11; parameter pspg.data11 -> data11;
parameter pspg.data12 -> data12; parameter pspg.data12 -> data12;
parameter pspg.data13 -> data13; parameter pspg.data13 -> data13;
parameter pspg.data14 -> data14; parameter pspg.data14 -> data14;
parameter pspg.data15 -> data15; parameter pspg.data15 -> data15;
parameter pspg.data16 -> data16; parameter pspg.data16 -> data16;
properties properties
Period => 100 ms; Period => 100 ms;
Dispatch_Protocol => Periodic; Dispatch_Protocol => Periodic;
...@@ -108,22 +108,22 @@ abstract implementation driver.i ...@@ -108,22 +108,22 @@ abstract implementation driver.i
subcomponents subcomponents
ni6071e_analog_poller : thread thr_poller.i; ni6071e_analog_poller : thread thr_poller.i;
connections connections
port ni6071e_analog_poller.data1 -> data1; port ni6071e_analog_poller.data1 -> data1;
port ni6071e_analog_poller.data2 -> data2; port ni6071e_analog_poller.data2 -> data2;
port ni6071e_analog_poller.data3 -> data3; port ni6071e_analog_poller.data3 -> data3;
port ni6071e_analog_poller.data4 -> data4; port ni6071e_analog_poller.data4 -> data4;
port ni6071e_analog_poller.data5 -> data5; port ni6071e_analog_poller.data5 -> data5;
port ni6071e_analog_poller.data6 -> data6; port ni6071e_analog_poller.data6 -> data6;
port ni6071e_analog_poller.data7 -> data7; port ni6071e_analog_poller.data7 -> data7;
port ni6071e_analog_poller.data8 -> data8; port ni6071e_analog_poller.data8 -> data8;
port ni6071e_analog_poller.data9 -> data9; port ni6071e_analog_poller.data9 -> data9;
port ni6071e_analog_poller.data10 -> data10; port ni6071e_analog_poller.data10 -> data10;
port ni6071e_analog_poller.data11 -> data11; port ni6071e_analog_poller.data11 -> data11;
port ni6071e_analog_poller.data12 -> data12; port ni6071e_analog_poller.data12 -> data12;
port ni6071e_analog_poller.data13 -> data13; port ni6071e_analog_poller.data13 -> data13;
port ni6071e_analog_poller.data14 -> data14; port ni6071e_analog_poller.data14 -> data14;
port ni6071e_analog_poller.data15 -> data15; port ni6071e_analog_poller.data15 -> data15;
port ni6071e_analog_poller.data16 -> data16; port ni6071e_analog_poller.data16 -> data16;
end driver.i; end driver.i;
end ocarina_drivers_exarm_ni_6071e_analog; end ocarina_drivers_exarm_ni_6071e_analog;
...@@ -7,7 +7,7 @@ with Deployment; ...@@ -7,7 +7,7 @@ with Deployment;
subprogram spg_init subprogram spg_init
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_exarm_ni_6071e_digital_init"; Source_Name => "__po_hi_c_driver_exarm_ni_6071e_digital_init";
end spg_init; end spg_init;
...@@ -17,7 +17,7 @@ features ...@@ -17,7 +17,7 @@ features
data1 : out parameter Base_Types::Unsigned_32; data1 : out parameter Base_Types::Unsigned_32;
data2 : out parameter Base_Types::Unsigned_32; data2 : out parameter Base_Types::Unsigned_32;
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_exarm_ni_6071e_digital_poller"; Source_Name => "__po_hi_c_driver_exarm_ni_6071e_digital_poller";
end spg_poller; end spg_poller;
...@@ -34,8 +34,8 @@ calls ...@@ -34,8 +34,8 @@ calls
pspg : subprogram spg_poller; pspg : subprogram spg_poller;
}; };
connections connections
parameter pspg.data1 -> data1; parameter pspg.data1 -> data1;
parameter pspg.data2 -> data2; parameter pspg.data2 -> data2;
properties properties
Period => 100 ms; Period => 100 ms;
Dispatch_Protocol => Periodic; Dispatch_Protocol => Periodic;
...@@ -55,8 +55,8 @@ abstract implementation driver.i ...@@ -55,8 +55,8 @@ abstract implementation driver.i
subcomponents subcomponents
ni6071e_digital_poller : thread thr_poller.i; ni6071e_digital_poller : thread thr_poller.i;
connections connections
port ni6071e_digital_poller.data1 -> data1; port ni6071e_digital_poller.data1 -> data1;
port ni6071e_digital_poller.data2 -> data2; port ni6071e_digital_poller.data2 -> data2;
end driver.i; end driver.i;
end ocarina_drivers_exarm_ni_6071e_digital; end ocarina_drivers_exarm_ni_6071e_digital;
...@@ -7,7 +7,7 @@ with Deployment; ...@@ -7,7 +7,7 @@ with Deployment;
subprogram spg_generic_keyboard_init subprogram spg_generic_keyboard_init
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_driver_generic_keyboard_init"; Source_Name => "__po_hi_driver_generic_keyboard_init";
end spg_generic_keyboard_init; end spg_generic_keyboard_init;
...@@ -34,7 +34,7 @@ subprogram spg_generic_keyboard_poller ...@@ -34,7 +34,7 @@ subprogram spg_generic_keyboard_poller
features features
key_pressed : out parameter Base_Types::Integer; key_pressed : out parameter Base_Types::Integer;
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_driver_generic_keyboard_poller"; Source_Name => "__po_hi_driver_generic_keyboard_poller";
end spg_generic_keyboard_poller; end spg_generic_keyboard_poller;
......
...@@ -104,7 +104,7 @@ public ...@@ -104,7 +104,7 @@ public
properties properties
Source_Name => "PolyORB_HI_Drivers_GRSPW.Initialize"; Source_Name => "PolyORB_HI_Drivers_GRSPW.Initialize";
Source_Language => Ada; Source_Language => (Ada);
end Initialize; end Initialize;
------------- -------------
...@@ -117,7 +117,7 @@ public ...@@ -117,7 +117,7 @@ public
properties properties
Source_Name => "PolyORB_HI_Drivers_GRSPW.Receive"; Source_Name => "PolyORB_HI_Drivers_GRSPW.Receive";
Source_Language => Ada; Source_Language => (Ada);
end Receive; end Receive;
------------- -------------
...@@ -130,7 +130,7 @@ public ...@@ -130,7 +130,7 @@ public
properties properties
Source_Name => "PolyORB_HI_Drivers_GRSPW.Send"; Source_Name => "PolyORB_HI_Drivers_GRSPW.Send";
Source_Language => Ada; Source_Language => (Ada);
end Send; end Send;
end GRSPW; end GRSPW;
...@@ -106,7 +106,7 @@ public ...@@ -106,7 +106,7 @@ public
properties properties
Source_Name => "PolyORB_HI_Drivers_GRUART.Initialize"; Source_Name => "PolyORB_HI_Drivers_GRUART.Initialize";
Source_Language => Ada; Source_Language => (Ada);
end Initialize; end Initialize;
------------- -------------
...@@ -119,7 +119,7 @@ public ...@@ -119,7 +119,7 @@ public
properties properties
Source_Name => "PolyORB_HI_Drivers_GRUART.Receive"; Source_Name => "PolyORB_HI_Drivers_GRUART.Receive";
Source_Language => Ada; Source_Language => (Ada);
end Receive; end Receive;
------------- -------------
...@@ -132,7 +132,7 @@ public ...@@ -132,7 +132,7 @@ public
properties properties
Source_Name => "PolyORB_HI_Drivers_GRUART.Send"; Source_Name => "PolyORB_HI_Drivers_GRUART.Send";
Source_Language => Ada; Source_Language => (Ada);
end Send; end Send;
end GRUART; end GRUART;
...@@ -8,20 +8,20 @@ with ocarina_drivers; ...@@ -8,20 +8,20 @@ with ocarina_drivers;
subprogram spg_leon_eth_poller subprogram spg_leon_eth_poller
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_eth_leon_poller"; Source_Name => "__po_hi_c_driver_eth_leon_poller";
end spg_leon_eth_poller; end spg_leon_eth_poller;
subprogram spg_leon_eth_sender subprogram spg_leon_eth_sender
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_eth_leon_sender"; Source_Name => "__po_hi_c_driver_eth_leon_sender";
end spg_leon_eth_sender; end spg_leon_eth_sender;
subprogram spg_leon_eth_init subprogram spg_leon_eth_init
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_eth_leon_init"; Source_Name => "__po_hi_c_driver_eth_leon_init";
end spg_leon_eth_init; end spg_leon_eth_init;
......
...@@ -8,26 +8,26 @@ with ocarina_drivers; ...@@ -8,26 +8,26 @@ with ocarina_drivers;
subprogram spg_serial_poller_leon subprogram spg_serial_poller_leon
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_serial_leon_poller"; Source_Name => "__po_hi_c_driver_serial_leon_poller";
end spg_serial_poller_leon; end spg_serial_poller_leon;
subprogram spg_serial_sender_leon subprogram spg_serial_sender_leon
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_serial_leon_sender"; Source_Name => "__po_hi_c_driver_serial_leon_sender";
end spg_serial_sender_leon; end spg_serial_sender_leon;
subprogram spg_serial_init_leon subprogram spg_serial_init_leon
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_serial_leon_init"; Source_Name => "__po_hi_c_driver_serial_leon_init";
end spg_serial_init_leon; end spg_serial_init_leon;
subprogram spg_serial_init_leon_sender subprogram spg_serial_init_leon_sender
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_serial_leon_init_sender"; Source_Name => "__po_hi_c_driver_serial_leon_init_sender";
end spg_serial_init_leon_sender; end spg_serial_init_leon_sender;
......
...@@ -104,7 +104,7 @@ public ...@@ -104,7 +104,7 @@ public
properties properties
Source_Name => "PolyORB_HI_Drivers_Native_UART.Initialize"; Source_Name => "PolyORB_HI_Drivers_Native_UART.Initialize";
Source_Language => Ada; Source_Language => (Ada);
end Initialize; end Initialize;
------------- -------------
...@@ -117,7 +117,7 @@ public ...@@ -117,7 +117,7 @@ public
properties properties
Source_Name => "PolyORB_HI_Drivers_Native_UART.Receive"; Source_Name => "PolyORB_HI_Drivers_Native_UART.Receive";
Source_Language => Ada; Source_Language => (Ada);
end Receive; end Receive;
------------- -------------
...@@ -130,7 +130,7 @@ public ...@@ -130,7 +130,7 @@ public
properties properties
Source_Name => "PolyORB_HI_Drivers_Native_UART.Send"; Source_Name => "PolyORB_HI_Drivers_Native_UART.Send";
Source_Language => Ada; Source_Language => (Ada);
end Send; end Send;
end Native_UART; end Native_UART;
...@@ -5,39 +5,39 @@ with Deployment; ...@@ -5,39 +5,39 @@ with Deployment;
subprogram spg_1553_controller_rasta subprogram spg_1553_controller_rasta
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_1553_rasta_controller"; Source_Name => "__po_hi_c_driver_1553_rasta_controller";
end spg_1553_controller_rasta; end spg_1553_controller_rasta;
subprogram spg_1553_poller_rasta_terminal subprogram spg_1553_poller_rasta_terminal
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_1553_rasta_terminal_poller"; Source_Name => "__po_hi_c_driver_1553_rasta_terminal_poller";
end spg_1553_poller_rasta_terminal; end spg_1553_poller_rasta_terminal;
subprogram spg_1553_sender_rasta_controller subprogram spg_1553_sender_rasta_controller
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_1553_rasta_sender_controller"; Source_Name => "__po_hi_c_driver_1553_rasta_sender_controller";
end spg_1553_sender_rasta_controller; end spg_1553_sender_rasta_controller;
subprogram spg_1553_sender_rasta_terminal subprogram spg_1553_sender_rasta_terminal
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_1553_rasta_sender_terminal"; Source_Name => "__po_hi_c_driver_1553_rasta_sender_terminal";
end spg_1553_sender_rasta_terminal; end spg_1553_sender_rasta_terminal;
subprogram spg_1553_init_rasta_controller subprogram spg_1553_init_rasta_controller
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_1553_rasta_init_controller"; Source_Name => "__po_hi_c_driver_1553_rasta_init_controller";
end spg_1553_init_rasta_controller; end spg_1553_init_rasta_controller;
subprogram spg_1553_init_rasta_terminal subprogram spg_1553_init_rasta_terminal
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_1553_rasta_init_terminal"; Source_Name => "__po_hi_c_driver_1553_rasta_init_terminal";
end spg_1553_init_rasta_terminal; end spg_1553_init_rasta_terminal;
......
...@@ -8,14 +8,14 @@ with ocarina_drivers; ...@@ -8,14 +8,14 @@ with ocarina_drivers;
subprogram spg_serial_poller_rasta subprogram spg_serial_poller_rasta
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_serial_rasta_poller"; Source_Name => "__po_hi_c_driver_serial_rasta_poller";
end spg_serial_poller_rasta; end spg_serial_poller_rasta;
subprogram spg_serial_sender_rasta subprogram spg_serial_sender_rasta
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_serial_rasta_sender"; Source_Name => "__po_hi_c_driver_serial_rasta_sender";
end spg_serial_sender_rasta; end spg_serial_sender_rasta;
...@@ -24,7 +24,7 @@ end spg_serial_sender_rasta; ...@@ -24,7 +24,7 @@ end spg_serial_sender_rasta;
subprogram spg_serial_init_rasta subprogram spg_serial_init_rasta
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_serial_rasta_init"; Source_Name => "__po_hi_c_driver_serial_rasta_init";
end spg_serial_init_rasta; end spg_serial_init_rasta;
......
...@@ -7,19 +7,19 @@ with Deployment; ...@@ -7,19 +7,19 @@ with Deployment;
subprogram spg_spacewire_poller_rasta subprogram spg_spacewire_poller_rasta
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_spacewire_rasta_poller"; Source_Name => "__po_hi_c_driver_spacewire_rasta_poller";
end spg_spacewire_poller_rasta; end spg_spacewire_poller_rasta;
subprogram spg_spacewire_sender_rasta subprogram spg_spacewire_sender_rasta
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_spacewire_rasta_sender"; Source_Name => "__po_hi_c_driver_spacewire_rasta_sender";
end spg_spacewire_sender_rasta; end spg_spacewire_sender_rasta;
subprogram spg_spacewire_init_rasta subprogram spg_spacewire_init_rasta
properties properties
Source_Language => C; Source_Language => (C);
Source_Name => "__po_hi_c_driver_spacewire_rasta_init"; Source_Name => "__po_hi_c_driver_spacewire_rasta_init";
end spg_spacewire_init_rasta; end spg_spacewire_init_rasta;
......