Commit 28c4f36e authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files

Merged from upstream.

parents bba65b9b 29097a6d
......@@ -5,6 +5,8 @@ CLEANFILES = config-stamp svn-commit*.tmp* *~
SUBDIRS = src support tools share include doc
DIST_SUBDIRS = $(SUBDIRS) examples
EXTRA_DIST = $(top_srcdir)/Makefile.common
check-local:: examples
examples:: install
......
################################################################################
# GNU indent configuration
# ========================
#
# -bacc : blank line around conditional compilation block
# -bad : blank line after block of declarations
# -bap : blank link after procedure body
# -bfda : break the line before all arguments in a declaration
# -nbc : no blank line after each comma in declaration
# -br : move braces closer to the if
# -brf : put braces on function definition line
# -ncdb : no comment delimiters on blank lines
# -ce : cuddle else and preceding '}'
# -ci<n> : sets the continuation indent to n
# -di<n> : put variables in column n
# -lp : line up continued lines at parentheses
# -nfc1 : do not format comments that start in column 1
# -npcs : do not put space after the function in function calls
# -npsl : put the type of a procedure on the same line as its name
# -nut : disable the use of tab
# -i2 : 2 spaces per indentation level
# -l78 : length of an output line set to 78
# -npro : ignore profile file
INDENT_FLAGS= -bacc -bad -bap -nbc -br -brf -ncdb -ce -ci2 -cli2 \
-nfc1 -npcs -npsl -nut -lp -i2 -l78 -npro -bfda
.PHONY: indent-local
indent-local:
VERSION_CONTROL=none ; for f in $(shell ls *.?); do gindent $(INDENT_FLAGS) $$f ; done
......@@ -58,28 +58,28 @@ NATIVE_LDFLAGS=""
SIMULINK_LDFLAGS=""
case ${host_os} in
*darwin*)
NATIVE_CFLAGS="${NATIVE_CFLAGS} -DPOSIX -D_XOPEN_SOURCE"
NATIVE_LDFLAGS="${NATIVE_LDFLAGS} -lpthread"
;;
*solaris*10*)
NATIVE_LDFLAGS="${NATIVE_LDFLAGS} -lrt"
;;
*freebsd*)
NATIVE_CFLAGS="${NATIVE_CFLAGS} -DPOSIX -D_GNU_SOURCE"
NATIVE_LDFLAGS="${NATIVE_LDFLAGS} -lpthread -lrt"
SIMULINK_LDFLAGS="-lm"
;;
*cygwin*)
NATIVE_CFLAGS="${NATIVE_CFLAGS} -D_GNU_SOURCE"
NATIVE_LDFLAGS="${NATIVE_LDFLAGS} -lpthread -lwsock32"
SIMULINK_LDFLAGS="-lm"
;;
*)
NATIVE_CFLAGS="${NATIVE_CFLAGS} -DPOSIX -D_POSIX_SOURCE -D_GNU_SOURCE"
NATIVE_LDFLAGS="${NATIVE_LDFLAGS} -lpthread -lrt"
SIMULINK_LDFLAGS="-lm"
;;
*darwin*)
NATIVE_CFLAGS="${NATIVE_CFLAGS} -DPOSIX -D_XOPEN_SOURCE"
NATIVE_LDFLAGS="${NATIVE_LDFLAGS} -lpthread"
;;
*solaris*10*)
NATIVE_LDFLAGS="${NATIVE_LDFLAGS} -lrt"
;;
*freebsd*)
NATIVE_CFLAGS="${NATIVE_CFLAGS} -DPOSIX -D_GNU_SOURCE"
NATIVE_LDFLAGS="${NATIVE_LDFLAGS} -lpthread -lrt"
SIMULINK_LDFLAGS="-lm"
;;
*cygwin*)
NATIVE_CFLAGS="${NATIVE_CFLAGS} -D_GNU_SOURCE"
NATIVE_LDFLAGS="${NATIVE_LDFLAGS} -lpthread -lwsock32"
SIMULINK_LDFLAGS="-lm"
;;
*)
NATIVE_CFLAGS="${NATIVE_CFLAGS} -DPOSIX -D_POSIX_SOURCE -D_GNU_SOURCE"
NATIVE_LDFLAGS="${NATIVE_LDFLAGS} -lpthread -lrt"
SIMULINK_LDFLAGS="-lm"
;;
esac
AC_CHECK_LIB(socket, socket, [NATIVE_LDFLAGS="${NATIVE_LDFLAGS} -lsocket"])
......@@ -102,21 +102,21 @@ AC_ARG_ENABLE(debug,
* debug - useful for debugging purpose
* info - ALL informations about the system],
[ case ${enableval} in
info)
info)
AC_DEFINE_UNQUOTED(__PO_HI_DEBUG_LEVEL, 12, "Debug level - show ALL potential informations.")
;;
debug)
;;
debug)
AC_DEFINE_UNQUOTED(__PO_HI_DEBUG_LEVEL, 10, "Warning - information that can show errors but are not so important")
;;
warning)
;;
warning)
AC_DEFINE_UNQUOTED(__PO_HI_DEBUG_LEVEL, 6, "Warning - Errors that will imply a minor error at run-tine")
;;
critical)
;;
critical)
AC_DEFINE_UNQUOTED(__PO_HI_DEBUG_LEVEL, 4, "Critical - Errors that will imply a fault or a crash")
;;
*)
;;
*)
AC_DEFINE_UNQUOTED(__PO_HI_DEBUG_LEVEL, 0, "None - Do not print anything")
;;
;;
esac])
AC_ARG_ENABLE(giop,
......@@ -186,64 +186,59 @@ dnl may, one day, be edited automatically to remove
dnl some entries.
AC_OUTPUT([
Makefile
doc/Makefile
src/Makefile
src/drivers/Makefile
src/drivers/configuration/Makefile
Makefile
doc/Makefile
src/Makefile
src/drivers/Makefile
src/drivers/configuration/Makefile
src/monitoring/Makefile
src/monitoring/cheddar_scheduling/Makefile
src/python/Makefile
src/simulator/Makefile
include/Makefile
include/drivers/Makefile
include/drivers/configuration/Makefile
include/Makefile
include/drivers/Makefile
include/drivers/configuration/Makefile
include/monitoring/Makefile
include/simulator/Makefile
examples/Makefile
examples/aadlv1/Makefile
examples/aadlv1/d3.1.3-1/Makefile
examples/aadlv1/ping/Makefile
examples/aadlv1/flight-mgmt/Makefile
examples/aadlv1/rma/Makefile
examples/aadlv1/sunseeker/Makefile
examples/aadlv2/Makefile
examples/aadlv2/cpp/Makefile
examples/aadlv2/d3.1.3-1/Makefile
examples/aadlv2/import/Makefile
examples/aadlv2/ping/Makefile
examples/aadlv2/lua/Makefile
examples/aadlv2/producer-consumer/Makefile
examples/aadlv2/flight-mgmt/Makefile
examples/aadlv2/monitor/Makefile
examples/aadlv2/packet-store/Makefile
examples/aadlv2/file-store/Makefile
examples/aadlv2/rma/Makefile
examples/aadlv2/some-types/Makefile
examples/aadlv2/some-types-stdint/Makefile
examples/aadlv2/sunseeker/Makefile
tools/Makefile
tools/check-symbols/Makefile
tools/check-symbols/examples/Makefile
tools/check-symbols/examples/malloc/Makefile
tools/check-symbols/examples/strings/Makefile
tools/check-symbols/src/Makefile
share/Makefile
share/lua/Makefile
share/lua/libs/Makefile
share/lua/include/Makefile
share/cheddar/Makefile
share/models/Makefile
share/ocarina/Makefile
share/tsim/Makefile
share/make/Makefile
share/utils/Makefile
share/make/Makefile.common
share/make/Makefile.native
share/config/Makefile
share/config/spif-rtems/Makefile
share/config/leon-rtems/Makefile
share/config/nds-rtems/Makefile
share/config/gumstix-rtems/Makefile
support/Makefile
examples/Makefile
examples/aadlv1/Makefile
examples/aadlv1/d3.1.3-1/Makefile
examples/aadlv1/ping/Makefile
examples/aadlv1/flight-mgmt/Makefile
examples/aadlv1/rma/Makefile
examples/aadlv1/sunseeker/Makefile
examples/aadlv2/Makefile
examples/aadlv2/cpp/Makefile
examples/aadlv2/d3.1.3-1/Makefile
examples/aadlv2/import/Makefile
examples/aadlv2/ping/Makefile
examples/aadlv2/lua/Makefile
examples/aadlv2/producer-consumer/Makefile
examples/aadlv2/flight-mgmt/Makefile
examples/aadlv2/monitor/Makefile
examples/aadlv2/packet-store/Makefile
examples/aadlv2/file-store/Makefile
examples/aadlv2/rma/Makefile
examples/aadlv2/some-types/Makefile
examples/aadlv2/some-types-stdint/Makefile
examples/aadlv2/sunseeker/Makefile
tools/Makefile
tools/check-symbols/Makefile
tools/check-symbols/examples/Makefile
tools/check-symbols/examples/malloc/Makefile
tools/check-symbols/examples/strings/Makefile
tools/check-symbols/src/Makefile
share/Makefile
share/lua/Makefile
share/lua/libs/Makefile
share/lua/include/Makefile
share/cheddar/Makefile
share/models/Makefile
share/ocarina/Makefile
share/tsim/Makefile
share/make/Makefile
share/utils/Makefile
share/make/Makefile.common
share/make/Makefile.native
support/Makefile
])
......@@ -10,7 +10,7 @@ properties
("cpptest", "cpptest.ref");
Ocarina_Config::AADL_Files =>
("cpp_test.aadl", "devices.aadl",
"buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Root_System_Name => "cpp_test.RTEMS";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
......@@ -22,4 +22,3 @@ end cpptest;
system implementation cpptest.Impl
end cpptest.Impl;
......@@ -6,7 +6,7 @@ properties
"node_b", "node_b.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl",
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Root_System_Name => "PING.impl";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
......@@ -19,4 +19,3 @@ end ping;
system implementation ping.impl
end ping.impl;
......@@ -5,7 +5,7 @@ properties
("node_a", "node_a.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl",
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Root_System_Name => "PING.local";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
......@@ -17,4 +17,3 @@ end ping;
system implementation ping.impl
end ping.impl;
......@@ -5,7 +5,7 @@ properties
("node_a", "node_a.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl",
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Root_System_Name => "PING.RTEMS";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
......@@ -17,4 +17,3 @@ end ping;
system implementation ping.impl
end ping.impl;
......@@ -10,7 +10,7 @@ properties
("mgmt", "mgmt.ref");
Ocarina_Config::AADL_Files =>
("flt_mgmt.aadl", "software.aadl",
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Root_System_Name => "Flight_Mgmt.RTEMS";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
......@@ -22,4 +22,3 @@ end Flight_Management;
system implementation Flight_Management.Impl
end Flight_Management.Impl;
......@@ -11,7 +11,7 @@ properties
"node_b", "node_b_native.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl", "software.aadl",
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
......@@ -23,4 +23,3 @@ end import;
system implementation import.Impl
end import.Impl;
......@@ -6,7 +6,7 @@ properties
"node_b", "node_b.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl",
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
......@@ -18,4 +18,3 @@ end ping;
system implementation ping.impl
end ping.impl;
......@@ -6,7 +6,7 @@ properties
"node_b", "node_b.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl",
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Root_System_Name => "PING.impl";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
......@@ -19,4 +19,3 @@ end ping;
system implementation ping.impl
end ping.impl;
......@@ -5,7 +5,7 @@ properties
("node_a", "node_a.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl",
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Root_System_Name => "PING.Local";
Ocarina_Config::Generator => polyorb_hi_c;
......@@ -18,4 +18,3 @@ end ping;
system implementation ping.impl
end ping.impl;
......@@ -5,7 +5,7 @@ properties
("node_a", "node_a.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl",
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"devices", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Root_System_Name => "PING.RTEMS";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
......@@ -17,4 +17,3 @@ end ping;
system implementation ping.impl
end ping.impl;
......@@ -5,7 +5,7 @@ properties
("node_a", "node_a.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl",
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Root_System_Name => "PING.Local";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
......@@ -17,4 +17,3 @@ end ping;
system implementation ping.impl
end ping.impl;
......@@ -4,7 +4,7 @@ properties
Ocarina_Config::Referencial_Files =>
("node_a", "node_a.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl", "devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
("ping.aadl" , "software.aadl", "devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Root_System_Name => "PING.RTEMS";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
......@@ -17,4 +17,3 @@ end ping;
system implementation ping.impl
end ping.impl;
......@@ -5,7 +5,7 @@ properties
("node_a", "node_a.ref");
Ocarina_Config::AADL_Files =>
("ping-xenomai-posix.aadl" , "software.aadl",
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl");
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
......@@ -17,4 +17,3 @@ end ping;
system implementation ping.impl
end ping.impl;
......@@ -6,9 +6,8 @@ properties
"node_b", "node_b.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl",
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl"
"devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl");
);
Ocarina_Config::Root_System_Name => "PING.impl";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
......@@ -21,4 +20,3 @@ end ping;
system implementation ping.impl
end ping.impl;
......@@ -3,10 +3,15 @@ C_FILES = $(srcdir)/producer-consumer.c $(srcdir)/devicesconf.c
AADL_FILES = $(srcdir)/producer_consumer.aadl $(srcdir)/software.aadl
SCENARIO_FILES = $(srcdir)/scenario.aadl \
$(srcdir)/scenario_local.aadl $(srcdir)/scenario_rtems.aadl
$(srcdir)/scenario_local.aadl \
$(srcdir)/scenario_loopback.aadl \
$(srcdir)/scenario_rtems.aadl $(srcdir)/scenario_spw.aadl \
$(srcdir)/scenario_spw2.aadl
include $(srcdir)/../../Makefile.common
EXTRA_DIST = $(AADL_FILES) $(SCENARIO_FILES) $(C_FILES)
CLEANDIRS = pc_simple_impl pc_simple_local pc_simple_rtems
CLEANDIRS = pc_simple_impl pc_simple_local pc_simple_rtems \
pc_simple_loopback pc_simple_loopback_spw pc_simple_impl_spw \
pc_simple_impl_spw2
#include <drivers/configuration/spacewire.h>
__po_hi_c_spacewire_conf_t pohidrv_device_a = {
.devname = "/dev/grspw0",
.nodeaddr = 30,
.corefreq = 0,
.clockdiv = 0,
.use_router = FALSE,
.remove_prot_id = FALSE,
.rxblock = FALSE,
.txblock = FALSE,
.exist = {
.corefreq = 0,
.clockdiv = 0,
.use_router = 0,
.remove_prot_id = 0,
.rxblock = 0,
.txblock = 0
}
};
__po_hi_c_spacewire_conf_t pohidrv_device_b = {
.devname = "/dev/grspw1",
.nodeaddr = 30,
.corefreq = 0,
.clockdiv = 0,
.use_router = FALSE,
.remove_prot_id = FALSE,
.rxblock = FALSE,
.txblock = FALSE,
.exist = {
.corefreq = 0,
.clockdiv = 0,
.use_router = 0,
.remove_prot_id = 0,
.rxblock = 0,
.txblock = 0
}
};
......@@ -2,15 +2,17 @@
#include <time.h>
#include <po_hi_time.h>
int produce_data = 0;
void user_produce_spg (int* data)
{
static int produce_data = 42;
#if defined (POSIX)
struct timespec mytime;
clock_gettime (CLOCK_REALTIME, &mytime);
*data = produce_data;
printf ("At time %3lu:%3lu, produce : %d\n", mytime.tv_sec % 3600, mytime.tv_nsec/1000000,produce_data);
printf ("At time %3lu:%3lu, produce : %d\n",
mytime.tv_sec % 3600, mytime.tv_nsec / 1000000,
produce_data);
#else
*data = produce_data;
printf ("Produce %d\n", *data);
......
Supports Markdown
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