Commit 8dada1b5 authored by jhugues's avatar jhugues
Browse files

* Update examples to use configuration variables



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/po-hi-ada@2524 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 639cf214
......@@ -21,13 +21,13 @@ public
device GRRASTAFPGA_Device
features
CPCI_Slot : requires bus access Generic_Bus::Generic_Bus.impl;
-- Connection to the remote node
-- Connection to the remote node
end GRRASTAFPGA_Device;
device implementation GRRASTAFPGA_Device.impl
properties
Implemented_As =>
Implemented_As =>
classifier (GRRASTAFPGA::Driver_GRRASTAFPGA.impl);
Initialize_Entrypoint => classifier (GRRASTAFPGA::Initialize);
end GRRASTAFPGA_Device.impl;
......@@ -45,6 +45,7 @@ public
abstract implementation Driver_GRRASTAFPGA.impl
subcomponents
receiver : thread Driver_GRRASTAFPGA_thread_receiver.impl;
sender : subprogram Send;
end Driver_GRRASTAFPGA.impl;
-------------
......@@ -56,7 +57,7 @@ public
-- messages.
thread Driver_GRRASTAFPGA_thread_receiver
-- This thread is dispatched when an event is detected on the
-- real hardware. It then calls receive to handle the incoming
-- event.
......@@ -67,7 +68,7 @@ public
end Driver_GRRASTAFPGA_thread_receiver;
thread implementation Driver_GRRASTAFPGA_thread_receiver.impl
calls
calls
call1 : { pspg : subprogram receive; };
end Driver_GRRASTAFPGA_thread_receiver.impl;
......
......@@ -6,14 +6,14 @@ package GRSPW
-- integrated with the runtime low level interface.
--
-- To configure this interface, you should use the
-- Deployment::Configuration property with the following format:
-- Deployment::Configuration property with the following format:
-- "spacewire Sender_Core_id Receiver_Core_Id"
--
-- e.g.
--
-- spw : device GRSPW::GRSPW_Device
-- {Deployment::Configuration => "spacewire 1 2"};
--
--
public
......@@ -31,13 +31,13 @@ public
device GRSPW_Device
features
LVDS_Wire : requires bus access Generic_Bus::Generic_Bus.impl;
-- Connection to the remote node
-- Connection to the remote node
end GRSPW_Device;
device implementation GRSPW_Device.impl
properties
Implemented_As =>
Implemented_As =>
classifier (GRSPW::Driver_GRSPW_Protocol.impl);
Initialize_Entrypoint => classifier (GRSPW::Initialize);
end GRSPW_Device.impl;
......@@ -55,6 +55,7 @@ public
abstract implementation Driver_GRSPW_Protocol.impl
subcomponents
receiver : thread Driver_GRSPW_Protocol_thread_receiver.impl;
sender : subprogram Send;
end Driver_GRSPW_Protocol.impl;
-------------
......@@ -66,7 +67,7 @@ public
-- messages.
thread Driver_GRSPW_Protocol_thread_receiver
-- This thread is dispatched when an event is detected on the
-- real hardware. It then calls receive to handle the incoming
-- event.
......@@ -77,7 +78,7 @@ public
end Driver_GRSPW_Protocol_thread_receiver;
thread implementation Driver_GRSPW_Protocol_thread_receiver.impl
calls
calls
call1 : { pspg : subprogram receive; };
end Driver_GRSPW_Protocol_thread_receiver.impl;
......
......@@ -6,14 +6,14 @@ package GRUART
-- integrated with the runtime low level interface.
--
-- To configure this interface, you should use the
-- Deployment::Configuration property with the following format:
-- Deployment::Configuration property with the following format:
-- "serial DEVICE BAUDS DATA_BITS PARITY STOP_BIT"
--
-- e.g.
--
-- uart : device GRUART::GRUART_Device
-- {Deployment::Configuration => "serial /dev/ttyS0 9600 8 N 1"
--
--
public
......@@ -31,13 +31,13 @@ public
device GRUART_Device
features
DB9_Wire : requires bus access Generic_Bus::Generic_Bus.impl;
-- Connection to the remote node
-- Connection to the remote node
end GRUART_Device;
device implementation GRUART_Device.impl
properties
Implemented_As =>
Implemented_As =>
classifier (GRUART::Driver_GRUART_Protocol.impl);
Initialize_Entrypoint => classifier (GRUART::Initialize);
end GRUART_Device.impl;
......@@ -55,6 +55,7 @@ public
abstract implementation Driver_GRUART_Protocol.impl
subcomponents
receiver : thread Driver_GRUART_Protocol_thread_receiver.impl;
sender : subprogram Send;
end Driver_GRUART_Protocol.impl;
-------------
......@@ -66,7 +67,7 @@ public
-- messages.
thread Driver_GRUART_Protocol_thread_receiver
-- This thread is dispatched when an event is detected on the
-- real hardware. It then calls receive to handle the incoming
-- event.
......@@ -78,7 +79,7 @@ public
end Driver_GRUART_Protocol_thread_receiver;
thread implementation Driver_GRUART_Protocol_thread_receiver.impl
calls
calls
call1 : { pspg : subprogram receive; };
end Driver_GRUART_Protocol_thread_receiver.impl;
......
......@@ -5,14 +5,14 @@ package Native_UART
-- integrated with the runtime low level interface.
--
-- To configure this interface, you should use the
-- Deployment::Configuration property with the following format:
-- Deployment::Configuration property with the following format:
-- "serial DEVICE BAUDS DATA_BITS PARITY STOP_BIT"
--
-- e.g.
--
-- uart : device GRUART::GRUART_Device
-- {Deployment::Configuration => "serial /dev/ttyS0 9600 8 N 1"
--
--
public
......@@ -29,13 +29,13 @@ public
device Native_UART_Device
features
DB9_Wire : requires bus access Generic_Bus::Generic_Bus.impl;
-- Connection to the remote node
-- Connection to the remote node
end Native_UART_Device;
device implementation Native_UART_Device.impl
properties
Implemented_As =>
Implemented_As =>
classifier (Native_UART::Driver_Native_UART_Protocol.impl);
Initialize_Entrypoint => classifier (Native_UART::Initialize);
end Native_UART_Device.impl;
......@@ -53,6 +53,7 @@ public
abstract implementation Driver_Native_UART_Protocol.impl
subcomponents
receiver : thread Driver_Native_UART_Protocol_thread_receiver.impl;
sender : subprogram Send;
end Driver_Native_UART_Protocol.impl;
-------------
......@@ -64,7 +65,7 @@ public
-- messages.
thread Driver_Native_UART_Protocol_thread_receiver
-- This thread is dispatched when an event is detected on the
-- real hardware. It then calls receive to handle the incoming
-- event.
......@@ -76,7 +77,7 @@ public
end Driver_Native_UART_Protocol_thread_receiver;
thread implementation Driver_Native_UART_Protocol_thread_receiver.impl
calls
calls
call1 : { pspg : subprogram receive; };
end Driver_Native_UART_Protocol_thread_receiver.impl;
......
package System_Demo
package System_Demo
-- This system combines generic native hardware, TCP/IP protocol stack
-- and some software to build a full ping demo.
......@@ -20,10 +20,10 @@ public
---------------
-- PROCESSES --
---------------
process Process_Zero
end Process_Zero;
process implementation Process_Zero.Impl
subcomponents
Pinger : thread Software::Pinger.Impl;
......@@ -37,7 +37,7 @@ public
Out_Port : out event data port Software::Simple_Type;
In_Port : in event data port Software::Simple_Type;
end Process_Simple;
process implementation Process_Simple.Impl
subcomponents
Pinger : thread Software::Pinger.Impl;
......@@ -54,7 +54,7 @@ public
Out_Port2 : out event data port Software::Simple_Type;
In_Port2 : in event data port Software::Simple_Type;
end Process_Full;
process implementation Process_Full.Impl
subcomponents
Pinger : thread Software::Pinger.Impl;
......@@ -73,7 +73,7 @@ public
------------
system The_Demo
end The_Demo;
end The_Demo;
---------------------------------------------------------------------------
......@@ -85,7 +85,7 @@ public
--
-- It shows how GRUART and SpaceWire drivers interact on one node.
subcomponents
subcomponents
Bus_SpaceWire : bus Generic_Bus::Generic_Bus.impl;
Bus_UART : bus Generic_Bus::Generic_Bus.impl;
......@@ -96,12 +96,12 @@ public
Memory_1 : memory GR_CPCI_X4CV::Memory_Segment.impl;
GRSPW_Cnx_1 : device GRSPW::GRSPW_Device.impl
{ Deployment::Location => "spacewire 1 2";
{ Deployment::Location => "spacewire 1 2";
-- Configure SpaceWire core #1 to send, #2 to receive
};
GRUART_Cnx_1 : device GRUART::GRUART_Device.impl
{ Deployment::Location => "1:2";
-- Configure UART port #1 to send, #2 to receive
Type_Source_Name => "DeviceConfig_serialleon_obj179.pohidrv_serialleon_obj179_cv"; -- Configure UART port #1 to send, #2 to receive
};
-- Node #1 software components
......@@ -121,9 +121,9 @@ public
properties
Actual_Processor_Binding => (reference (Processor_1)) applies to Node_1;
Actual_Processor_Binding => (reference (Processor_1))
Actual_Processor_Binding => (reference (Processor_1))
applies to GRSPW_Cnx_1;
Actual_Processor_Binding => (reference (Processor_1))
Actual_Processor_Binding => (reference (Processor_1))
applies to GRUART_Cnx_1;
end The_Demo.Full;
......@@ -137,7 +137,7 @@ public
--
-- It shows operation of the SpaceWire driver.
subcomponents
subcomponents
Bus_SpaceWire : bus Generic_Bus::Generic_Bus.impl;
......@@ -147,7 +147,7 @@ public
Memory_1 : memory GR_CPCI_X4CV::Memory_Segment.impl;
GRSPW_Cnx_1 : device GRSPW::GRSPW_Device.impl
{ Deployment::Location => "spacewire 1 2";
{ Deployment::Location => "spacewire 1 2";
-- Configure SpaceWire core #1 to send, #2 to receive
};
......@@ -164,7 +164,7 @@ public
properties
Actual_Processor_Binding => (reference (Processor_1)) applies to Node_1;
Actual_Processor_Binding => (reference (Processor_1))
Actual_Processor_Binding => (reference (Processor_1))
applies to GRSPW_Cnx_1;
end The_Demo.SpW;
......@@ -172,13 +172,13 @@ public
---------------------------------------------------------------------------
system implementation The_Demo.UART
-- Note: this setting assumes one RASTA board, with UART DSU #1
-- connected to UART DSU #2.
--
-- It shows operation of the GRUART driver.
subcomponents
subcomponents
Bus_UART : bus Generic_Bus::Generic_Bus.impl;
......@@ -190,7 +190,7 @@ public
GRUART_Cnx_1 : device GRUART::GRUART_Device.impl
{ Deployment::Location => "1:2";
-- Configure UART port #1 to send, #2 to receive
Type_Source_Name => "DeviceConfig_serialleon_obj179.pohidrv_serialleon_obj179_cv"; -- Configure UART port #1 to send, #2 to receive
};
-- Node #1 software components
......@@ -206,7 +206,7 @@ public
properties
Actual_Processor_Binding => (reference (Processor_1)) applies to Node_1;
Actual_Processor_Binding => (reference (Processor_1))
Actual_Processor_Binding => (reference (Processor_1))
applies to GRUART_Cnx_1;
end The_Demo.UART;
......@@ -214,10 +214,10 @@ public
---------------------------------------------------------------------------
system implementation The_Demo.UART_Native
-- XXX
subcomponents
-- XXX
subcomponents
Bus_UART : bus Generic_Bus::Generic_Bus.impl;
......@@ -228,7 +228,9 @@ public
Memory_1 : memory Generic_Native::Memory_Segment.impl;
UART_Cnx_1 : device Native_UART::Native_UART_Device.impl
{ Deployment::Location => "serial /dev/ttyS0 19200 8 N 1"; };
{ Deployment::Location => "serial /dev/ttyS0 19200 8 N 1";
Type_Source_Name => "DeviceConfig_serialleon_obj179.pohidrv_serialleon_obj179_cv";
};
-- Node #1 software components
......@@ -243,7 +245,7 @@ public
properties
Actual_Processor_Binding => (reference (Processor_1)) applies to Node_1;
Actual_Processor_Binding => (reference (Processor_1))
Actual_Processor_Binding => (reference (Processor_1))
applies to UART_Cnx_1;
end The_Demo.UART_Native;
......@@ -251,13 +253,13 @@ public
---------------------------------------------------------------------------
system implementation The_Demo.UART_2
-- Note: this setting assumes one RASTA board and a Native
-- platform, with UART DSU #1 connected to Native platform UART.
--
-- It shows operation of the GRUART driver.
subcomponents
subcomponents
Bus_UART : bus Generic_Bus::Generic_Bus.impl;
......@@ -269,7 +271,7 @@ public
GRUART_Cnx_1 : device GRUART::GRUART_Device.impl
{ Deployment::Location => "1:2";
-- Configure UART port #1 to send, #2 to receive
Type_Source_Name => "DeviceConfig_serialleon_obj179.pohidrv_serialleon_obj179_cv"; -- Configure UART port #1 to send, #2 to receive
};
-- Node #1 software components
......@@ -284,6 +286,7 @@ public
GRUART_Cnx_2 : device Native_UART::Native_UART_Device.impl
{ Deployment::Location => "1:2";
Type_Source_Name => "DeviceConfig_serialleon_obj179.pohidrv_serialleon_obj179_cv";
-- Configure UART port #1 to send, #2 to receive
};
......@@ -304,11 +307,11 @@ public
properties
Actual_Processor_Binding => (reference (Processor_1)) applies to Node_1;
Actual_Processor_Binding => (reference (Processor_1))
Actual_Processor_Binding => (reference (Processor_1))
applies to GRUART_Cnx_1;
Actual_Processor_Binding => (reference (Processor_2)) applies to Node_2;
Actual_Processor_Binding => (reference (Processor_2))
Actual_Processor_Binding => (reference (Processor_2))
applies to GRUART_Cnx_2;
end The_Demo.UART_2;
......@@ -320,7 +323,7 @@ public
-- Note: this setting assumes one node, without particular
-- hardware, to test internal communication.
subcomponents
subcomponents
-- Node #1 hardware components
......@@ -345,7 +348,7 @@ public
-- Note: this setting assumes one node, without particular
-- hardware, to test internal communication.
subcomponents
subcomponents
-- Node #1 hardware components
......@@ -364,13 +367,13 @@ public
---------------------------------------------------------------------------
system implementation The_Demo.RASTA_FPGA
-- Note: this setting assumes one RASTA board, with RASTA_FPGA DSU #1
-- connected to RASTA_FPGA DSU #2.
--
-- It shows operation of the GRRASTA_FPGA driver.
subcomponents
subcomponents
Bus_RASTA_FPGA : bus Generic_Bus::Generic_Bus.impl;
......@@ -398,7 +401,7 @@ public
properties
Actual_Processor_Binding => (reference (Processor_1)) applies to Node_1;
Actual_Processor_Binding => (reference (Processor_1))
Actual_Processor_Binding => (reference (Processor_1))
applies to GRRASTAFPGA_Cnx_1;
end The_Demo.RASTA_FPGA;
......
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