diff --git a/examples/Makefile.am b/examples/Makefile.am index 7ac06ecd..d73d0977 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -40,6 +40,11 @@ SUBDIRS += \ xenomai \ xenomai_posix endif +if ENABLE_XENOMAI_V3 +SUBDIRS += \ + xenomai \ + xenomai_posix +endif if ENABLE_RTAI SUBDIRS += \ diff --git a/examples/xenomai/Makefile.am b/examples/xenomai/Makefile.am index 5792e1ef..ef20fb2d 100644 --- a/examples/xenomai/Makefile.am +++ b/examples/xenomai/Makefile.am @@ -25,13 +25,26 @@ ec_xenomai_example_SOURCES = main.c ec_xenomai_example_CFLAGS = \ -Wall \ - -I$(top_srcdir)/include \ + -I$(top_srcdir)/include + +ec_xenomai_example_LDFLAGS = \ + -L$(top_builddir)/lib/.libs -lethercat_rtdm + +if ENABLE_XENOMAI_V3 +ec_xenomai_example_CFLAGS += \ + -DXENOMAI_API_V3 \ + $(XENOMAI_ALCHEMY_CFLAGS) + +ec_xenomai_example_LDFLAGS += \ + $(XENOMAI_ALCHEMY_LDFLAGS) +else +ec_xenomai_example_CFLAGS += \ $(XENOMAI_NATIVE_CFLAGS) \ $(XENOMAI_RTDM_CFLAGS) -ec_xenomai_example_LDFLAGS = \ - -L$(top_builddir)/lib/.libs -lethercat_rtdm \ +ec_xenomai_example_LDFLAGS += \ $(XENOMAI_NATIVE_LDFLAGS) \ $(XENOMAI_RTDM_LDFLAGS) +endif #------------------------------------------------------------------------------ diff --git a/examples/xenomai/main.c b/examples/xenomai/main.c index c2cddb16..c322e2ca 100644 --- a/examples/xenomai/main.c +++ b/examples/xenomai/main.c @@ -29,12 +29,18 @@ #include #include #include +#ifdef XENOMAI_API_V3 +#include +#include +enum {T_FPU = 0}; +#else #include #include #include #include #include #include +#endif #include #include "ecrt.h" @@ -201,8 +207,10 @@ int main(int argc, char *argv[]) ec_slave_config_t *sc; int ret; +#ifndef XENOMAI_API_V3 /* Perform auto-init of rt_print buffers if the task doesn't do so */ rt_print_auto_init(1); +#endif signal(SIGTERM, signal_handler); signal(SIGINT, signal_handler); diff --git a/examples/xenomai_posix/Makefile.am b/examples/xenomai_posix/Makefile.am index 5d3962de..994750ee 100644 --- a/examples/xenomai_posix/Makefile.am +++ b/examples/xenomai_posix/Makefile.am @@ -29,6 +29,11 @@ ec_xenomai_posix_example_CFLAGS = \ $(XENOMAI_POSIX_CFLAGS) \ $(XENOMAI_RTDM_CFLAGS) +if ENABLE_XENOMAI_V3 +ec_xenomai_posix_example_CFLAGS += \ + -DXENOMAI_API_V3 +endif + ec_xenomai_posix_example_LDFLAGS = \ -L$(top_builddir)/lib/.libs -lethercat_rtdm \ $(XENOMAI_POSIX_LDFLAGS) \ diff --git a/examples/xenomai_posix/main.c b/examples/xenomai_posix/main.c index b78e7499..891c3fd3 100644 --- a/examples/xenomai_posix/main.c +++ b/examples/xenomai_posix/main.c @@ -32,8 +32,10 @@ #include #include +#ifndef XENOMAI_API_V3 #include #include +#endif #include "ecrt.h"