Commit f9267f34 authored by Luca Giordano's avatar Luca Giordano

Renaming XKY ==> AIR part one

    Refs: #118172

	modified:   .gitignore
	modified:   rtems/workingttcp/rtems-ttcp.c
	modified:   rtems/workingttcp/ut/Makefile-gr712rc.ut
	modified:   rtems/workingttcp/ut/Makefile-leon3.ut
	modified:   tools/jenkins/aftercommitbuild.sh
	deleted:    xky/.xky_config
	modified:   xky/configurator.patch
	modified:   xky/examples/bare_c/config.xml
	modified:   xky/examples/bare_c/p0/main.c
	modified:   xky/examples/hello_world/config.xml
	modified:   xky/examples/hello_world/p0/.Makefile.swp
	modified:   xky/examples/hello_world/p0/main.c
	modified:   xky/examples/iop_example/.iop.xml.swn
	modified:   xky/examples/iop_example/.iop.xml.swo
	modified:   xky/examples/iop_example/config.xml
	modified:   xky/examples/iop_example/iop/iop_ports.c
	modified:   xky/examples/iop_example/sampling/sampling.c
	modified:   xky/examples/math/config.xml
	deleted:    xky/examples/mms/.config
	deleted:    xky/examples/mms/config/build/libc.a
	deleted:    xky/examples/mms/config/build/libgcc.a
	deleted:    xky/examples/mms/config/build/pmk.a
	deleted:    xky/examples/mms/config/build/usr_arch.o
	deleted:    xky/examples/mms/config/build/usr_channels.o
	deleted:    xky/examples/mms/config/build/usr_config.o
	deleted:    xky/examples/mms/config/build/usr_hm.o
	deleted:    xky/examples/mms/config/build/usr_partitions.o
	deleted:    xky/examples/mms/config/build/usr_partitions_data.o
	deleted:    xky/examples/mms/config/build/usr_schedules.o
	deleted:    xky/examples/mms/config/build/usr_sharedmemory.o
	deleted:    xky/examples/mms/config/linkcmds.ld
	deleted:    xky/examples/mms/config/usr_arch.c
	deleted:    xky/examples/mms/config/usr_channels.c
	deleted:    xky/examples/mms/config/usr_config.c
	deleted:    xky/examples/mms/config/usr_config.h
	deleted:    xky/examples/mms/config/usr_hm.c
	deleted:    xky/examples/mms/config/usr_partitions.c
	deleted:    xky/examples/mms/config/usr_partitions_data.c
	deleted:    xky/examples/mms/config/usr_schedules.c
	deleted:    xky/examples/mms/config/usr_sharedmemory.c
	deleted:    xky/examples/mms/executable/XKYAPP.exe
	deleted:    xky/examples/mms/master/build/init.o
	deleted:    xky/examples/mms/master/build/master.o
	modified:   xky/examples/mms/master/init.c
	modified:   xky/examples/mms/master/linkcmds.inc
	modified:   xky/examples/mms/master/master.c
	deleted:    xky/examples/mms/master/p0.exe
	modified:   xky/examples/mms/mms.xml
	deleted:    xky/examples/mms/p1/build/init.o
	deleted:    xky/examples/mms/p1/build/p1.o
	modified:   xky/examples/mms/p1/init.c
	modified:   xky/examples/mms/p1/linkcmds.inc
	modified:   xky/examples/mms/p1/p1.c
	deleted:    xky/examples/mms/p1/p1.exe
	deleted:    xky/examples/mms/p2/build/init.o
	deleted:    xky/examples/mms/p2/build/p2.o
	modified:   xky/examples/mms/p2/init.c
	modified:   xky/examples/mms/p2/linkcmds.inc
	modified:   xky/examples/mms/p2/p2.c
	deleted:    xky/examples/mms/p2/p2.exe
	deleted:    xky/examples/mms/p3/build/init.o
	deleted:    xky/examples/mms/p3/build/p3.o
	modified:   xky/examples/mms/p3/init.c
	modified:   xky/examples/mms/p3/linkcmds.inc
	modified:   xky/examples/mms/p3/p3.c
	deleted:    xky/examples/mms/p3/p3.exe
	modified:   xky/examples/multi/config.xml
	deleted:    xky/examples/multi/config/linkcmds.ld
	modified:   xky/examples/multi/config/usr_channels.c
	modified:   xky/examples/multi/config/usr_config.c
	modified:   xky/examples/multi/config/usr_config.h
	modified:   xky/examples/multi/config/usr_partitions.c
	modified:   xky/examples/multi/config/usr_partitions_data.c
	modified:   xky/examples/multi/p0/init.c
	modified:   xky/examples/multi/p0/multip0assembly.txt
	modified:   xky/examples/multi/p0/p0.num
	modified:   xky/examples/multi/p0/p0.ralf
	modified:   xky/examples/multi/p1/init.c
	modified:   xky/examples/multi/p1/p1.num
	modified:   xky/examples/multi/p1/p1.ralf
	modified:   xky/examples/multi/p1/p1main.c
	modified:   xky/examples/router_example/.iop.xml.swn
	modified:   xky/examples/router_example/.iop.xml.swo
	modified:   xky/examples/router_example/config.xml
	modified:   xky/examples/router_example/iop.xml
	modified:   xky/examples/router_example/iop/iop_ports.c
	modified:   xky/examples/router_example/sampling/sampling.c
	deleted:    xky/examples/testsuites/minimum/p0/.Makefile.swp
	deleted:    xky/examples/testsuites/minimum/p0/.p0_hello_assembly.txt.kate-swp
	deleted:    xky/examples/testsuites/minimum/p0/init.template
	deleted:    xky/examples/testsuites/minimum/p0/main.c
	deleted:    xky/examples/testsuites/sptests/spcontext01/p0/.Makefile.swp
	deleted:    xky/examples/testsuites/sptests/spcontext01/p0/.p0_hello_assembly.txt.kate-swp
	deleted:    xky/examples/testsuites/sptests/spcontext01/p0/init.template
	deleted:    xky/examples/testsuites/sptests/spcontext01/p0/main.c
	modified:   xky/libs/imaspex/cache.c
	modified:   xky/libs/imaspex/entry.c
	modified:   xky/libs/imaspex/include/a653.h
	modified:   xky/libs/imaspex/include/imaspex.h
	modified:   xky/libs/imaspex/mms.c
	modified:   xky/libs/imaspex/part.c
	modified:   xky/libs/imaspex/qport.c
	modified:   xky/libs/imaspex/sport.c
	renamed:    xky/libs/libxky/arch/sparc/cache.c -> xky/libs/libair/arch/sparc/cache.c
	new file:   xky/libs/libair/arch/sparc/sparc_syscall.S
	new file:   xky/libs/libair/arch/sparc/syscall.S
	modified:   xky/libs/libiop/dispatcher.c
	modified:   xky/libs/libiop/drivers/greth/iop_greth.c
	modified:   xky/libs/libiop/drivers/grspw/IOPgrspw.c
	modified:   xky/libs/libiop/drivers/grspw/IOPgrspw_router.c
	modified:   xky/libs/libiop/error.c
	modified:   xky/libs/libiop/eth_tasks.c
	modified:   xky/libs/libiop/include/iop.h
	modified:   xky/libs/libiop/include/iop_chain.h
	modified:   xky/libs/libiop/include/iop_mms.h
	modified:   xky/libs/libiop/init.c
	modified:   xky/libs/libiop/mms.c
	modified:   xky/libs/libiop/router.c
	modified:   xky/libs/libiop/spw_tasks.c
	modified:   xky/libs/libiop/support.c
	modified:   xky/libs/libprintf/pprintf.c
	modified:   xky/libs/libtest/control_partition.c
	modified:   xky/libs/libtest/include/libtest.h
	modified:   xky/libs/libtest/test_partition.c
	deleted:    xky/libs/libxky/arch/sparc/sparc_syscall.S
	deleted:    xky/libs/libxky/arch/sparc/syscall.S
	modified:   xky/pmk/arch/sparc/asm_offsets.c
	modified:   xky/pmk/arch/sparc/atomic.c
	modified:   xky/pmk/arch/sparc/context_switch.S
	modified:   xky/pmk/arch/sparc/cpu.c
	modified:   xky/pmk/arch/sparc/health_monitor.c
	renamed:    xky/pmk/arch/sparc/include/xky_arch.h -> xky/pmk/arch/sparc/include/air_arch.h
	modified:   xky/pmk/arch/sparc/include/atomic.h
	modified:   xky/pmk/arch/sparc/include/cpu.h
	modified:   xky/pmk/arch/sparc/include/sparc.h
	modified:   xky/pmk/arch/sparc/isr.c
	modified:   xky/pmk/arch/sparc/isr_handler.c
	modified:   xky/pmk/arch/sparc/isr_handler_asm.S
	modified:   xky/pmk/arch/sparc/segregation.c
	modified:   xky/pmk/arch/sparc/start.S
	modified:   xky/pmk/arch/sparc/syscall_asm.S
	modified:   xky/pmk/arch/sparc/syscall_os.c
	modified:   xky/pmk/arch/sparc/syscall_sparc.S
	modified:   xky/pmk/arch/sparc/window.S
	modified:   xky/pmk/bsp/sparc/leon3/amba.c
	modified:   xky/pmk/bsp/sparc/leon3/bsp.c
	modified:   xky/pmk/bsp/sparc/leon3/clock.c
	modified:   xky/pmk/bsp/sparc/leon3/console.c
	modified:   xky/pmk/bsp/sparc/leon3/include/amba.h
	modified:   xky/pmk/bsp/sparc/leon3/include/bsp.h
	modified:   xky/pmk/bsp/sparc/leon3/include/clock.h
	modified:   xky/pmk/bsp/sparc/leon3/include/iommu.h
	modified:   xky/pmk/bsp/sparc/leon3/include/irqmp.h
	modified:   xky/pmk/bsp/sparc/leon3/include/l2cache.h
	modified:   xky/pmk/bsp/sparc/leon3/irqmp.c
	modified:   xky/pmk/bsp/sparc/leon3/l2cache.c
	modified:   xky/pmk/core/barrier.c
	modified:   xky/pmk/core/configurations.c
	modified:   xky/pmk/core/health_monitor.c
	renamed:    xky/pmk/core/include/xky.h -> xky/pmk/core/include/air.h
	modified:   xky/pmk/core/include/barrier.h
	modified:   xky/pmk/core/include/configurations.h
	modified:   xky/pmk/core/include/devices.h
	modified:   xky/pmk/core/include/health_monitor.h
	modified:   xky/pmk/core/include/loader.h
	modified:   xky/pmk/core/include/partition.h
	modified:   xky/pmk/core/include/pmk.h
	modified:   xky/pmk/core/include/ports.h
	modified:   xky/pmk/core/include/ports_queuing.h
	modified:   xky/pmk/core/include/ports_sampling.h
	modified:   xky/pmk/core/include/schedule.h
	modified:   xky/pmk/core/include/segregation.h
	modified:   xky/pmk/core/include/sharedmemory.h
	modified:   xky/pmk/core/include/syscall.h
	modified:   xky/pmk/core/include/tod.h
	modified:   xky/pmk/core/include/workspace.h
	modified:   xky/pmk/core/init.c
	modified:   xky/pmk/core/loader.c
	modified:   xky/pmk/core/multicore.c
	modified:   xky/pmk/core/partition.c
	modified:   xky/pmk/core/ports.c
	modified:   xky/pmk/core/ports_queuing.c
	modified:   xky/pmk/core/ports_sampling.c
	modified:   xky/pmk/core/schedule.c
	modified:   xky/pmk/core/segregation.c
	modified:   xky/pmk/core/sharedmemory.c
	modified:   xky/pmk/core/syscalls_healthmonitor.c
	modified:   xky/pmk/core/syscalls_partition.c
	modified:   xky/pmk/core/syscalls_ports.c
	modified:   xky/pmk/core/syscalls_schedule.c
	modified:   xky/pmk/core/syscalls_sharedmemory.c
	modified:   xky/pmk/core/syscalls_tod.c
	modified:   xky/pmk/core/tod.c
	modified:   xky/pmk/core/workspace.c
	modified:   xky/pos/bare/sparc/include/bare.h
	modified:   xky/pos/bare/sparc/isr.c
	modified:   xky/pos/bare/sparc/isr_asm.S
	modified:   xky/pos/bare/sparc/smp.c
	modified:   xky/pos/bare/sparc/start.S
	modified:   xky/pos/rtems-impr/rtems-impr/c/src/lib/libbsp/shared/bootcard.c
	modified:   xky/pos/rtems-impr/rtems-impr/c/src/lib/libbsp/shared/clockdrv_shell.h
	modified:   xky/pos/rtems-impr/rtems-impr/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
	modified:   xky/pos/rtems-impr/rtems-impr/c/src/lib/libbsp/sparc/shared/irq_asm.S
	modified:   xky/pos/rtems-impr/rtems-impr/c/src/lib/libbsp/sparc/shared/start/start.S
	modified:   xky/pos/rtems-impr/rtems-impr/cpukit/score/cpu/sparc/cpu.c
	modified:   xky/pos/rtems-impr/rtems-impr/cpukit/score/cpu/sparc/rtems/score/sparc.h
	modified:   xky/pos/rtems-impr/rtems-impr/cpukit/score/cpu/sparc/sparc-context-validate.S
	modified:   xky/pos/rtems-impr/rtems-impr/cpukit/score/cpu/sparc/sparc-context-volatile-clobber.S
	renamed:    xky/tools/configurator/xky/__init__.py -> xky/tools/configurator/air/__init__.py
	renamed:    xky/tools/configurator/xky/configurations.py -> xky/tools/configurator/air/configurations.py
	renamed:    xky/tools/configurator/xky/libraries/__init__.py -> xky/tools/configurator/air/libraries/__init__.py
	renamed:    xky/tools/configurator/xky/libraries/imaspex/config.py -> xky/tools/configurator/air/libraries/imaspex/config.py
	renamed:    xky/tools/configurator/xky/libraries/libiop/config.py -> xky/tools/configurator/air/libraries/libiop/config.py
	renamed:    xky/tools/configurator/xky/libraries/libiop/iop_makefile.mako -> xky/tools/configurator/air/libraries/libiop/iop_makefile.mako
	renamed:    xky/tools/configurator/xky/libraries/libprintf/config.py -> xky/tools/configurator/air/libraries/libprintf/config.py
	renamed:    xky/tools/configurator/xky/libraries/libtest/config.py -> xky/tools/configurator/air/libraries/libtest/config.py
	renamed:    xky/tools/configurator/xky/pos/__init__.py -> xky/tools/configurator/air/pos/__init__.py
	renamed:    xky/tools/configurator/xky/pos/bare/config.py -> xky/tools/configurator/air/pos/bare/config.py
	renamed:    xky/tools/configurator/xky/pos/bare/init.c.mako -> xky/tools/configurator/air/pos/bare/init.c.mako
	renamed:    xky/tools/configurator/xky/pos/rtems-impr/config.py -> xky/tools/configurator/air/pos/rtems-impr/config.py
	renamed:    xky/tools/configurator/xky/pos/rtems-impr/init.c.mako -> xky/tools/configurator/air/pos/rtems-impr/init.c.mako
	renamed:    xky/tools/configurator/xky/pos/rtems-impr/rtems-impr_makefile.mako -> xky/tools/configurator/air/pos/rtems-impr/rtems-impr_makefile.mako
	renamed:    xky/tools/configurator/xky/pos/rtems-impr/rtems-impr_partition_makefile.mako -> xky/tools/configurator/air/pos/rtems-impr/rtems-impr_partition_makefile.mako
	renamed:    xky/tools/configurator/xky/pos/rtems-impr/rtems_config.h.mako -> xky/tools/configurator/air/pos/rtems-impr/rtems_config.h.mako
	renamed:    xky/tools/configurator/xky/targets/__init__.py -> xky/tools/configurator/air/targets/__init__.py
	renamed:    xky/tools/configurator/xky/targets/sparc/__init__.py -> xky/tools/configurator/air/targets/sparc/__init__.py
	renamed:    xky/tools/configurator/xky/targets/sparc/config.py -> xky/tools/configurator/air/targets/sparc/config.py
	renamed:    xky/tools/configurator/xky/targets/sparc/leon3/config.py -> xky/tools/configurator/air/targets/sparc/leon3/config.py
	renamed:    xky/tools/configurator/xky/targets/sparc/leon4/config.py -> xky/tools/configurator/air/targets/sparc/leon4/config.py
	renamed:    xky/tools/configurator/xky/targets/sparc/shared/xky_linkcmds.mako -> xky/tools/configurator/air/targets/sparc/shared/air_linkcmds.mako
	renamed:    xky/tools/configurator/xky/targets/sparc/shared/usr_arch.mako -> xky/tools/configurator/air/targets/sparc/shared/usr_arch.mako
	renamed:    xky/tools/configurator/xky/targets/sparc/tsim/config.py -> xky/tools/configurator/air/targets/sparc/tsim/config.py
	modified:   xky/tools/configurator/configurator.py
	modified:   xky/tools/configurator/disable_fpu.patch
	modified:   xky/tools/configurator/localization/common.py
	modified:   xky/tools/configurator/localization/logger.py
	new file:   xky/tools/configurator/parsers/air/__init__.py
	renamed:    xky/tools/configurator/parsers/xky/definitions.py -> xky/tools/configurator/parsers/air/definitions.py
	renamed:    xky/tools/configurator/parsers/xky/parser.py -> xky/tools/configurator/parsers/air/parser.py
	modified:   xky/tools/configurator/parsers/iop/parser.py
	renamed:    xky/tools/configurator/parsers/schemas/xky/air_module_a653.xsd -> xky/tools/configurator/parsers/schemas/air/air_module_a653.xsd
	renamed:    xky/tools/configurator/parsers/schemas/xky/air_module_ext.xsd -> xky/tools/configurator/parsers/schemas/air/air_module_ext.xsd
	renamed:    xky/tools/configurator/parsers/schemas/xky/air_multima_win_sched_ext.xsd -> xky/tools/configurator/parsers/schemas/air/air_multima_win_sched_ext.xsd
	renamed:    xky/tools/configurator/parsers/schemas/xky/air_partition_ext.xsd -> xky/tools/configurator/parsers/schemas/air/air_partition_ext.xsd
	deleted:    xky/tools/configurator/parsers/xky/__init__.py
	new file:   xky/tools/configurator/templates/air_configuration/air_makefile.mako
	renamed:    xky/tools/configurator/templates/xky_configuration/dir_makefile.mako -> xky/tools/configurator/templates/air_configuration/dir_makefile.mako
	renamed:    xky/tools/configurator/templates/xky_configuration/inc_makefile.mako -> xky/tools/configurator/templates/air_configuration/inc_makefile.mako
	renamed:    xky/tools/configurator/templates/xky_configuration/lib_makefile.mako -> xky/tools/configurator/templates/air_configuration/lib_makefile.mako
	renamed:    xky/tools/configurator/templates/xky_configuration/pas_makefile.mako -> xky/tools/configurator/templates/air_configuration/pas_makefile.mako
	renamed:    xky/tools/configurator/templates/xky_configuration/pmk_makefile.mako -> xky/tools/configurator/templates/air_configuration/pmk_makefile.mako
	renamed:    xky/tools/configurator/templates/xky_configuration/pos_makefile.mako -> xky/tools/configurator/templates/air_configuration/pos_makefile.mako
	renamed:    xky/tools/configurator/templates/app_configuration/xky_makefile.mako -> xky/tools/configurator/templates/app_configuration/air_makefile.mako
	modified:   xky/tools/configurator/templates/app_configuration/common_makefile.mako
	modified:   xky/tools/configurator/templates/app_configuration/dir_makefile.mako
	modified:   xky/tools/configurator/templates/app_configuration/inc_linkcmds.mako
	modified:   xky/tools/configurator/templates/app_configuration/iop/iop_ports.mako
	modified:   xky/tools/configurator/templates/app_configuration/pos/ports_init.mako
	modified:   xky/tools/configurator/templates/app_configuration/pos_makefile.mako
	modified:   xky/tools/configurator/templates/app_configuration/usr_channels.mako
	modified:   xky/tools/configurator/templates/app_configuration/usr_config.mako
	modified:   xky/tools/configurator/templates/app_configuration/usr_hm.mako
	modified:   xky/tools/configurator/templates/app_configuration/usr_partitions.mako
	modified:   xky/tools/configurator/templates/app_configuration/usr_schedules.mako
	modified:   xky/tools/configurator/templates/app_configuration/usr_sharedmemory.mako
	modified:   xky/tools/configurator/templates/include/makefile.mako
	deleted:    xky/tools/configurator/templates/xky_configuration/xky_makefile.mako
	modified:   xky/tools/configurator/tools/__init__.py
	renamed:    xky/tools/configurator/tools/configure_xky.py -> xky/tools/configurator/tools/configure_air.py
	modified:   xky/tools/configurator/tools/configure_app.py
	modified:   xky/tools/partition_assembler/main.c
	modified:   xky/tools/partition_assembler/template.c
parent fc866240
......@@ -20,19 +20,23 @@ o-optimize-*/
b-*/
# 'configure' generated files
xky/.xky_config
.config
xky/.air_config
# Examples generated files
xky/examples/**/*.a
xky/examples/**/*.ld
xky/examples/**/config
xky/examples/**/go.sh
xky/examples/**/init.c
xky/examples/**/init.template
xky/examples/**/linkcmds.inc
xky/examples/**/rtems_config.h
xky/examples/**/.config
xky/examples/**/go.sh
# log/tags/tmp files
*.log
.*.swp
.*-swp
tags
......
......@@ -146,6 +146,7 @@ Init (rtems_task_argument ignored)
#ifdef GTEST /* LLLG XXX */
int argc = 1;
int rc = 0;
char argument[32] = "rtems-ttcp_ut.exe";
char *argv[3];
......@@ -153,7 +154,8 @@ printk(">> InitGoogleTest()\n");
argv[0] = argument;
::testing::InitGoogleTest(&argc, argv);
printk(">> RUN_ALL_TESTS()\n");
RUN_ALL_TESTS();
rc = RUN_ALL_TESTS();
printk(">> %d = RUN_ALL_TESTS()\n", rc);
#else /* GTEST LLLG XXX */
......
......@@ -46,12 +46,10 @@ CPU_CFLAGS = -mcpu=v8 -msoft-float # ??? XXX LLLG
CPPFLAGS += -DGTEST -isystem $(GTEST_DIR)/include
# built in libraries include files
#CPPFLAGS+= -B$(XKY_LIBS)/libprintf/
#CPPFLAGS+= -gdwarf-2 -I./ -B./
#-I../common/\
#-B../common/\
#
#-B$(XKY_LIBS)/libxky/
# include directories
#
......
......@@ -47,12 +47,10 @@ CXXFLAGS += -pthread
CPPFLAGS += -DGTEST -isystem $(GTEST_DIR)/include
# built in libraries include files
#CPPFLAGS+= -B$(XKY_LIBS)/libprintf/
#CPPFLAGS+= -gdwarf-2 -I./ -B./
#-I../common/\
#-B../common/\
#
#-B$(XKY_LIBS)/libxky/
# include directories
#
......
......@@ -3,6 +3,7 @@
# a script file to run by jenkins each time there is a commit to test it
#
#cd ./air
cd ./xky
pwd=`pwd`
......@@ -30,7 +31,7 @@ for entry in */
do
echo "### check [ $entry ] ###"
if [ $entry = "iop_example/" -o $entry = "math/" -o $entry = "multi/" -o $entry = "router_example/" ]; then
if [ $entry = "iop_example/" -o $entry = "math/" -o $entry = "multi/" -o $entry = "router_example/" -o $entry = "testsuites/" ]; then
echo "### avoid [ $entry ] ###"
continue
fi
......
(S'sparc'
p0
S'leon3'
p1
I01
tp2
.
\ No newline at end of file
diff --git a/xky/tools/configurator/xky/targets/sparc/leon4/config.py b/xky/tools/configurator/xky/targets/sparc/leon4/config.py
diff --git a/air/tools/configurator/air/targets/sparc/leon4/config.py b/air/tools/configurator/air/targets/sparc/leon4/config.py
index 6efb7c3..0bd4439 100755
--- a/xky/tools/configurator/xky/targets/sparc/leon4/config.py
+++ b/xky/tools/configurator/xky/targets/sparc/leon4/config.py
@@ -128,8 +128,8 @@ arch_configure = xky_sparc.get_sparc_configuration
--- a/air/tools/configurator/air/targets/sparc/leon4/config.py
+++ b/air/tools/configurator/air/targets/sparc/leon4/config.py
@@ -128,8 +128,8 @@ arch_configure = air_sparc.get_sparc_configuration
# IOP devices and definitions
iop = IOP(defines=[],
......
......@@ -4,7 +4,7 @@
<Partition PartitionIdentifier="1" PartitionName="p0"
Criticality="LEVEL_A" SystemPartition="true" EntryPoint="entry_point">
<PartitionConfiguration Personality="BARE" Cores="1">
<Libs>LIBXKY;</Libs>
<Libs>LIBAIR;</Libs>
<Cache>CODE; DATA</Cache>
<Memory Size="0x100000" />
<Permissions>
......@@ -23,5 +23,5 @@
</Module_Schedule>
<!-- module configuration -->
<XKY_Configuration TicksPerSecond="100" RequiredCores="1"/>
<AIR_Configuration TicksPerSecond="100" RequiredCores="1"/>
</ARINC_653_Module>
\ No newline at end of file
......@@ -4,7 +4,7 @@
* @brief Hello! Is it me you're looking for?
*/
#include <xky.h>
#include <air.h>
#include <math.h>
char message[] = {
......@@ -98,6 +98,6 @@ char message[] = {
*/
void entry_point() {
xky_syscall_print(message, sizeof(message));
air_syscall_print(message, sizeof(message));
for (;;);
}
......@@ -5,7 +5,7 @@
<Partition PartitionIdentifier="1" PartitionName="p0"
Criticality="LEVEL_A" EntryPoint="entry_point" SystemPartition="false">
<PartitionConfiguration Personality="RTEMS" Cores="1">
<Libs>LIBXKY; LIBPRINTF</Libs>
<Libs>LIBAIR; LIBPRINTF</Libs>
<Devices></Devices>
<Cache>CODE; DATA</Cache>
<Memory Size="0x100000" />
......@@ -28,5 +28,5 @@
<!-- Module configuration -->
<XKY_Configuration TicksPerSecond="200" RequiredCores="1"/>
<AIR_Configuration TicksPerSecond="200" RequiredCores="1"/>
</ARINC_653_Module>
......@@ -13,7 +13,7 @@
#define CONFIGURE_INIT
#include <stdio.h>
#include <stdlib.h>
#include <xky.h>
#include <air.h>
#include <pprintf.h>
int andp=7;
......
......@@ -9,7 +9,7 @@
<Queuing_Port Name="squeuing"
Direction="SOURCE" MaxMessageSize="1024" MaxNbMessages="32" />
<PartitionConfiguration Personality="RTEMS" IOP="iop.xml" Cores="1">
<Libs>LIBXKY; LIBIOP; LIBPRINTF</Libs>
<Libs>LIBAIR; LIBIOP; LIBPRINTF</Libs>
<Devices></Devices>
<Cache>CODE; DATA</Cache>
<Memory Size="0x400000" />
......@@ -25,7 +25,7 @@
<Sampling_Port Name="ssampling"
Direction="SOURCE" MaxMessageSize="1024" RefreshRateSeconds="1.0"/>
<PartitionConfiguration Personality="RTEMS" Cores="1">
<Libs>LIBXKY; IMASPEX; LIBPRINTF</Libs>
<Libs>LIBAIR; IMASPEX; LIBPRINTF</Libs>
<Devices></Devices>
<Cache>CODE; DATA</Cache>
<Memory Size="0x400000" />
......@@ -41,7 +41,7 @@
<Queuing_Port Name="dqueuing"
Direction="DESTINATION" MaxMessageSize="1024" MaxNbMessages="32" />
<PartitionConfiguration Personality="RTEMS" Cores="1">
<Libs>LIBXKY; IMASPEX; LIBPRINTF</Libs>
<Libs>LIBAIR; IMASPEX; LIBPRINTF</Libs>
<Devices></Devices>
<Cache>
CODE; DATA
......@@ -98,5 +98,5 @@
</Connection_Table>
<!-- Module configuration -->
<XKY_Configuration TicksPerSecond="1000" RequiredCores="1"/>
<AIR_Configuration TicksPerSecond="1000" RequiredCores="1"/>
</ARINC_653_Module>
......@@ -17,11 +17,11 @@ extern iop_logical_device_t logical_device_0;
/**
* @brief Queuing ports configurations
*/
static xky_queuing_port_configuration_t queuing_ports[] = {
static air_queuing_port_configuration_t queuing_ports[] = {
{
.max_message_size = 1024,
.max_nb_message = 32,
.port_direction = XKY_SOURCE_PORT,
.port_direction = AIR_SOURCE_PORT,
.port_discipline = 0
},
};
......@@ -29,11 +29,11 @@ static xky_queuing_port_configuration_t queuing_ports[] = {
/**
* @brief Sampling ports configurations
*/
static xky_sampling_port_configuration_t sampling_ports[] = {
static air_sampling_port_configuration_t sampling_ports[] = {
{
.max_message_size = 1024,
.refresh_period = 1000,
.port_direction = XKY_DESTINATION_PORT,
.port_direction = AIR_DESTINATION_PORT,
},
};
......@@ -42,13 +42,13 @@ static xky_sampling_port_configuration_t sampling_ports[] = {
*/
iop_port_t remote_ports[2] = {
{
.type = XKY_SAMPLING_PORT,
.type = AIR_SAMPLING_PORT,
.name = "dsampling",
.configuration = &sampling_ports[0],
.device = &logical_device_0
},
{
.type = XKY_QUEUING_PORT,
.type = AIR_QUEUING_PORT,
.name = "squeuing",
.configuration = &queuing_ports[0],
.device = NULL
......
......@@ -90,7 +90,7 @@ void test(PARTITION_ID_TYPE self_id) {
char sample[3] = "S0 ";
/* get the number of ticks per second */
int tps = 1000000 / xky_syscall_get_us_per_tick();
int tps = 1000000 / air_syscall_get_us_per_tick();
pprintf("TPS %i\n", tps);
RETURN_CODE_TYPE rc = NO_ERROR;
......
......@@ -4,7 +4,7 @@
<Partition PartitionIdentifier="1" PartitionName="p0"
Criticality="LEVEL_A" SystemPartition="true" EntryPoint="entry_point">
<PartitionConfiguration Personality="BARE" Cores="1">
<Libs>LIBXKY; LIBPRINTF</Libs>
<Libs>LIBAIR; LIBPRINTF</Libs>
<Cache>CODE; DATA</Cache>
<Memory Size="0x100000" />
<Permissions>
......@@ -23,5 +23,5 @@
</Module_Schedule>
<!-- module configuration -->
<XKY_Configuration TicksPerSecond="100" RequiredCores="1"/>
<AIR_Configuration TicksPerSecond="100" RequiredCores="1"/>
</ARINC_653_Module>
[1c4b26885a5793615415ef65fcdf68d0eac406c57a191b60646c10e7346042e9]p3/linkcmds.inc
[fe0a6af21dc00da396bfee1e6e88a442c82969e2ffc5915778397ddb2d1b62bc]p3/Makefile
[1ab8dc2c90a5b1bc4f45767f8113b0a7efc93c129a40b0a07b78c38ebf1401e7]config/usr_partitions.c
[3892b5e05aa7fa6297d2952dcdb47e0fcb44de46abce8d4cf604967a443001f4]config/usr_sharedmemory.c
[5be30b04c72dfc9c869899406a94e7c9a7b0e1c276068c42f41632b1c9a6cd0e]p2/Makefile
[70a05779bd680b1d0a9363891e9a589f6587377c4930605a24d5794404a672db]config/Makefile
[b8541cab59e4ce20486b41364a7638e769a65cf7abdf4cdf10ea6dbdd40e42bb]config/usr_hm.c
[1c4b26885a5793615415ef65fcdf68d0eac406c57a191b60646c10e7346042e9]p1/linkcmds.inc
[024593f2288d8db0664e8c98e18b9aef3ffcb00466f023f36945c0c24485f6df]master/init.c
[f433e037a414f82fda6636c442394b8d897ee1ce5e8780d44a5061b199da7099]config/usr_channels.c
[65794be3116824fd10cf5f1d9ee385c9bd4d5968fb9bd8ba775ff0a7d07ca1b7]p1/Makefile
[9be98bfe2279e2a0493d9ff1bc36b2154922ac8206ebc43ca9d1e415aa0c78c9]common/Makefile
[8cbd1e0baad0905cf5ebba2655817b3e3ffa2e0ca9ab8a5c6c812afd74c0cbfe]master/Makefile
[793d74e548951a1701f13bdc687f0f24ddad2930b5dc55256ee48e4297665e58]./Makefile
[295ce48f1c44578f2bc3652f4925fea91171ab7b873c621cb061f90c00ca4b47]config/usr_config.c
[024593f2288d8db0664e8c98e18b9aef3ffcb00466f023f36945c0c24485f6df]p2/init.c
[272586ede2dc91f6a8bc5af6745150b82b813b6c22aea8fd08be304a5bef1812]config/usr_config.h
[e83c931186a395ac6e85cbd88b16c43307bcaaff9ce69f9cb6d59879a1098e70]config/usr_arch.c
[1c4b26885a5793615415ef65fcdf68d0eac406c57a191b60646c10e7346042e9]p2/linkcmds.inc
[c525af91fb81152649ae0a5c1373ca84197f0e36d540f5de4383ad19e690a885]config/usr_schedules.c
[024593f2288d8db0664e8c98e18b9aef3ffcb00466f023f36945c0c24485f6df]p3/init.c
[024593f2288d8db0664e8c98e18b9aef3ffcb00466f023f36945c0c24485f6df]p1/init.c
[1c4b26885a5793615415ef65fcdf68d0eac406c57a191b60646c10e7346042e9]master/linkcmds.inc
[12c7199cd8408d87d145ec6d956d172218e15d0ebad67311474144df65601ae4]config/linkcmds.ld
/*
* ============================================================================
* This file was generated by the GMV's Configurator Tool and is part of an
* AIR - ARINC 653 Interface in RTEMS - application configuration.
* File Purpose : Linker script for XKY - OS (SPARC v8)
* ============================================================================
*/
OUTPUT_ARCH(sparc)
MEMORY
{
rom : ORIGIN = 0x00000000, LENGTH = 0x00000000
ram : ORIGIN = 0x40000000, LENGTH = 0x01000000
}
ENTRY(pmk_trap_table)
SECTIONS
{
/* ------------------------------------------------------------------------
* XKY Kernel
* --------------------------------------------------------------------- */
. = ORIGIN(ram);
xky_kernel_memory_start = .;
.xky_kernel_text :
{
build/pmk.a(.text .rodata*)
build/libgcc.a(.text .rodata*)
build/libc.a(.text .rodata*)
} >ram
.xky_kernel_data :
{
build/pmk.a(.data*)
build/libgcc.a(.data*)
build/libc.a(.data*)
} >ram
.xky_kernel_bss :
{
xky_kernel_bss_start = .;
build/pmk.a(.bss* COMMON)
build/libgcc.a(.bss* COMMON)
build/libc.a(.bss* COMMON)
xky_kernel_bss_end = .;
} >ram
/* ------------------------------------------------------------------------
* XKY Configuration
* --------------------------------------------------------------------- */
.xky_configuration :
{
xky_configuration = .;
build/usr_config.o(.data* .rodata*)
build/usr_arch.o(.data* .rodata*)
build/usr_hm.o(.data* .rodata*)
build/usr_schedules.o(.data* .rodata*)
build/usr_partitions.o(.data* .rodata*)
build/usr_channels.o(.data* .rodata*)
build/usr_sharedmemory.o(.data* .rodata*)
build/usr_partitions_data.o(.data* .rodata*)
} >ram
/* ------------------------------------------------------------------------
* XKY Workspace
* --------------------------------------------------------------------- */
.xky_workspace :
{
. = ALIGN(0x1000);
xky_workspace = .;
. += 0x45a8;
} >ram
xky_kernel_memory_end = .;
}
/*
* ============================================================================
* This file was generated by the GMV's Configurator Tool and is part of an
* AIR - ARINC 653 Interface in RTEMS - application configuration.
* File Purpose : SPARC specific configuration
* ============================================================================
*/
#include <cpu.h>
/**
* @brief SPARC specific configuration
*/
arch_configuration_t arch_configuration = { \
.mmu_context_entries = 4,
.mmu_l1_tables_entries = 4,
.mmu_l2_tables_entries = 16,
.mmu_l3_tables_entries = 0,
};
/*
* ============================================================================
* This file was generated by the GMV's Configurator Tool and is part of an
* AIR - ARINC 653 Interface in RTEMS - application configuration.
* File Purpose : Channels configuration
* ============================================================================
*/
#include <ports.h>
#include <ports_queuing.h>
#include <ports_sampling.h>
#include <usr_config.h>
/**
* @brief Partition 0 Port Table
*/
pmk_port_t *usr_partition0_ports[0] = \
{
};
/**
* @brief Partition 1 Port Table
*/
pmk_port_t *usr_partition1_ports[0] = \
{
};
/**
* @brief Partition 2 Port Table
*/
pmk_port_t *usr_partition2_ports[0] = \
{
};
/**
* @brief Partition 3 Port Table
*/
pmk_port_t *usr_partition3_ports[0] = \
{
};
/**
* @brief Module Communication Channels table
*/
pmk_channel_t usr_channels_table[USR_CHANNELS] = \
{
};
/*
* ============================================================================
* This file was generated by the GMV's Configurator Tool and is part of an
* AIR - ARINC 653 Interface in RTEMS - application configuration.
* File Purpose : General XKY application configuration
* ============================================================================
*/
#include <pmk.h>
#include <ports.h>
#include <schedule.h>
#include <partition.h>
#include <sharedmemory.h>
#include <health_monitor.h>
#include <configurations.h>
#include <usr_config.h>
/**
* @brief Schedule table (defined in usr_schedules.c)
*/
extern pmk_schedule_t usr_schedule_table[USR_SCHEDULES];
/**
* @brief Partition table (defined in usr_partitions.c)
*/
extern pmk_partition_t usr_partition_table[USR_PARTITIONS];
/**
* @brief Module Communication Channels table (defined in usr_channels.c)
*/
extern pmk_channel_t usr_channels_table[USR_CHANNELS];
/**
* @brief Shared Memory Configuration Table (defined in usr_sharedmemory.c)
*/
pmk_shm_t usr_shared_memory_table[USR_SHARED_MEMORY];
/**
* @brief System State Health-Monitor table
*/
extern pmk_hm_level_list_t usr_hm_system_table[PMK_HM_STATES_COUNT];
/**
* @brief Module Health-Monitor table
*/
extern pmk_hm_action_list_t *usr_hm_module_table[PMK_HM_STATES_COUNT];
/**
* @brief Architecture specific Configuration
*/
extern arch_configuration_t arch_configuration;
/**
* @brief XKY configuration
*/
const pmk_configuration_t __config = {
.magic = PMK_CONFIG_MAGIC_NUMBER,
.cores = USR_CORES,
.us_per_tick = USR_US_PER_TICK,
.partitions = { .length = USR_PARTITIONS, .elements = (void *)usr_partition_table },
.schedules = { .length = USR_SCHEDULES, .elements = (void *)usr_schedule_table },
.sharedareas = { .length = USR_SHARED_MEMORY, .elements = (void *)usr_shared_memory_table },
.channels = { .length = USR_CHANNELS, .elements = (void *)usr_channels_table },
.hm_system_table = usr_hm_system_table,
.hm_module_table = usr_hm_module_table,
.arch_configuration = &arch_configuration
};
/*
* ============================================================================
* This file was generated by the GMV's Configurator Tool and is part of an
* AIR - ARINC 653 Interface in RTEMS - application configuration.
* File Purpose : General XKY application configuration
* ============================================================================
*/
#define USR_US_PER_TICK (10000)
#define USR_PARTITIONS (4)
#define USR_SCHEDULES (2)
#define USR_CHANNELS (0)
#define USR_CORES (1)
#define USR_SHARED_MEMORY (0)
This diff is collapsed.
/*
* ============================================================================
* This file was generated by the GMV's Configurator Tool and is part of an
* AIR - ARINC 653 Interface in RTEMS - application configuration.
* File Purpose : Partitions configuration
* ============================================================================
*/
#include <ports.h>
#include <partition.h>
#include <segregation.h>
#include <health_monitor.h>
#include <usr_config.h>
/**
* @brief Partition ELF tables (defined in usr_partitions_data.c)
*/
extern pmk_elf_t usr_partitions_data[USR_PARTITIONS];
/**
* @brief Partition 0 Health-Monitor Table (defined in usr_hm.c)
*/
extern pmk_hm_action_list_t *usr_hm_partition0_table[PMK_HM_STATES_COUNT];
/**
* @brief Partition 1 Health-Monitor Table (defined in usr_hm.c)
*/
extern pmk_hm_action_list_t *usr_hm_partition1_table[PMK_HM_STATES_COUNT];
/**
* @brief Partition 2 Health-Monitor Table (defined in usr_hm.c)
*/
extern pmk_hm_action_list_t *usr_hm_partition2_table[PMK_HM_STATES_COUNT];
/**
* @brief Partition 3 Health-Monitor Table (defined in usr_hm.c)