Commit 64528e6b authored by jdelange's avatar jdelange

* aadlv2/ping/software.aadl

   - Fix issues related to XTratum and integrate
     code useful for the ERTS12 case study


git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/po-hi-c@3425 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 0acf7002
#include <drivers/configuration/spacewire.h>
__po_hi_c_spacewire_conf_t pohidrv_device_a = {
__po_hi_c_spacewire_conf_t pohidrv_device_a =
{
.devname = "/dev/grspwrasta0",
.nodeaddr = 22
};
__po_hi_c_spacewire_conf_t pohidrv_device_b = {
__po_hi_c_spacewire_conf_t pohidrv_device_b =
{
.devname = "/dev/grspwrasta0",
.nodeaddr = 22
};
......
#include <drivers/configuration/ip.h>
__po_hi_c_ip_conf_t pohidrv_device_a = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1234};
__po_hi_c_ip_conf_t pohidrv_device_b = { "eth0", "127.0.0.1", __po_hi_c_ipv4, 1235};
__po_hi_c_ip_conf_t pohidrv_device_a = { .devname = "eth0", .address = "127.0.0.1", .version = __po_hi_c_ipv4, .port = 1234};
__po_hi_c_ip_conf_t pohidrv_device_b = { .devname = "eth0", .address = "127.0.0.1", .version = __po_hi_c_ipv4, .port = 1235};
......@@ -17,7 +17,7 @@ end A;
process implementation A.Impl
subcomponents
Pinger : thread Software::P.Impl{Deadline => 5000 ms ; Period => 5000 ms;};
Pinger : thread Software::P.Impl;
connections
port Pinger.Data_Source -> Data_Source;
end A.Impl;
......@@ -44,14 +44,13 @@ Mycalls: {
};
properties
Dispatch_Protocol => Periodic;
Period => 5000 Ms;
Compute_Execution_time => 0 ms .. 3 ms;
Deadline => 5000 ms;
Period => 10 Ms;
Deadline => 10 ms;
end xtratum_poller.i;
process implementation B.Impl
subcomponents
Ping_Me : thread Software::Q.Impl {Deadline => 5000 ms ; Period => 5000 ms;};
Ping_Me : thread Software::Q.Impl ;
poll_port : thread xtratum_poller.i;
connections
port Data_Sink -> Ping_Me.Data_Sink;
......@@ -101,9 +100,9 @@ subcomponents
part2 : virtual processor xtratum_partition.generic
{ Deployment::Execution_Platform => LEON3_XM3;};
properties
ARINC653::Partition_Slots => (5000ms, 5000ms);
ARINC653::Partition_Slots => (20ms, 20ms);
ARINC653::Slots_Allocation => (reference (part1), reference (part2));
ARINC653::Module_Major_Frame => 10000ms;
ARINC653::Module_Major_Frame => 40ms;
end leon3.xtratum_2partitions;
------------
......
......@@ -62,9 +62,8 @@ connections
properties
Recover_Entrypoint_Source_Text => "recover";
Dispatch_Protocol => Periodic;
Period => 1000 Ms;
Compute_Execution_time => 0 ms .. 3 ms;
Deadline => 1000 ms;
Period => 10 Ms;
Deadline => 10 ms;
Priority => 2;
end P.Impl;
......@@ -84,7 +83,6 @@ properties
Dispatch_Protocol => Sporadic;
Period => 10 Ms;
deadline => 10 Ms;
Compute_Execution_time => 0 ms .. 3 ms;
Priority => 1;
end Q.Impl;
......
#include <stdio.h>
#include <deployment.h>
#include <po_hi_debug.h>
#include <po_hi_types.h>
#include <po_hi_transport.h>
#include <po_hi_gqueue.h>
......@@ -42,7 +43,7 @@ void user_ports_polling ()
sizeof (__po_hi_request_t));
}
printf ("[XTRATUM POLLER] Poll port %d, corresponding xtratum port = %d, return=%d\n", portno, __po_hi_transport_xtratum_get_port (portno), ret);
__DEBUGMSG ("[XTRATUM POLLER] Poll port %d, corresponding xtratum port = %d, return=%d\n", portno, __po_hi_transport_xtratum_get_port (portno), ret);
if (ret > 0)
{
......
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