diff --git a/decide_what_to_do/hal/components/attic/boss_plc.c b/decide_what_to_do/hal/components/attic/boss_plc.c index a123d8ff68..0a11178576 100644 --- a/decide_what_to_do/hal/components/attic/boss_plc.c +++ b/decide_what_to_do/hal/components/attic/boss_plc.c @@ -115,8 +115,8 @@ ******************************************************************************/ -#include "rtapi.h" // RTAPI realtime OS API. -#include "rtapi_app.h" // RTAPI realtime module decls. +#include "runtime/rtapi.h" // RTAPI realtime OS API. +#include "runtime/rtapi_app.h" // RTAPI realtime module decls. #include "hal/hal.h" // HAL public API decls. diff --git a/decide_what_to_do/hal/components/attic/modmath.c b/decide_what_to_do/hal/components/attic/modmath.c index 78821da4d4..4efb026a40 100644 --- a/decide_what_to_do/hal/components/attic/modmath.c +++ b/decide_what_to_do/hal/components/attic/modmath.c @@ -31,12 +31,12 @@ * ********************************************************************/ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ #include -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" /* module information */ MODULE_AUTHOR("Stephen Wille Padnos"); diff --git a/decide_what_to_do/hal/components/attic/supply.c b/decide_what_to_do/hal/components/attic/supply.c index a322418cef..6dd1325c1c 100644 --- a/decide_what_to_do/hal/components/attic/supply.c +++ b/decide_what_to_do/hal/components/attic/supply.c @@ -44,8 +44,8 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ /* module information */ diff --git a/decide_what_to_do/hal/components/hal_pru.c b/decide_what_to_do/hal/components/hal_pru.c index 4213f50623..0ea302e519 100644 --- a/decide_what_to_do/hal/components/hal_pru.c +++ b/decide_what_to_do/hal/components/hal_pru.c @@ -1,16 +1,16 @@ // based on supply.c -#include "config.h" +#include "runtime/config.h" // this probably should be an ARM335x #define #if !defined(TARGET_PLATFORM_BEAGLEBONE) #error "This driver is for the beaglebone platform only" #endif -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_compat.h" /* RTAPI support functions */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_compat.h" /* RTAPI support functions */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ #include #include diff --git a/decide_what_to_do/hal/components/hal_prudebug.c b/decide_what_to_do/hal/components/hal_prudebug.c index ea85a49fc0..4d3f81f036 100644 --- a/decide_what_to_do/hal/components/hal_prudebug.c +++ b/decide_what_to_do/hal/components/hal_prudebug.c @@ -1,7 +1,7 @@ // based on supply.c -#include "config.h" +#include "runtime/config.h" // this probably should be an ARM335x #define #if !defined(TARGET_PLATFORM_BEAGLEBONE) @@ -12,8 +12,8 @@ // not part of debugging #define EXPLORE_COUNTERS 1 -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ #include diff --git a/decide_what_to_do/hal/lib/hal_alias.c b/decide_what_to_do/hal/lib/hal_alias.c index ccd82eb6fa..edccd4f9db 100644 --- a/decide_what_to_do/hal/lib/hal_alias.c +++ b/decide_what_to_do/hal/lib/hal_alias.c @@ -1,8 +1,8 @@ // HAL alias (aka 'oldname') API // usage not recommended - ready for deprecation -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/decide_what_to_do/hal/lib/hal_plug.c b/decide_what_to_do/hal/lib/hal_plug.c index 7c56ee6262..84cefee2d8 100644 --- a/decide_what_to_do/hal/lib/hal_plug.c +++ b/decide_what_to_do/hal/lib/hal_plug.c @@ -1,6 +1,6 @@ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_ring.h" diff --git a/decide_what_to_do/hal/lib/syslog_async.c b/decide_what_to_do/hal/lib/syslog_async.c index 44c0de5b89..b52d4cf2bd 100644 --- a/decide_what_to_do/hal/lib/syslog_async.c +++ b/decide_what_to_do/hal/lib/syslog_async.c @@ -33,7 +33,7 @@ #include #include -#include "syslog_async.h" +#include "syslog_async/syslog_async.h" /* From RFC 3164 */ #define MAX_MESSAGE 1024 diff --git a/decide_what_to_do/hal/vtable-example/vcode.c b/decide_what_to_do/hal/vtable-example/vcode.c index e3dc9c9ee1..474df571ba 100644 --- a/decide_what_to_do/hal/vtable-example/vcode.c +++ b/decide_what_to_do/hal/vtable-example/vcode.c @@ -1,4 +1,4 @@ -#include "rtapi.h" +#include "runtime/rtapi.h" #include "vtexample.h" diff --git a/decide_what_to_do/hal/vtable-example/vtexport.c b/decide_what_to_do/hal/vtable-example/vtexport.c index 1b14b1df73..b0061e57c0 100644 --- a/decide_what_to_do/hal/vtable-example/vtexport.c +++ b/decide_what_to_do/hal/vtable-example/vtexport.c @@ -1,6 +1,6 @@ -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/decide_what_to_do/hal/vtable-example/vtuse.c b/decide_what_to_do/hal/vtable-example/vtuse.c index e5ae3d847d..f105f8ee1f 100644 --- a/decide_what_to_do/hal/vtable-example/vtuse.c +++ b/decide_what_to_do/hal/vtable-example/vtuse.c @@ -1,6 +1,6 @@ -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/decide_what_to_do/hal_comp.c b/decide_what_to_do/hal_comp.c index 40d509a828..eb77dbf4f7 100644 --- a/decide_what_to_do/hal_comp.c +++ b/decide_what_to_do/hal_comp.c @@ -1,7 +1,7 @@ // HAL components API -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/decide_what_to_do/halsh.c b/decide_what_to_do/halsh.c index 7fa6a1cbfe..3b2fc9e94f 100644 --- a/decide_what_to_do/halsh.c +++ b/decide_what_to_do/halsh.c @@ -18,8 +18,8 @@ #include #include #include -#include "halcmd.h" -#include "mk-inifile.h" +#include "hal_command/halcmd.h" +#include "mkini/mk-inifile.h" #define BUFFERLEN 80 diff --git a/decide_what_to_do/regressions/check-tests/check_tests.c b/decide_what_to_do/regressions/check-tests/check_tests.c index 9417eb6528..b08e57e40c 100644 --- a/decide_what_to_do/regressions/check-tests/check_tests.c +++ b/decide_what_to_do/regressions/check-tests/check_tests.c @@ -7,8 +7,8 @@ #include "timers.h" #include "check-util.h" -#include "rtapi.h" -#include "ring.h" +#include "runtime/rtapi.h" +#include "runtime/ring.h" diff --git a/decide_what_to_do/regressions/check-tests/triple-buffer-suite.h b/decide_what_to_do/regressions/check-tests/triple-buffer-suite.h index ad148b05f4..dc2d0998c7 100644 --- a/decide_what_to_do/regressions/check-tests/triple-buffer-suite.h +++ b/decide_what_to_do/regressions/check-tests/triple-buffer-suite.h @@ -4,7 +4,7 @@ // see if this works for us: // http://remis-thoughts.blogspot.co.at/2012/01/triple-buffering-as-concurrency_30.html -#include +#include TB_FLAG_FAST(tb); int tb_buf[3]; diff --git a/decide_what_to_do/shmem/shmemtask.c b/decide_what_to_do/shmem/shmemtask.c index de95bfb8db..87acd75908 100644 --- a/decide_what_to_do/shmem/shmemtask.c +++ b/decide_what_to_do/shmem/shmemtask.c @@ -19,8 +19,8 @@ Set up a periodic task that increments a heartbeat in shared memory. */ -#include "rtapi.h" -#include "rtapi_app.h" /* rtapi_app_main,exit() */ +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" /* rtapi_app_main,exit() */ #include "common.h" /* shmem structure, SHMEM_KEY */ static int module; diff --git a/decide_what_to_do/shmem/shmemusr.c b/decide_what_to_do/shmem/shmemusr.c index 1e47880cb7..5b1840b332 100644 --- a/decide_what_to_do/shmem/shmemusr.c +++ b/decide_what_to_do/shmem/shmemusr.c @@ -16,7 +16,7 @@ #include #include /* signal(), SIGINT */ #include /* sleep() */ -#include "rtapi.h" /* user-level API to RT Linux */ +#include "runtime/rtapi.h" /* user-level API to RT Linux */ #include "common.h" /* shmem structure */ static int module; diff --git a/decide_what_to_do/timer/timertask.c b/decide_what_to_do/timer/timertask.c index c7f2210683..8401e17d04 100644 --- a/decide_what_to_do/timer/timertask.c +++ b/decide_what_to_do/timer/timertask.c @@ -20,8 +20,8 @@ is stopped, the cumulative counter value is printed. */ -#include "rtapi.h" -#include "rtapi_app.h" /* rtapi_app_main,exit() */ +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" /* rtapi_app_main,exit() */ static int module; static int timer_task; /* the task ID */ diff --git a/src/executables/comp/src/comp.g b/src/executables/comp/src/comp.g index 7f220c9408..55a02e630e 100644 --- a/src/executables/comp/src/comp.g +++ b/src/executables/comp/src/comp.g @@ -254,12 +254,12 @@ def prologue(f): f.write("/* Autogenerated by %s -- do not edit */\n" % ( sys.argv[0])) f.write("""\ -#include "rtapi.h" +#include "runtime/rtapi.h" #ifdef RTAPI -#include "rtapi_app.h" +#include "runtime/rtapi_app.h" #endif -#include "rtapi_string.h" -#include "rtapi_errno.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_errno.h" #include "hal/hal.h" static int comp_id; diff --git a/src/executables/encdec/src/encdec.cc b/src/executables/encdec/src/encdec.cc index f8445ffdb6..8af91abcf9 100644 --- a/src/executables/encdec/src/encdec.cc +++ b/src/executables/encdec/src/encdec.cc @@ -14,7 +14,7 @@ #include #include -#include +#include using namespace machinetalk; using namespace std; diff --git a/src/executables/halcmd/src/halcmd_completion.c b/src/executables/halcmd/src/halcmd_completion.c index 72e4c8319e..71a3437873 100644 --- a/src/executables/halcmd/src/halcmd_completion.c +++ b/src/executables/halcmd/src/halcmd_completion.c @@ -38,10 +38,10 @@ */ #include "halcmd_completion.h" -#include "config.h" +#include "runtime/config.h" #include "linux/limits.h" #include "stdlib.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* private HAL decls */ #include "hal/hal_ring.h" /* ringbuffer declarations */ diff --git a/src/executables/halcmd/src/halcmd_main.c b/src/executables/halcmd/src/halcmd_main.c index 22bdf2a641..3b087d5ce8 100644 --- a/src/executables/halcmd/src/halcmd_main.c +++ b/src/executables/halcmd/src/halcmd_main.c @@ -37,14 +37,14 @@ * information, go to https://github.com/machinekit. */ -#include "config.h" -#include "rtapi.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" #include "hal/hal.h" #include "hal/hal_priv.h" -#include "halcmd.h" -#include "halcmd_commands.h" +#include "hal_command/halcmd.h" +#include "hal_command/halcmd_commands.h" #include "halcmd_completion.h" -#include "halcmd_rtapiapp.h" +#include "hal_command/halcmd_rtapiapp.h" #include #include @@ -59,7 +59,7 @@ #include #include #include -#include +#include static int get_input(FILE *srcfile, char *buf, size_t bufsize); static void print_help_general(int showR); diff --git a/src/executables/inivar/src/inivar.cc b/src/executables/inivar/src/inivar.cc index f4152f4dd9..4f2e71cde1 100644 --- a/src/executables/inivar/src/inivar.cc +++ b/src/executables/inivar/src/inivar.cc @@ -26,8 +26,8 @@ #include /* strcmp(), strcpy() */ #include -#include "config.h" -#include "mk-inifile.hh" +#include "runtime/config.h" +#include "mkini/mk-inifile.hh" // Compiler warnings // Copying a string of unknown length into a fixed size buffer diff --git a/src/executables/instcomp/src/instcomp.g b/src/executables/instcomp/src/instcomp.g index 7156ebc37a..27d637e58d 100644 --- a/src/executables/instcomp/src/instcomp.g +++ b/src/executables/instcomp/src/instcomp.g @@ -333,12 +333,12 @@ def prologue(f): f.write("""\ -#include "rtapi.h" +#include "runtime/rtapi.h" #ifdef RTAPI -#include "rtapi_app.h" +#include "runtime/rtapi_app.h" #endif -#include "rtapi_string.h" -#include "rtapi_errno.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_errno.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_accessor.h" diff --git a/src/executables/linmove/src/linmove.cc b/src/executables/linmove/src/linmove.cc index c6f1db8210..3e096d0180 100644 --- a/src/executables/linmove/src/linmove.cc +++ b/src/executables/linmove/src/linmove.cc @@ -10,7 +10,7 @@ #include #include -#include +#include using namespace std; using namespace google::protobuf; diff --git a/src/executables/messagebus/src/messagebus.cc b/src/executables/messagebus/src/messagebus.cc index 5a3cf89c21..a45401da40 100644 --- a/src/executables/messagebus/src/messagebus.cc +++ b/src/executables/messagebus/src/messagebus.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include @@ -39,16 +39,16 @@ #error This is intended as a userspace component only. #endif -//#include "config.h" -#include +//#include "runtime/config.h" +#include #include #include #include -#include -#include +#include +#include //#include -#include -#include +#include +#include #include using namespace google::protobuf; diff --git a/src/executables/messagebus/src/rtproxy.cc b/src/executables/messagebus/src/rtproxy.cc index 5758a73e7e..5dc3c9b780 100644 --- a/src/executables/messagebus/src/rtproxy.cc +++ b/src/executables/messagebus/src/rtproxy.cc @@ -10,8 +10,8 @@ #error This is intended as a userspace component only. #endif -#include -#include +#include +#include #include #include #include @@ -23,7 +23,7 @@ #include "messagebus.hh" #include "rtproxy.hh" -#include "multiframe_flag.h" +#include "runtime/multiframe_flag.h" // inproc variant for comms with RT proxy threads // defined in messagbus.cc diff --git a/src/executables/mksocmemio/CMakeLists.txt b/src/executables/mksocmemio/CMakeLists.txt index 8b22009307..a77d6eaaf0 100644 --- a/src/executables/mksocmemio/CMakeLists.txt +++ b/src/executables/mksocmemio/CMakeLists.txt @@ -33,7 +33,7 @@ if(BUILD_MKSOCMEMIO_EXECUTABLE) target_sources(mksocmemio PRIVATE ${SOURCE_FILES}) - target_link_libraries(mksocmemio PRIVATE runtime_api) + target_link_libraries(mksocmemio PRIVATE runtime_api hal_api) target_compile_definitions(mksocmemio PRIVATE "ULAPI") endif() diff --git a/src/executables/mksocmemio/src/mksocmemio.c b/src/executables/mksocmemio/src/mksocmemio.c index 0656f42108..6761cfc0e5 100644 --- a/src/executables/mksocmemio/src/mksocmemio.c +++ b/src/executables/mksocmemio/src/mksocmemio.c @@ -1,10 +1,10 @@ -#include "config.h" +#include "runtime/config.h" #include #include -#include "rtapi.h" -#include "rtapi_compat.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_compat.h" #include #include #include diff --git a/src/executables/msgd/src/rtapi_msgd.cc b/src/executables/msgd/src/rtapi_msgd.cc index 3b15ccb32a..be404af6fb 100644 --- a/src/executables/msgd/src/rtapi_msgd.cc +++ b/src/executables/msgd/src/rtapi_msgd.cc @@ -28,9 +28,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ********************************************************************/ -#include "config.h" -#include "rtapi.h" -#include "rtapi_compat.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_compat.h" #include #include @@ -44,26 +44,26 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include using namespace std; -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include // version tags only #include diff --git a/src/executables/mutexwatch/src/mutexwatch.c b/src/executables/mutexwatch/src/mutexwatch.c index 6879ad1039..e6bc32a895 100644 --- a/src/executables/mutexwatch/src/mutexwatch.c +++ b/src/executables/mutexwatch/src/mutexwatch.c @@ -25,12 +25,12 @@ #include #include -#include "config.h" +#include "runtime/config.h" -#include "rtapi.h" -#include "rtapi_common.h" -#include "rtapi_global.h" -#include "shmdrv.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_common.h" +#include "runtime/rtapi_global.h" +#include "runtime/shmdrv.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/executables/npbdecode/src/npbdecode.c b/src/executables/npbdecode/src/npbdecode.c index 189aced56e..8e44f106d0 100644 --- a/src/executables/npbdecode/src/npbdecode.c +++ b/src/executables/npbdecode/src/npbdecode.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/src/executables/pci_read/src/pci_read.c b/src/executables/pci_read/src/pci_read.c index dd3c6a53d8..7a5e9e157f 100644 --- a/src/executables/pci_read/src/pci_read.c +++ b/src/executables/pci_read/src/pci_read.c @@ -31,8 +31,8 @@ #include #include #include -#include "upci.h" -#include "bitfile.h" +#include "upci/upci.h" +#include "upci/bitfile.h" /* define DEBUG_PRINTS to print info about command line parameters, the detected board, etc. */ diff --git a/src/executables/pci_write/src/pci_write.c b/src/executables/pci_write/src/pci_write.c index f7ee8ed45c..04466cbeda 100644 --- a/src/executables/pci_write/src/pci_write.c +++ b/src/executables/pci_write/src/pci_write.c @@ -31,8 +31,8 @@ #include #include #include -#include "upci.h" -#include "bitfile.h" +#include "upci/upci.h" +#include "upci/bitfile.h" /* define DEBUG_PRINTS to print info about command line parameters, the detected board, etc. */ diff --git a/src/executables/position/src/position.cc b/src/executables/position/src/position.cc index ab54de9b08..427de039b9 100644 --- a/src/executables/position/src/position.cc +++ b/src/executables/position/src/position.cc @@ -10,7 +10,7 @@ #include #include -#include +#include using namespace machinetalk; using namespace std; diff --git a/src/executables/rawread/src/rawread.c b/src/executables/rawread/src/rawread.c index 74dcc42d8b..e98b254d2a 100644 --- a/src/executables/rawread/src/rawread.c +++ b/src/executables/rawread/src/rawread.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/src/executables/rtapi_app/src/rtapi_app.cc b/src/executables/rtapi_app/src/rtapi_app.cc index 5750a7339e..f45344b536 100644 --- a/src/executables/rtapi_app/src/rtapi_app.cc +++ b/src/executables/rtapi_app/src/rtapi_app.cc @@ -35,7 +35,7 @@ * http://stackoverflow.com/questions/12141420/losing-capabilities-after-setuid */ -#include "config.h" +#include "runtime/config.h" #include #include #include @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include @@ -62,25 +62,25 @@ #include #include -#include // note_printf(machinetalk::Container &c, const char *fmt, ...) +#include // note_printf(machinetalk::Container &c, const char *fmt, ...) using namespace google::protobuf; #include "hal/hal.h" #include "hal/hal_priv.h" -#include "rtapi.h" -#include "rtapi_export.h" -#include "rtapi_flavor.h" // flavor_* -#include "rtapi_global.h" -#include "shmdrv.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_export.h" +#include "runtime/rtapi_flavor.h" // flavor_* +#include "runtime/rtapi_global.h" +#include "runtime/shmdrv.h" #ifdef SYS_IO_AVAILABLE -#include "rtapi_io.h" +#include "runtime/rtapi_io.h" #endif -#include "mk-backtrace.h" -#include "mk-zeroconf.hh" -#include "setup_signals.h" +#include "machinetalk/mk-backtrace.h" +#include "machinetalk/mk-zeroconf.hh" +#include "machinetalk/setup_signals.h" #include "rtapi_app_module.hh" diff --git a/src/executables/rtapi_app/src/rtapi_app_module.hh b/src/executables/rtapi_app/src/rtapi_app_module.hh index 026c2c395a..54a70a08c2 100644 --- a/src/executables/rtapi_app/src/rtapi_app_module.hh +++ b/src/executables/rtapi_app/src/rtapi_app_module.hh @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rtapi_compat.h" // get_elf_section() +#include "runtime/rtapi_compat.h" // get_elf_section() #include // PATH_MAX #include diff --git a/src/executables/rtprintf/src/rtprintf.c b/src/executables/rtprintf/src/rtprintf.c index 493e311e18..4909cd3ba8 100644 --- a/src/executables/rtprintf/src/rtprintf.c +++ b/src/executables/rtprintf/src/rtprintf.c @@ -24,7 +24,7 @@ #include #include #include -#include "rtapi.h" +#include "runtime/rtapi.h" #define MIN(a,b) ((a)<(b)?(a):(b)) diff --git a/src/executables/test_rtapi_vsnprinf/src/test_rtapi_vsnprintf.c b/src/executables/test_rtapi_vsnprinf/src/test_rtapi_vsnprintf.c index d6a8c21906..43870265ee 100644 --- a/src/executables/test_rtapi_vsnprinf/src/test_rtapi_vsnprintf.c +++ b/src/executables/test_rtapi_vsnprinf/src/test_rtapi_vsnprintf.c @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "rtapi.h" +#include "runtime/rtapi.h" #include "vsnprintf.h" #include #include diff --git a/src/executables/test_rtapi_vsnprinf/src/vsnprintf.h b/src/executables/test_rtapi_vsnprinf/src/vsnprintf.h index de10594c37..19f88d3e78 100644 --- a/src/executables/test_rtapi_vsnprinf/src/vsnprintf.h +++ b/src/executables/test_rtapi_vsnprinf/src/vsnprintf.h @@ -37,8 +37,8 @@ values (or floating point). #include #include #include -#include "rtapi_math.h" -#include +#include "runtime/rtapi_math.h" +#include /* we use this so that we can do without the string library */ static int strn_len(const char *s, int count) diff --git a/src/executables/unionread/src/unionread.c b/src/executables/unionread/src/unionread.c index 2578e4042c..f3bb2dcf7d 100644 --- a/src/executables/unionread/src/unionread.c +++ b/src/executables/unionread/src/unionread.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/src/executables/webtalk/src/webtalk.hh b/src/executables/webtalk/src/webtalk.hh index 73e01d2e7e..23f7a0d5a7 100644 --- a/src/executables/webtalk/src/webtalk.hh +++ b/src/executables/webtalk/src/webtalk.hh @@ -66,15 +66,15 @@ enum wt_log_levels { #define lwsl_zws(...) _lws_log(LLL_ZWS, __VA_ARGS__) -#include -#include -#include "mk-service.hh" -#include "mk-zeroconf.hh" +#include +#include +#include "machinetalk/mk-service.hh" +#include "machinetalk/mk-zeroconf.hh" #include namespace gpb = google::protobuf; -#include +#include #include #include diff --git a/src/executables/webtalk/src/webtalk_main.cc b/src/executables/webtalk/src/webtalk_main.cc index fa0570e4c7..14f73d3e04 100644 --- a/src/executables/webtalk/src/webtalk_main.cc +++ b/src/executables/webtalk/src/webtalk_main.cc @@ -17,8 +17,8 @@ */ #include "webtalk.hh" -#include -#include +#include +#include // configuration defaults static wtconf_t conf; diff --git a/src/libraries/hal/CMakeLists.txt b/src/libraries/hal/CMakeLists.txt index ce91e0ae59..72f1e3234f 100644 --- a/src/libraries/hal/CMakeLists.txt +++ b/src/libraries/hal/CMakeLists.txt @@ -55,7 +55,7 @@ if(BUILD_HAL_LIBRARY) ${CMAKE_CURRENT_SOURCE_DIR}/src/hal_accessor.c ${CMAKE_CURRENT_SOURCE_DIR}/src/hal_iring.c) - set(HALPB_SOURCE_FILES src/halpb.cc) + set(HALPB_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/halpb.cc) set(PUBLIC_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/hal/config_module.h @@ -97,7 +97,7 @@ if(BUILD_HAL_LIBRARY) export_rtapi_symbols(TARGET hal_module) - #set_target_properties(hal_api PROPERTIES PUBLIC_HEADER ${PUBLIC_HEADER_FILES}) + set_target_properties(hal_api PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADER_FILES}") set_target_properties( hal diff --git a/src/libraries/hal/include/hal/hal.h b/src/libraries/hal/include/hal/hal.h index dfd22e0c40..aef43b8787 100644 --- a/src/libraries/hal/include/hal/hal.h +++ b/src/libraries/hal/include/hal/hal.h @@ -123,7 +123,7 @@ */ -#include +#include RTAPI_BEGIN_DECLS #if ( !defined RTAPI ) && ( !defined ULAPI ) @@ -131,7 +131,7 @@ RTAPI_BEGIN_DECLS #endif #include -#include +#include #define HAL_NAME_LEN 41 // legacy length limit #define HAL_MAX_NAME_LEN 127 // actual limit at HAL layer (new-style halg_* methods) @@ -519,7 +519,7 @@ typedef enum { #ifdef LCNC_COMPAT /* Use these for x86 machines, and anything else that can write to individual bytes in a machine word. */ -#include +#include typedef double real_t __attribute__((aligned(8))); #define hal_float_t volatile real_t #endif diff --git a/src/libraries/hal/include/hal/hal_accessor.h b/src/libraries/hal/include/hal/hal_accessor.h index b93f689525..cee8cd146a 100644 --- a/src/libraries/hal/include/hal/hal_accessor.h +++ b/src/libraries/hal/include/hal/hal_accessor.h @@ -1,8 +1,8 @@ #ifndef HAL_ACCESSOR_H #define HAL_ACCESSOR_H -#include "rtapi.h" -#include "rtapi_atomics.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_atomics.h" RTAPI_BEGIN_DECLS diff --git a/src/libraries/hal/include/hal/hal_group.h b/src/libraries/hal/include/hal/hal_group.h index 30bcec8833..698c0a8f4d 100644 --- a/src/libraries/hal/include/hal/hal_group.h +++ b/src/libraries/hal/include/hal/hal_group.h @@ -1,7 +1,7 @@ #ifndef HAL_GROUP_H #define HAL_GROUP_H -#include +#include #include RTAPI_BEGIN_DECLS diff --git a/src/libraries/hal/include/hal/hal_internal.h b/src/libraries/hal/include/hal/hal_internal.h index e9bbf146f8..49b422cf6c 100644 --- a/src/libraries/hal/include/hal/hal_internal.h +++ b/src/libraries/hal/include/hal/hal_internal.h @@ -1,7 +1,7 @@ #ifndef HAL_INTERNAL_H #define HAL_INTERNAL_H -#include +#include #include // definitions for library-interal use only diff --git a/src/libraries/hal/include/hal/hal_iring.h b/src/libraries/hal/include/hal/hal_iring.h index 05d4511019..bee4824e02 100644 --- a/src/libraries/hal/include/hal/hal_iring.h +++ b/src/libraries/hal/include/hal/hal_iring.h @@ -1,8 +1,8 @@ #ifndef INTERNAL_RING_H #define INTERNAL_RING_H -#include -#include +#include +#include #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_internal.h" diff --git a/src/libraries/hal/include/hal/hal_iter.h b/src/libraries/hal/include/hal/hal_iter.h index 970aa5cbc3..a15d4e68b6 100644 --- a/src/libraries/hal/include/hal/hal_iter.h +++ b/src/libraries/hal/include/hal/hal_iter.h @@ -1,7 +1,7 @@ #ifndef HAL_ITER_H #define HAL_ITER_H -#include +#include #include #include #include diff --git a/src/libraries/hal/include/hal/hal_logging.h b/src/libraries/hal/include/hal/hal_logging.h index 16413c0fbb..8fe912e824 100644 --- a/src/libraries/hal/include/hal/hal_logging.h +++ b/src/libraries/hal/include/hal/hal_logging.h @@ -1,7 +1,7 @@ #ifndef HAL_LOGGING_H #define HAL_LOGGING_H -#include +#include #include RTAPI_BEGIN_DECLS diff --git a/src/libraries/hal/include/hal/hal_object.h b/src/libraries/hal/include/hal/hal_object.h index b5aa91df73..360ccd1d28 100644 --- a/src/libraries/hal/include/hal/hal_object.h +++ b/src/libraries/hal/include/hal/hal_object.h @@ -1,7 +1,7 @@ #ifndef HAL_OBJECT_H #define HAL_OBJECT_H -#include "rtapi_int.h" +#include "runtime/rtapi_int.h" #include "hal/hal_object.h" #include "hal/hal_list.h" diff --git a/src/libraries/hal/include/hal/hal_priv.h b/src/libraries/hal/include/hal/hal_priv.h index 18676d06a7..522ed361ca 100644 --- a/src/libraries/hal/include/hal/hal_priv.h +++ b/src/libraries/hal/include/hal/hal_priv.h @@ -92,12 +92,12 @@ up a little. */ -#include -#include +#include +#include #include "hal/hal_logging.h" #ifdef ULAPI -#include +#include #endif #include @@ -678,7 +678,7 @@ typedef struct hal_vtable { the structs will be fully protected, with a clean shutdown and meaningfull error messages in case of a mismatch. */ -#include "rtapi_shmkeys.h" +#include "runtime/rtapi_shmkeys.h" #define HAL_VER 13 /* version code */ diff --git a/src/libraries/hal/include/hal/hal_rcomp.h b/src/libraries/hal/include/hal/hal_rcomp.h index 94a5753dd3..6b2954a475 100644 --- a/src/libraries/hal/include/hal/hal_rcomp.h +++ b/src/libraries/hal/include/hal/hal_rcomp.h @@ -1,7 +1,7 @@ #ifndef _HAL_RCOMP_H #define _HAL_RCOMP_H -#include +#include RTAPI_BEGIN_DECLS diff --git a/src/libraries/hal/include/hal/hal_ring.h b/src/libraries/hal/include/hal/hal_ring.h index 19dab152e1..74553c29cf 100644 --- a/src/libraries/hal/include/hal/hal_ring.h +++ b/src/libraries/hal/include/hal/hal_ring.h @@ -1,11 +1,11 @@ #ifndef HAL_RING_H #define HAL_RING_H -#include -#include +#include +#include #include "hal/hal_internal.h" -#include -#include +#include +#include RTAPI_BEGIN_DECLS diff --git a/src/libraries/hal/include/hal/hal_types.h b/src/libraries/hal/include/hal/hal_types.h index 1dfd6d65c2..f999b36092 100644 --- a/src/libraries/hal/include/hal/hal_types.h +++ b/src/libraries/hal/include/hal/hal_types.h @@ -1,8 +1,8 @@ #ifndef _HAL_TYPES_H #define _HAL_TYPES_H -#include "rtapi.h" // rtapi_ct_assert() -#include "rtapi_bool.h" // bool +#include "runtime/rtapi.h" // rtapi_ct_assert() +#include "runtime/rtapi_bool.h" // bool // the legacy code chose to define HAL types using 'volatile' for no good reason // it does not address the atomicity issue and disables some optimizations diff --git a/src/libraries/hal/include/hal/halpb.hh b/src/libraries/hal/include/hal/halpb.hh index d714fb60a7..2073ceec88 100644 --- a/src/libraries/hal/include/hal/halpb.hh +++ b/src/libraries/hal/include/hal/halpb.hh @@ -18,7 +18,7 @@ // various functions and inlines dealing both with protobuf and HAL objects -#include +#include #include #include #include diff --git a/src/libraries/hal/src/hal_accessor.c b/src/libraries/hal/src/hal_accessor.c index 4bc9e3a1e5..7aee8f40c4 100644 --- a/src/libraries/hal/src/hal_accessor.c +++ b/src/libraries/hal/src/hal_accessor.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "runtime/config.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_accessor.h" diff --git a/src/libraries/hal/src/hal_comp.c b/src/libraries/hal/src/hal_comp.c index a29dcecdd7..bef47a4705 100644 --- a/src/libraries/hal/src/hal_comp.c +++ b/src/libraries/hal/src/hal_comp.c @@ -1,7 +1,7 @@ // HAL components API -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/src/libraries/hal/src/hal_funct.c b/src/libraries/hal/src/hal_funct.c index 6e156cb993..26e7438f6e 100644 --- a/src/libraries/hal/src/hal_funct.c +++ b/src/libraries/hal/src/hal_funct.c @@ -1,7 +1,7 @@ // HAL funct API -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/src/libraries/hal/src/hal_group.c b/src/libraries/hal/src/hal_group.c index 8b986f4913..631cbfb478 100644 --- a/src/libraries/hal/src/hal_group.c +++ b/src/libraries/hal/src/hal_group.c @@ -1,6 +1,6 @@ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/src/libraries/hal/src/hal_instance.c b/src/libraries/hal/src/hal_instance.c index 197949e3d7..263667c24c 100644 --- a/src/libraries/hal/src/hal_instance.c +++ b/src/libraries/hal/src/hal_instance.c @@ -1,7 +1,7 @@ // HAL instance API -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/src/libraries/hal/src/hal_iring.c b/src/libraries/hal/src/hal_iring.c index a6d20c6532..608f9d287d 100644 --- a/src/libraries/hal/src/hal_iring.c +++ b/src/libraries/hal/src/hal_iring.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "runtime/config.h" #include "hal/hal_iring.h" iring_t *hal_iring_alloc(const size_t size) diff --git a/src/libraries/hal/src/hal_lib.c b/src/libraries/hal/src/hal_lib.c index 776c710066..bd6c47788d 100644 --- a/src/libraries/hal/src/hal_lib.c +++ b/src/libraries/hal/src/hal_lib.c @@ -57,17 +57,17 @@ */ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" #include "hal/hal_iring.h" -#include "rtapi_string.h" -#include "rtapi_flavor.h" // flavor_descriptor +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_flavor.h" // flavor_descriptor #ifdef RTAPI -#include "rtapi_app.h" +#include "runtime/rtapi_app.h" /* module information */ MODULE_AUTHOR("John Kasunich"); MODULE_DESCRIPTION("Hardware Abstraction Layer for EMC"); @@ -87,7 +87,7 @@ MODULE_LICENSE("GPL"); #include /* remote comp bind/unbind/update timestamps */ #include /* PATH_MAX */ #include /* exit() */ -#include "shmdrv.h" +#include "runtime/shmdrv.h" #endif diff --git a/src/libraries/hal/src/hal_memory.c b/src/libraries/hal/src/hal_memory.c index 61bb858e38..4a89ffbca5 100644 --- a/src/libraries/hal/src/hal_memory.c +++ b/src/libraries/hal/src/hal_memory.c @@ -18,8 +18,8 @@ //NB: take care to return memory to the proper heap. -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/src/libraries/hal/src/hal_misc.c b/src/libraries/hal/src/hal_misc.c index 81ade79b8d..3ac9548974 100644 --- a/src/libraries/hal/src/hal_misc.c +++ b/src/libraries/hal/src/hal_misc.c @@ -1,7 +1,7 @@ // HAL miscellaneous functions which dont clearly fit elsewhere -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/src/libraries/hal/src/hal_object.c b/src/libraries/hal/src/hal_object.c index 5b4f75dca7..0319face73 100644 --- a/src/libraries/hal/src/hal_object.c +++ b/src/libraries/hal/src/hal_object.c @@ -1,14 +1,14 @@ // non-inlined hal_object_t accessors // inlined accessors are in hal_object.h -#include "config.h" -#include "rtapi.h" -#include "rtapi_atomics.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_atomics.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_object.h" #include "hal/hal_list.h" #include "hal/hal_internal.h" -#include "rtapi_heap_private.h" // rtapi_malloc_hdr_t +#include "runtime/rtapi_heap_private.h" // rtapi_malloc_hdr_t #define MAX_OBJECT_NAME_LEN 127 diff --git a/src/libraries/hal/src/hal_object_selectors.c b/src/libraries/hal/src/hal_object_selectors.c index df6b0d0527..a7462fca28 100644 --- a/src/libraries/hal/src/hal_object_selectors.c +++ b/src/libraries/hal/src/hal_object_selectors.c @@ -3,8 +3,8 @@ // see hal_objects.h:halg_foreach for halg_foreach semantics // see hal_object_selectors.h for selector usage -#include "config.h" -#include "rtapi.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_ring.h" diff --git a/src/libraries/hal/src/hal_param.c b/src/libraries/hal/src/hal_param.c index 54dde4f19d..dbf3fcef02 100644 --- a/src/libraries/hal/src/hal_param.c +++ b/src/libraries/hal/src/hal_param.c @@ -1,7 +1,7 @@ // HAL param API -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/src/libraries/hal/src/hal_pin.c b/src/libraries/hal/src/hal_pin.c index 6696321568..afac10976c 100644 --- a/src/libraries/hal/src/hal_pin.c +++ b/src/libraries/hal/src/hal_pin.c @@ -1,7 +1,7 @@ // HAL pin API -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_group.h" diff --git a/src/libraries/hal/src/hal_rcomp.c b/src/libraries/hal/src/hal_rcomp.c index eea69a424e..1dcd04c3ab 100644 --- a/src/libraries/hal/src/hal_rcomp.c +++ b/src/libraries/hal/src/hal_rcomp.c @@ -1,6 +1,6 @@ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_rcomp.h" /* HAL remote component decls */ @@ -16,7 +16,7 @@ #include /* remote comp bind/unbind/update timestamps */ #include /* PATH_MAX */ #include /* exit() */ -#include "shmdrv.h" +#include "runtime/shmdrv.h" int halg_bind(const int use_hal_mutex, const char *comp_name) { diff --git a/src/libraries/hal/src/hal_ring.c b/src/libraries/hal/src/hal_ring.c index 7d6ecc59c0..c7e4c7ee70 100644 --- a/src/libraries/hal/src/hal_ring.c +++ b/src/libraries/hal/src/hal_ring.c @@ -1,6 +1,6 @@ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/src/libraries/hal/src/hal_signal.c b/src/libraries/hal/src/hal_signal.c index 54ff31cb1f..ad12720ad7 100644 --- a/src/libraries/hal/src/hal_signal.c +++ b/src/libraries/hal/src/hal_signal.c @@ -1,7 +1,7 @@ // HAL signal API -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_group.h" diff --git a/src/libraries/hal/src/hal_thread.c b/src/libraries/hal/src/hal_thread.c index 92d84dcf51..94bf2aca66 100644 --- a/src/libraries/hal/src/hal_thread.c +++ b/src/libraries/hal/src/hal_thread.c @@ -1,8 +1,8 @@ // HAL thread API -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_atomics.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_atomics.h" #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/src/libraries/hal/src/hal_vtable.c b/src/libraries/hal/src/hal_vtable.c index fc9fb11662..7b84a28739 100644 --- a/src/libraries/hal/src/hal_vtable.c +++ b/src/libraries/hal/src/hal_vtable.c @@ -1,6 +1,6 @@ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private decls */ #include "hal/hal_internal.h" diff --git a/src/libraries/hal_command/CMakeLists.txt b/src/libraries/hal_command/CMakeLists.txt index 0e5368b513..578c90998c 100644 --- a/src/libraries/hal_command/CMakeLists.txt +++ b/src/libraries/hal_command/CMakeLists.txt @@ -30,7 +30,14 @@ if(BUILD_HAL_COMMAND_LIBRARY) add_library(hal_command SHARED) add_library(${MACHINEKIT_HAL_NAMESPACE}::hal_command ALIAS hal_command) - set(SOURCE_FILES src/halcmd_commands.c src/halcmd.c src/halcmd_rtapiapp.cc) + set(SOURCE_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/src/halcmd_commands.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/halcmd.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/halcmd_rtapiapp.cc) + set(PUBLIC_HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/include/hal_command/halcmd_commands.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/hal_command/halcmd.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/hal_command/halcmd_rtapiapp.h) target_include_directories( hal_command @@ -58,11 +65,7 @@ if(BUILD_HAL_COMMAND_LIBRARY) hal_command PROPERTIES SOVERSION 0 VERSION ${CMAKE_PROJECT_VERSION} - PUBLIC_HEADER - "${CMAKE_CURRENT_SOURCE_DIR}/include/halcmd_commands.h" - PUBLIC_HEADER - "${CMAKE_CURRENT_SOURCE_DIR}/include/halcmd_rtapiapp.h" - PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/halcmd.h" + PUBLIC_HEADER "${PUBLIC_HEADER_FILES}" POSITION_INDEPENDENT_CODE TRUE) install( diff --git a/src/libraries/hal_command/include/halcmd.h b/src/libraries/hal_command/include/hal_command/halcmd.h similarity index 99% rename from src/libraries/hal_command/include/halcmd.h rename to src/libraries/hal_command/include/hal_command/halcmd.h index 5b4071948c..896d70cc6d 100644 --- a/src/libraries/hal_command/include/halcmd.h +++ b/src/libraries/hal_command/include/hal_command/halcmd.h @@ -42,7 +42,7 @@ #include #include "hal/hal.h" -#include "rtapi_compat.h" +#include "runtime/rtapi_compat.h" extern int halcmd_startup(int quiet); extern int halcmd_startup_uuid(int quiet, char *uri, const char *svc_uuid); diff --git a/src/libraries/hal_command/include/halcmd_commands.h b/src/libraries/hal_command/include/hal_command/halcmd_commands.h similarity index 99% rename from src/libraries/hal_command/include/halcmd_commands.h rename to src/libraries/hal_command/include/hal_command/halcmd_commands.h index 46f0707f69..32739dc263 100644 --- a/src/libraries/hal_command/include/halcmd_commands.h +++ b/src/libraries/hal_command/include/hal_command/halcmd_commands.h @@ -39,7 +39,7 @@ #ifndef HALCMD_COMMANDS_H #define HALCMD_COMMANDS_H -#include "halcmd.h" +#include "hal_command/halcmd.h" #include #include diff --git a/src/libraries/hal_command/include/halcmd_rtapiapp.h b/src/libraries/hal_command/include/hal_command/halcmd_rtapiapp.h similarity index 100% rename from src/libraries/hal_command/include/halcmd_rtapiapp.h rename to src/libraries/hal_command/include/hal_command/halcmd_rtapiapp.h diff --git a/src/libraries/hal_command/src/halcmd.c b/src/libraries/hal_command/src/halcmd.c index c445aad621..c942cb355e 100644 --- a/src/libraries/hal_command/src/halcmd.c +++ b/src/libraries/hal_command/src/halcmd.c @@ -42,9 +42,9 @@ information, go to https://github.com/machinekit. */ -#include "config.h" +#include "runtime/config.h" -#include "mk-inifile.h" /* iniFind() */ +#include "mkini/mk-inifile.h" /* iniFind() */ FILE *halcmd_inifile = NULL; #include @@ -61,11 +61,11 @@ FILE *halcmd_inifile = NULL; #include #include -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* private HAL decls */ -#include "halcmd_commands.h" -#include "halcmd_rtapiapp.h" +#include "hal_command/halcmd_commands.h" +#include "hal_command/halcmd_rtapiapp.h" diff --git a/src/libraries/hal_command/src/halcmd_commands.c b/src/libraries/hal_command/src/halcmd_commands.c index 0a053ff7a8..166abb1bc6 100644 --- a/src/libraries/hal_command/src/halcmd_commands.c +++ b/src/libraries/hal_command/src/halcmd_commands.c @@ -39,18 +39,18 @@ * information, go to https://github.com/machinekit. */ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_compat.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_compat.h" #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* private HAL decls */ #include "hal/hal_ring.h" /* ringbuffer declarations */ #include "hal/hal_group.h" /* group/member declarations */ #include "hal/hal_rcomp.h" /* remote component declarations */ -#include "halcmd_commands.h" -#include "halcmd_rtapiapp.h" -#include "rtapi_hexdump.h" -#include "rtapi_flavor.h" // flavor_descriptor +#include "hal_command/halcmd_commands.h" +#include "hal_command/halcmd_rtapiapp.h" +#include "runtime/rtapi_hexdump.h" +#include "runtime/rtapi_flavor.h" // flavor_descriptor #include @@ -67,7 +67,7 @@ #include #include #include /* PATH_MAX */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include /* floorl */ #include @@ -2444,8 +2444,8 @@ static int print_objects(char **patterns) return 0; } -#include "rtapi_global.h" -#include "shmdrv.h" +#include "runtime/rtapi_global.h" +#include "runtime/shmdrv.h" static int print_mutexes(char **patterns) { extern global_data_t *global_data; diff --git a/src/libraries/hal_command/src/halcmd_rtapiapp.cc b/src/libraries/hal_command/src/halcmd_rtapiapp.cc index 7d1bb26fc8..4134c98bac 100644 --- a/src/libraries/hal_command/src/halcmd_rtapiapp.cc +++ b/src/libraries/hal_command/src/halcmd_rtapiapp.cc @@ -1,12 +1,12 @@ -#include "config.h" -#include "halcmd_rtapiapp.h" +#include "runtime/config.h" +#include "hal_command/halcmd_rtapiapp.h" #include #include -#include "ll-zeroconf.hh" -#include "mk-zeroconf.hh" -#include "mk-zeroconf-types.h" -#include "pbutil.hh" +#include "machinetalk/ll-zeroconf.hh" +#include "machinetalk/mk-zeroconf.hh" +#include "machinetalk/mk-zeroconf-types.h" +#include "machinetalk/pbutil.hh" #include diff --git a/src/libraries/hal_parport/CMakeLists.txt b/src/libraries/hal_parport/CMakeLists.txt index 6585b9b04b..6f36157394 100644 --- a/src/libraries/hal_parport/CMakeLists.txt +++ b/src/libraries/hal_parport/CMakeLists.txt @@ -37,8 +37,14 @@ if(SYS_IO_AVAILABLE) # better/more descriptive name add_library(rtapi_parport INTERFACE) + set(PUBLIC_HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/include/hal_parport/hal_harport.h) + target_include_directories(rtapi_parport INTERFACE include) + set_target_properties(rtapi_parport PROPERTIES PUBLIC_HEADER + "${PUBLIC_HEADER_FILES}") + install( TARGETS rtapi_parport EXPORT machinekit_hal diff --git a/src/libraries/hal_parport/include/hal_parport.h b/src/libraries/hal_parport/include/hal_parport/hal_parport.h similarity index 100% rename from src/libraries/hal_parport/include/hal_parport.h rename to src/libraries/hal_parport/include/hal_parport/hal_parport.h diff --git a/src/libraries/halscope_memory/CMakeLists.txt b/src/libraries/halscope_memory/CMakeLists.txt index 99c444ce0b..b9b1398143 100644 --- a/src/libraries/halscope_memory/CMakeLists.txt +++ b/src/libraries/halscope_memory/CMakeLists.txt @@ -31,10 +31,17 @@ if(BUILD_HALSCOPE_MEMORY_LIBRARY) add_library(${MACHINEKIT_HAL_NAMESPACE}::halscope_memory ALIAS halscope_memory) + set(PUBLIC_HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/include/halscope_memory/scope_shm.h) + target_include_directories( halscope_memory INTERFACE $ $ #include #include -#include "mk-inifile.h" +#include "mkini/mk-inifile.h" #ifdef __cplusplus extern "C" { diff --git a/src/libraries/machinetalk/include/json2pb.hh b/src/libraries/machinetalk/include/machinetalk/json2pb.hh similarity index 100% rename from src/libraries/machinetalk/include/json2pb.hh rename to src/libraries/machinetalk/include/machinetalk/json2pb.hh diff --git a/src/libraries/machinetalk/include/ll-zeroconf.hh b/src/libraries/machinetalk/include/machinetalk/ll-zeroconf.hh similarity index 97% rename from src/libraries/machinetalk/include/ll-zeroconf.hh rename to src/libraries/machinetalk/include/machinetalk/ll-zeroconf.hh index 0c6e34c33c..118ee4403c 100644 --- a/src/libraries/machinetalk/include/ll-zeroconf.hh +++ b/src/libraries/machinetalk/include/machinetalk/ll-zeroconf.hh @@ -25,8 +25,8 @@ #include "czmq.h" -#include "czmq-watch.h" -#include "mk-zeroconf-types.h" +#include "machinetalk/czmq-watch.h" +#include "machinetalk/mk-zeroconf-types.h" #ifdef __cplusplus extern "C" { diff --git a/src/libraries/machinetalk/include/mk-backtrace.h b/src/libraries/machinetalk/include/machinetalk/mk-backtrace.h similarity index 100% rename from src/libraries/machinetalk/include/mk-backtrace.h rename to src/libraries/machinetalk/include/machinetalk/mk-backtrace.h diff --git a/src/libraries/machinetalk/include/mk-service.hh b/src/libraries/machinetalk/include/machinetalk/mk-service.hh similarity index 94% rename from src/libraries/machinetalk/include/mk-service.hh rename to src/libraries/machinetalk/include/machinetalk/mk-service.hh index a8d3ccd043..574a3ec2eb 100644 --- a/src/libraries/machinetalk/include/mk-service.hh +++ b/src/libraries/machinetalk/include/machinetalk/mk-service.hh @@ -7,9 +7,9 @@ #include #include -#include "czmq-watch.h" -#include "ll-zeroconf.hh" -#include "mk-zeroconf-types.h" +#include "machinetalk/czmq-watch.h" +#include "machinetalk/ll-zeroconf.hh" +#include "machinetalk/mk-zeroconf-types.h" // per-daemon: typedef struct { diff --git a/src/libraries/machinetalk/include/mk-zeroconf-types.h b/src/libraries/machinetalk/include/machinetalk/mk-zeroconf-types.h similarity index 100% rename from src/libraries/machinetalk/include/mk-zeroconf-types.h rename to src/libraries/machinetalk/include/machinetalk/mk-zeroconf-types.h diff --git a/src/libraries/machinetalk/include/mk-zeroconf.hh b/src/libraries/machinetalk/include/machinetalk/mk-zeroconf.hh similarity index 89% rename from src/libraries/machinetalk/include/mk-zeroconf.hh rename to src/libraries/machinetalk/include/machinetalk/mk-zeroconf.hh index b29ccaae3a..7ffcd28177 100644 --- a/src/libraries/machinetalk/include/mk-zeroconf.hh +++ b/src/libraries/machinetalk/include/machinetalk/mk-zeroconf.hh @@ -10,9 +10,9 @@ #include #include -#include "czmq-watch.h" -#include "ll-zeroconf.hh" -#include "mk-zeroconf-types.h" +#include "machinetalk/czmq-watch.h" +#include "machinetalk/ll-zeroconf.hh" +#include "machinetalk/mk-zeroconf-types.h" #ifdef __cplusplus extern "C" { diff --git a/src/libraries/machinetalk/include/pb-hal.h b/src/libraries/machinetalk/include/machinetalk/pb-hal.h similarity index 100% rename from src/libraries/machinetalk/include/pb-hal.h rename to src/libraries/machinetalk/include/machinetalk/pb-hal.h diff --git a/src/libraries/machinetalk/include/pbutil.hh b/src/libraries/machinetalk/include/machinetalk/pbutil.hh similarity index 100% rename from src/libraries/machinetalk/include/pbutil.hh rename to src/libraries/machinetalk/include/machinetalk/pbutil.hh diff --git a/src/libraries/machinetalk/include/setup_signals.h b/src/libraries/machinetalk/include/machinetalk/setup_signals.h similarity index 100% rename from src/libraries/machinetalk/include/setup_signals.h rename to src/libraries/machinetalk/include/machinetalk/setup_signals.h diff --git a/src/libraries/machinetalk/src/czmq-watch.c b/src/libraries/machinetalk/src/czmq-watch.c index 6ec95224c6..73d32d51bc 100644 --- a/src/libraries/machinetalk/src/czmq-watch.c +++ b/src/libraries/machinetalk/src/czmq-watch.c @@ -8,7 +8,7 @@ #include #include -#include "czmq-watch.h" +#include "machinetalk/czmq-watch.h" #ifdef CZMQ_WATCH_DEBUG #define DPRINTF(...) fprintf(stderr, ## __VA_ARGS__) diff --git a/src/libraries/machinetalk/src/inihelp.cc b/src/libraries/machinetalk/src/inihelp.cc index 102b27c966..deefe68707 100644 --- a/src/libraries/machinetalk/src/inihelp.cc +++ b/src/libraries/machinetalk/src/inihelp.cc @@ -1,4 +1,4 @@ -#include "inihelp.hh" +#include "machinetalk/inihelp.hh" // if *value == NULL, find in fp/key/section and strdup the result int str_inidefault(char **value, FILE *fp, const char *key, const char *section) diff --git a/src/libraries/machinetalk/src/json2pb.cc b/src/libraries/machinetalk/src/json2pb.cc index 3bccd8fed2..4d6a6cc4a9 100644 --- a/src/libraries/machinetalk/src/json2pb.cc +++ b/src/libraries/machinetalk/src/json2pb.cc @@ -11,12 +11,12 @@ #include #include -#include +#include #include namespace { -#include "bin2ascii.hh" +#include "machinetalk/bin2ascii.hh" } using google::protobuf::Message; diff --git a/src/libraries/machinetalk/src/ll_zeroconf_register.cc b/src/libraries/machinetalk/src/ll_zeroconf_register.cc index 409d57556b..862fb45c4d 100644 --- a/src/libraries/machinetalk/src/ll_zeroconf_register.cc +++ b/src/libraries/machinetalk/src/ll_zeroconf_register.cc @@ -26,11 +26,11 @@ #include -#include "config.h" -#include "ll-zeroconf.hh" -#include "syslog_async.h" +#include "runtime/config.h" +#include "machinetalk/ll-zeroconf.hh" +#include "syslog_async/syslog_async.h" #include "czmq.h" -#include "czmq-watch.h" +#include "machinetalk/czmq-watch.h" static void publish_reply(AvahiEntryGroup *g, AvahiEntryGroupState state, diff --git a/src/libraries/machinetalk/src/mk_backtrace.c b/src/libraries/machinetalk/src/mk_backtrace.c index 958a8d9645..ec8fcdbca1 100644 --- a/src/libraries/machinetalk/src/mk_backtrace.c +++ b/src/libraries/machinetalk/src/mk_backtrace.c @@ -1,6 +1,6 @@ -#include "mk-backtrace.h" +#include "machinetalk/mk-backtrace.h" -#include "config.h" +#include "runtime/config.h" #if defined(HAVE_LIBBACKTRACE) diff --git a/src/libraries/machinetalk/src/mk_service.cc b/src/libraries/machinetalk/src/mk_service.cc index cc3d1c3e2b..919dc02ec9 100644 --- a/src/libraries/machinetalk/src/mk_service.cc +++ b/src/libraries/machinetalk/src/mk_service.cc @@ -1,15 +1,15 @@ -#include "config.h" +#include "runtime/config.h" #ifndef SYSLOG_FACILITY #define SYSLOG_FACILITY LOG_LOCAL1 // where all rtapi/ulapi logging goes #endif -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/libraries/machinetalk/src/mk_zeroconf.cc b/src/libraries/machinetalk/src/mk_zeroconf.cc index 34790c457f..ea1be74606 100644 --- a/src/libraries/machinetalk/src/mk_zeroconf.cc +++ b/src/libraries/machinetalk/src/mk_zeroconf.cc @@ -3,7 +3,7 @@ * Copyright Michael Haberler 2014-2015 * License: Mozilla Public License Version 2.0 */ -#include "mk-zeroconf.hh" +#include "machinetalk/mk-zeroconf.hh" diff --git a/src/libraries/machinetalk/src/pbutil.cc b/src/libraries/machinetalk/src/pbutil.cc index 908648c297..6b2d7d3401 100644 --- a/src/libraries/machinetalk/src/pbutil.cc +++ b/src/libraries/machinetalk/src/pbutil.cc @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "pbutil.hh" -#include "syslog_async.h" +#include "machinetalk/pbutil.hh" +#include "syslog_async/syslog_async.h" #include #include diff --git a/src/libraries/machinetalk/src/setup_signals.c b/src/libraries/machinetalk/src/setup_signals.c index 9186a93ae7..34e0112a2a 100644 --- a/src/libraries/machinetalk/src/setup_signals.c +++ b/src/libraries/machinetalk/src/setup_signals.c @@ -1,4 +1,4 @@ -#include "setup_signals.h" +#include "machinetalk/setup_signals.h" #include #include #include diff --git a/src/libraries/machinetalk/src/zeroconf_resolve.cc b/src/libraries/machinetalk/src/zeroconf_resolve.cc index 4d45585022..d25db5131f 100644 --- a/src/libraries/machinetalk/src/zeroconf_resolve.cc +++ b/src/libraries/machinetalk/src/zeroconf_resolve.cc @@ -13,9 +13,9 @@ #include -#include "config.h" -#include "ll-zeroconf.hh" -#include "syslog_async.h" +#include "runtime/config.h" +#include "machinetalk/ll-zeroconf.hh" +#include "syslog_async/syslog_async.h" #define DEFAUL_TIMEOUT 3000 // msec to resolution diff --git a/src/libraries/machinetalk/test/tutorial/protobuf/cppmain.cc b/src/libraries/machinetalk/test/tutorial/protobuf/cppmain.cc index ffa9a55bca..7f69c28069 100644 --- a/src/libraries/machinetalk/test/tutorial/protobuf/cppmain.cc +++ b/src/libraries/machinetalk/test/tutorial/protobuf/cppmain.cc @@ -3,7 +3,7 @@ #include #include -#include +#include #include // autogenerated from demo.proto using namespace std; diff --git a/src/libraries/machinetalk/test/zeroconf_resolve_test.cc b/src/libraries/machinetalk/test/zeroconf_resolve_test.cc index 2f3e4d6a6b..a0a9d25b2b 100644 --- a/src/libraries/machinetalk/test/zeroconf_resolve_test.cc +++ b/src/libraries/machinetalk/test/zeroconf_resolve_test.cc @@ -10,9 +10,9 @@ #include -#include "config.h" -#include "ll-zeroconf.hh" -#include "syslog_async.h" +#include "runtime/config.h" +#include "machinetalk/ll-zeroconf.hh" +#include "syslog_async/syslog_async.h" int main(AVAHI_GCC_UNUSED int argc, char*argv[]) { diff --git a/src/libraries/misc_gtk/CMakeLists.txt b/src/libraries/misc_gtk/CMakeLists.txt index d9b0be73a7..5c6b04a7c9 100644 --- a/src/libraries/misc_gtk/CMakeLists.txt +++ b/src/libraries/misc_gtk/CMakeLists.txt @@ -31,21 +31,23 @@ if(BUILD_MISC_GTK_LIBRARY) add_library(${MACHINEKIT_HAL_NAMESPACE}::miscgtk ALIAS miscgtk) set(SOURCE_FILES src/miscgtk.c) + set(PUBLIC_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/misc_gtk/miscgtk.h) + + target_sources(miscgtk PRIVATE ${SOURCE_FILES} ${PUBLIC_HEADER_FILES}) - target_sources(miscgtk PRIVATE ${SOURCE_FILES}) target_include_directories( miscgtk PUBLIC $) - pkg_check_modules(LIBGTK "gtk+-2.0" REQUIRED IMPORTED_TARGET) + pkg_check_modules(GTK "gtk+-2.0" REQUIRED IMPORTED_TARGET) - target_link_libraries(miscgtk PUBLIC PkgConfig::LIBGTK) + target_link_libraries(miscgtk PUBLIC PkgConfig::GTK) set_target_properties( miscgtk PROPERTIES SOVERSION 0 VERSION ${CMAKE_PROJECT_VERSION} RUNTIME_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}" - PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/miscgtk.h") + PUBLIC_HEADER "${PUBLIC_HEADER_FILES}") install( TARGETS miscgtk diff --git a/src/libraries/misc_gtk/include/miscgtk.h b/src/libraries/misc_gtk/include/misc_gtk/miscgtk.h similarity index 100% rename from src/libraries/misc_gtk/include/miscgtk.h rename to src/libraries/misc_gtk/include/misc_gtk/miscgtk.h diff --git a/src/libraries/misc_gtk/src/miscgtk.c b/src/libraries/misc_gtk/src/miscgtk.c index 1fb90c7c12..2ffef7776f 100644 --- a/src/libraries/misc_gtk/src/miscgtk.c +++ b/src/libraries/misc_gtk/src/miscgtk.c @@ -46,7 +46,7 @@ #include #include -#include "miscgtk.h" /* decls for this code */ +#include "misc_gtk/miscgtk.h" /* decls for this code */ /*********************************************************************** * GLOBAL VARIABLES DECLARATIONS * diff --git a/src/libraries/mkini/CMakeLists.txt b/src/libraries/mkini/CMakeLists.txt index c7c93dfc4c..63a765f570 100644 --- a/src/libraries/mkini/CMakeLists.txt +++ b/src/libraries/mkini/CMakeLists.txt @@ -30,9 +30,12 @@ if(BUILD_MKINI_LIBRARY) add_library(mkini SHARED) add_library(${MACHINEKIT_HAL_NAMESPACE}::mkini ALIAS mkini) - set(SOURCE_FILES src/inifile.cc) + set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/inifile.cc) + set(PUBLIC_HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/include/mkini/mk-inifile.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/mkini/mk-inifile.hh) - target_sources(mkini PRIVATE ${SOURCE_FILES}) + target_sources(mkini PRIVATE ${SOURCE_FILES} ${PUBLIC_HEADER_FILES}) # TODO: Needed just because of the config.h?? target_link_libraries(mkini PRIVATE runtime_api) @@ -45,8 +48,7 @@ if(BUILD_MKINI_LIBRARY) mkini PROPERTIES SOVERSION 0 VERSION ${CMAKE_PROJECT_VERSION} - PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/mk-inifile.h" - PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/mk-inifile.hh" + PUBLIC_HEADER "${PUBLIC_HEADER_FILES}" POSITION_INDEPENDENT_CODE TRUE) install( TARGETS mkini diff --git a/src/libraries/mkini/include/mk-inifile.h b/src/libraries/mkini/include/mkini/mk-inifile.h similarity index 100% rename from src/libraries/mkini/include/mk-inifile.h rename to src/libraries/mkini/include/mkini/mk-inifile.h diff --git a/src/libraries/mkini/include/mk-inifile.hh b/src/libraries/mkini/include/mkini/mk-inifile.hh similarity index 99% rename from src/libraries/mkini/include/mk-inifile.hh rename to src/libraries/mkini/include/mkini/mk-inifile.hh index c06a8e6c7e..f48b888cac 100644 --- a/src/libraries/mkini/include/mk-inifile.hh +++ b/src/libraries/mkini/include/mkini/mk-inifile.hh @@ -16,7 +16,7 @@ #ifndef INIFILE_HH #define INIFILE_HH -#include +#include #ifndef __cplusplus #warning Inclusion of from C programs is deprecated. Include instead. diff --git a/src/libraries/mkini/src/inifile.cc b/src/libraries/mkini/src/inifile.cc index d28dcb9726..af096270f7 100644 --- a/src/libraries/mkini/src/inifile.cc +++ b/src/libraries/mkini/src/inifile.cc @@ -22,8 +22,8 @@ #include /* std::string */ #include /* invalid_argument() */ -#include "config.h" -#include "mk-inifile.hh" +#include "runtime/config.h" +#include "mkini/mk-inifile.hh" /// Return TRUE if the line has a line-ending problem static bool check_line_endings(const char *s) { diff --git a/src/libraries/nanopb_definitions/src/nanopb.c b/src/libraries/nanopb_definitions/src/nanopb.c index 51de7548f1..f6ad25a59d 100644 --- a/src/libraries/nanopb_definitions/src/nanopb.c +++ b/src/libraries/nanopb_definitions/src/nanopb.c @@ -6,9 +6,9 @@ // actual message definitions derived from .proto files are in a // separate module -#include "rtapi_export.h" +#include "runtime/rtapi_export.h" -#include +#include #include #include diff --git a/src/libraries/pyhalmodule/src/halmodule.cc b/src/libraries/pyhalmodule/src/halmodule.cc index 12e5196ed0..a4403ea26c 100644 --- a/src/libraries/pyhalmodule/src/halmodule.cc +++ b/src/libraries/pyhalmodule/src/halmodule.cc @@ -21,11 +21,11 @@ #include using namespace std; -#include "config.h" -#include "rtapi.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" #include "hal/hal.h" #include "hal/hal_priv.h" -#include "rtapi_compat.h" +#include "runtime/rtapi_compat.h" #define EXCEPTION_IF_NOT_LIVE(retval) do { \ if(self->hal_id <= 0) { \ diff --git a/src/libraries/raspi_cpuinfo/CMakeLists.txt b/src/libraries/raspi_cpuinfo/CMakeLists.txt index f7e86bdff4..31038d71b0 100644 --- a/src/libraries/raspi_cpuinfo/CMakeLists.txt +++ b/src/libraries/raspi_cpuinfo/CMakeLists.txt @@ -31,14 +31,28 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armhf") if(BUILD_RASPI_CPUINFO_LIBRARY) add_library(raspi_cpuinfo STATIC) - set(SOURCE_FILES src/cpuinfo.c) + set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/cpuinfo.c) - set(PUBLIC_HEADER_FILES include/cpuinfo.h) + set(PUBLIC_HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/include/raspi_cpuinfo/cpuinfo.h) target_sources(raspi_cpuinfo PRIVATE ${SOURCE_FILES} ${PUBLIC_HEADER_FILES}) target_include_directories( raspi_cpuinfo - PUBLIC $) + PUBLIC $ + $) + + set_target_properties( + raspi_cpuinfo PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADER_FILES}" + POSITION_INDEPENDENT_CODE TRUE) + install( + TARGETS raspi_cpuinfo + EXPORT machinekit_hal + LIBRARY DESTINATION "${MACHINEKIT_HAL_LIBRARY_DIRECTORY}" + COMPONENT MachinekitHAL_Library_Base + NAMELINK_COMPONENT MachinekitHAL_Library_Development + PUBLIC_HEADER DESTINATION "${MACHINEKIT_HAL_INTERFACE_DIRECTORY}" + COMPONENT MachinekitHAL_Library_Development) endif() endif() diff --git a/src/libraries/raspi_cpuinfo/include/cpuinfo.h b/src/libraries/raspi_cpuinfo/include/raspi_cpuinfo/cpuinfo.h similarity index 100% rename from src/libraries/raspi_cpuinfo/include/cpuinfo.h rename to src/libraries/raspi_cpuinfo/include/raspi_cpuinfo/cpuinfo.h diff --git a/src/libraries/raspi_cpuinfo/src/cpuinfo.c b/src/libraries/raspi_cpuinfo/src/cpuinfo.c index b81e566413..c88ca8d975 100644 --- a/src/libraries/raspi_cpuinfo/src/cpuinfo.c +++ b/src/libraries/raspi_cpuinfo/src/cpuinfo.c @@ -22,7 +22,7 @@ SOFTWARE. #include #include -#include "cpuinfo.h" +#include "raspi_cpuinfo/cpuinfo.h" char *get_cpuinfo_revision(char *revision) { diff --git a/src/libraries/rtapi_compat/CMakeLists.txt b/src/libraries/rtapi_compat/CMakeLists.txt index ffd6853935..6b7710d7a8 100644 --- a/src/libraries/rtapi_compat/CMakeLists.txt +++ b/src/libraries/rtapi_compat/CMakeLists.txt @@ -31,9 +31,11 @@ add_library(rtapi_compat INTERFACE) -set(SOURCE_FILES "src/rtapi_compat.c") +set(SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/rtapi_compat.c") +set(PUBLIC_HEADER_FILES + "${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_compat.h") -target_sources(rtapi_compat INTERFACE ${SOURCE_FILES}) +target_sources(rtapi_compat INTERFACE ${SOURCE_FILES} ${PUBLIC_HEADER_FILES}) target_include_directories( rtapi_compat @@ -41,7 +43,7 @@ target_include_directories( $) set_target_properties(rtapi_compat PROPERTIES PUBLIC_HEADER - include/rtapi_compat.h) + "${PUBLIC_HEADER_FILES}") install( TARGETS rtapi_compat EXPORT machinekit_hal diff --git a/src/libraries/rtapi_compat/include/rtapi_compat.h b/src/libraries/rtapi_compat/include/runtime/rtapi_compat.h similarity index 98% rename from src/libraries/rtapi_compat/include/rtapi_compat.h rename to src/libraries/rtapi_compat/include/runtime/rtapi_compat.h index 59caa6f76d..0f73fc583d 100644 --- a/src/libraries/rtapi_compat/include/rtapi_compat.h +++ b/src/libraries/rtapi_compat/include/runtime/rtapi_compat.h @@ -21,7 +21,7 @@ #ifndef RTAPI_COMPAT_H #define RTAPI_COMPAT_H -#include "rtapi_bitops.h" +#include "runtime/rtapi_bitops.h" #include // provides PATH_MAX // these functions must work with or without rtapi.h included diff --git a/src/libraries/rtapi_compat/src/rtapi_compat.c b/src/libraries/rtapi_compat/src/rtapi_compat.c index 0628b0e4da..607b81251a 100644 --- a/src/libraries/rtapi_compat/src/rtapi_compat.c +++ b/src/libraries/rtapi_compat/src/rtapi_compat.c @@ -21,10 +21,10 @@ // a user process; neither RTAPI nor ULAPI and universally // available to user processes -#include "config.h" -#include "rtapi.h" -#include "rtapi_compat.h" -#include "mk-inifile.h" /* iniFind() */ +#include "runtime/config.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_compat.h" +#include "mkini/mk-inifile.h" /* iniFind() */ #include #include diff --git a/src/libraries/rtapi_pci/CMakeLists.txt b/src/libraries/rtapi_pci/CMakeLists.txt index 97e0366e10..661c897148 100644 --- a/src/libraries/rtapi_pci/CMakeLists.txt +++ b/src/libraries/rtapi_pci/CMakeLists.txt @@ -34,7 +34,11 @@ if(SYS_IO_AVAILABLE) if(BUILD_RTAPI_PCI_LIBRARY) add_library(rtapi_pci INTERFACE) - target_sources(rtapi_pci INTERFACE src/rtapi_pci.c) + set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/rtapi_pci.c) + set(PUBLIC_HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_pci.h) + + target_sources(rtapi_pci INTERFACE ${SOURCE_FILES} ${PUBLIC_HEADER_FILES}) target_include_directories( rtapi_pci @@ -42,7 +46,7 @@ if(SYS_IO_AVAILABLE) $) set_target_properties(rtapi_pci PROPERTIES PUBLIC_HEADER - include/rtapi_pci.h) + "${PUBLIC_HEADER_FILES}") install( TARGETS rtapi_pci diff --git a/src/libraries/rtapi_pci/include/rtapi_pci.h b/src/libraries/rtapi_pci/include/runtime/rtapi_pci.h similarity index 100% rename from src/libraries/rtapi_pci/include/rtapi_pci.h rename to src/libraries/rtapi_pci/include/runtime/rtapi_pci.h diff --git a/src/libraries/rtapi_pci/src/rtapi_pci.c b/src/libraries/rtapi_pci/src/rtapi_pci.c index 9d499f0cf8..64aeac7a35 100644 --- a/src/libraries/rtapi_pci/src/rtapi_pci.c +++ b/src/libraries/rtapi_pci/src/rtapi_pci.c @@ -28,7 +28,7 @@ #define _GNU_SOURCE #endif -#include "config.h" +#include "runtime/config.h" #include #include /* vprintf() */ @@ -42,9 +42,9 @@ #include #include -#include "rtapi.h" -#include "rtapi_pci.h" -#include "rtapi_common.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_pci.h" +#include "runtime/rtapi_common.h" /*********************************************************************** * PCI DEVICE SUPPORT * diff --git a/src/libraries/rtapi_support/src/rtapi_support.c b/src/libraries/rtapi_support/src/rtapi_support.c index 9b7eebd7cd..d296a461bf 100644 --- a/src/libraries/rtapi_support/src/rtapi_support.c +++ b/src/libraries/rtapi_support/src/rtapi_support.c @@ -27,11 +27,11 @@ ********************************************************************/ -#include "config.h" -#include "rtapi.h" -#include "shmdrv.h" -#include "ring.h" -#include "syslog_async.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" +#include "runtime/shmdrv.h" +#include "runtime/ring.h" +#include "syslog_async/syslog_async.h" #ifndef SYSLOG_FACILITY #define SYSLOG_FACILITY LOG_LOCAL1 // where all rtapi/ulapi logging goes #endif diff --git a/src/libraries/runtime/CMakeLists.txt b/src/libraries/runtime/CMakeLists.txt index ddb4b0245a..07c4943c88 100644 --- a/src/libraries/runtime/CMakeLists.txt +++ b/src/libraries/runtime/CMakeLists.txt @@ -44,20 +44,54 @@ if(BUILD_RUNTIME_LIBRARY) find_package(Threads REQUIRED) set(SOURCE_FILES - src/rtapi.c - src/rtapi_exception.c - src/rtapi_flavor.c - src/rtapi_flavor_hook_wrappers.c - src/rtapi_heap.c - src/rtapi_hexdump.c - src/rtapi_shmem.c - src/rtapi_task.c - src/rtapi_time.c) - - set(ULAPI_FLAVOR_SOURCE_FILE src/ulapi.c) - set(RT_PREEMPT_FLAVOR_SOURCE_FILE src/rt-preempt.c) - - set(HEADER_FILES include/multiframe.h) + ${CMAKE_CURRENT_SOURCE_DIR}/src/rtapi.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/rtapi_exception.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/rtapi_flavor.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/rtapi_flavor_hook_wrappers.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/rtapi_heap.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/rtapi_hexdump.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/rtapi_shmem.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/rtapi_task.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/rtapi_time.c) + + set(ULAPI_FLAVOR_SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/ulapi.c) + set(RT_PREEMPT_FLAVOR_SOURCE_FILE + ${CMAKE_CURRENT_SOURCE_DIR}/src/rt-preempt.c) + + set(PUBLIC_HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/multiframe_flag.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/multiframe.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/ring.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_app.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_atomics.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_bitops.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_bool.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_common.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_errno.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_exception.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_export.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_flavor.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_global.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_heap.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_heap_private.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_hexdump.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_int.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_limits.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_mbarrier.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_mutex.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_shmkeys.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_stdint.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_string.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/triple-buffer.h) + + set(RTAPI_IO_PUBLIC_HEADER + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_io.h) + + set(PRIVATE_HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/src/ulapi.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/rt-preempt.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/xenomai2.h) target_include_directories( runtime_api @@ -67,16 +101,18 @@ if(BUILD_RUNTIME_LIBRARY) $> ) + target_sources(runtime_api INTERFACE ${PUBLIC_HEADER_FILES}) + target_sources( runtime PRIVATE $ $ ${SOURCE_FILES} - ${ULAPI_FLAVOR_SOURCE_FILE}) + ${ULAPI_FLAVOR_SOURCE_FILE} ${PRIVATE_HEADER_FILES}) target_sources( runtime_module PRIVATE ${SOURCE_FILES} $ - ${RT_PREEMPT_FLAVOR_SOURCE_FILE}) + ${RT_PREEMPT_FLAVOR_SOURCE_FILE} ${PRIVATE_HEADER_FILES}) if(SYS_IO_AVAILABLE) target_include_directories( @@ -111,18 +147,22 @@ if(BUILD_RUNTIME_LIBRARY) if(SYS_IO_AVAILABLE) target_compile_definitions(runtime_api INTERFACE "SYS_IO_AVAILABLE") + list(APPEND PUBLIC_HEADER_FILES ${RTAPI_IO_PUBLIC_HEADER}) + target_sources(runtime_api INTERFACE ${RTAPI_IO_PUBLIC_HEADER}) # Add here rtapi_io.h to PUBLIC_HEADER to install endif() export_rtapi_symbols(TARGET runtime_module) - set_target_properties(runtime_api PROPERTIES PUBLIC_HEADER ${HEADER_FILES}) + set_target_properties(runtime_api PROPERTIES PUBLIC_HEADER + "${PUBLIC_HEADER_FILES}") set_target_properties( runtime PROPERTIES OUTPUT_NAME "rtapi" SOVERSION 0 VERSION ${CMAKE_PROJECT_VERSION} + PRIVATE_HEADER "${PRIVATE_HEADER_FILES}" POSITION_INDEPENDENT_CODE TRUE) set_target_properties( @@ -132,6 +172,9 @@ if(BUILD_RUNTIME_LIBRARY) LIBRARY_OUTPUT_DIRECTORY ${MACHINEKIT_HAL_MANAGED_MODULE_OUTPUT_DIRECTORY}) + set_target_properties(runtime_api PROPERTIES PUBLIC_HEADERS + "${PUBLIC_HEADER_FILES}") + string(TIMESTAMP RIGHT_NOW) string( UUID diff --git a/src/libraries/runtime/include/multiframe.h b/src/libraries/runtime/include/runtime/multiframe.h similarity index 99% rename from src/libraries/runtime/include/multiframe.h rename to src/libraries/runtime/include/runtime/multiframe.h index 390fe2f082..5f55550c0f 100644 --- a/src/libraries/runtime/include/multiframe.h +++ b/src/libraries/runtime/include/runtime/multiframe.h @@ -56,7 +56,7 @@ #ifndef __MULTIFRAME_H__ #define __MULTIFRAME_H__ -#include "ring.h" +#include "runtime/ring.h" typedef struct { ringbuffer_t *ring; diff --git a/src/libraries/runtime/include/multiframe_flag.h b/src/libraries/runtime/include/runtime/multiframe_flag.h similarity index 100% rename from src/libraries/runtime/include/multiframe_flag.h rename to src/libraries/runtime/include/runtime/multiframe_flag.h diff --git a/src/libraries/runtime/include/ring.h b/src/libraries/runtime/include/runtime/ring.h similarity index 99% rename from src/libraries/runtime/include/ring.h rename to src/libraries/runtime/include/runtime/ring.h index 8e1c1f33c5..1d8790480c 100644 --- a/src/libraries/runtime/include/ring.h +++ b/src/libraries/runtime/include/runtime/ring.h @@ -61,10 +61,10 @@ #ifndef RING_H #define RING_H -#include "rtapi_bitops.h" -#include "rtapi_atomics.h" -#include "rtapi_string.h" -#include "rtapi_int.h" +#include "runtime/rtapi_bitops.h" +#include "runtime/rtapi_atomics.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_int.h" #ifndef MAXIMUM // MAX conflicts with definition in hal/drivers/pci_8255.c diff --git a/src/libraries/runtime/include/rtapi.h b/src/libraries/runtime/include/runtime/rtapi.h similarity index 99% rename from src/libraries/runtime/include/rtapi.h rename to src/libraries/runtime/include/runtime/rtapi.h index 51dd521413..4f27fdd331 100644 --- a/src/libraries/runtime/include/rtapi.h +++ b/src/libraries/runtime/include/runtime/rtapi.h @@ -91,8 +91,8 @@ #endif #include // provides NULL, offset_of -#include "rtapi_int.h" -#include +#include "runtime/rtapi_int.h" +#include // need RTAPI_CACHELINE for rtapi_global.h RTAPI_BEGIN_DECLS @@ -107,9 +107,9 @@ RTAPI_BEGIN_DECLS #endif RTAPI_END_DECLS -#include -#include -#include +#include +#include +#include #define RTAPI_NAME_LEN 31 /* length for module, etc, names */ @@ -435,7 +435,7 @@ typedef struct { * LIGHTWEIGHT MUTEX FUNCTIONS * ************************************************************************/ #include /* for blocking when needed */ -#include "rtapi_bitops.h" /* atomic bit ops for lightweight mutex */ +#include "runtime/rtapi_bitops.h" /* atomic bit ops for lightweight mutex */ /** These three functions provide a very simple way to do mutual exclusion around shared resources. They do _not_ replace @@ -958,7 +958,7 @@ extern long int simple_strtol(const char *nptr, char **endptr, int base); 'num' is the number of elements in an array. */ -#include +#include #ifndef LINUX_VERSION_CODE #define LINUX_VERSION_CODE 0 diff --git a/src/libraries/runtime/include/rtapi_app.h b/src/libraries/runtime/include/runtime/rtapi_app.h similarity index 100% rename from src/libraries/runtime/include/rtapi_app.h rename to src/libraries/runtime/include/runtime/rtapi_app.h diff --git a/src/libraries/runtime/include/rtapi_atomics.h b/src/libraries/runtime/include/runtime/rtapi_atomics.h similarity index 99% rename from src/libraries/runtime/include/rtapi_atomics.h rename to src/libraries/runtime/include/runtime/rtapi_atomics.h index 9f4f43f649..19fb9392ea 100644 --- a/src/libraries/runtime/include/rtapi_atomics.h +++ b/src/libraries/runtime/include/runtime/rtapi_atomics.h @@ -23,7 +23,7 @@ #ifndef _RTAPI_ATOMICS_H #define _RTAPI_ATOMICS_H -#include "rtapi_int.h" +#include "runtime/rtapi_int.h" #include "hal/hal_types.h" diff --git a/src/libraries/runtime/include/rtapi_bitops.h b/src/libraries/runtime/include/runtime/rtapi_bitops.h similarity index 100% rename from src/libraries/runtime/include/rtapi_bitops.h rename to src/libraries/runtime/include/runtime/rtapi_bitops.h diff --git a/src/libraries/runtime/include/rtapi_bool.h b/src/libraries/runtime/include/runtime/rtapi_bool.h similarity index 100% rename from src/libraries/runtime/include/rtapi_bool.h rename to src/libraries/runtime/include/runtime/rtapi_bool.h diff --git a/src/libraries/runtime/include/rtapi_common.h b/src/libraries/runtime/include/runtime/rtapi_common.h similarity index 98% rename from src/libraries/runtime/include/rtapi_common.h rename to src/libraries/runtime/include/runtime/rtapi_common.h index ed242b5e59..12dc5afc45 100644 --- a/src/libraries/runtime/include/rtapi_common.h +++ b/src/libraries/runtime/include/runtime/rtapi_common.h @@ -63,7 +63,7 @@ /* Keep the includes here - It might get messy.. */ -#include "rtapi.h" +#include "runtime/rtapi.h" #ifdef RTAPI #include /* for blocking when needed */ @@ -71,7 +71,7 @@ #include /* for blocking when needed */ #endif -#include "rtapi_bitops.h" /* test_bit() et al. */ +#include "runtime/rtapi_bitops.h" /* test_bit() et al. */ #include /* IPC_* */ #include diff --git a/src/libraries/runtime/include/rtapi_errno.h b/src/libraries/runtime/include/runtime/rtapi_errno.h similarity index 100% rename from src/libraries/runtime/include/rtapi_errno.h rename to src/libraries/runtime/include/runtime/rtapi_errno.h diff --git a/src/libraries/runtime/include/rtapi_exception.h b/src/libraries/runtime/include/runtime/rtapi_exception.h similarity index 100% rename from src/libraries/runtime/include/rtapi_exception.h rename to src/libraries/runtime/include/runtime/rtapi_exception.h diff --git a/src/libraries/runtime/include/rtapi_export.h b/src/libraries/runtime/include/runtime/rtapi_export.h similarity index 100% rename from src/libraries/runtime/include/rtapi_export.h rename to src/libraries/runtime/include/runtime/rtapi_export.h diff --git a/src/libraries/runtime/include/rtapi_flavor.h b/src/libraries/runtime/include/runtime/rtapi_flavor.h similarity index 99% rename from src/libraries/runtime/include/rtapi_flavor.h rename to src/libraries/runtime/include/runtime/rtapi_flavor.h index a197357e2f..31adb730ad 100644 --- a/src/libraries/runtime/include/rtapi_flavor.h +++ b/src/libraries/runtime/include/runtime/rtapi_flavor.h @@ -5,7 +5,7 @@ extern "C" { #endif -#include "rtapi_common.h" +#include "runtime/rtapi_common.h" // Flavor features: flavor_descriptor_t.flags bits for configuring flavor // - Whether iopl() needs to be called diff --git a/src/libraries/runtime/include/rtapi_global.h b/src/libraries/runtime/include/runtime/rtapi_global.h similarity index 95% rename from src/libraries/runtime/include/rtapi_global.h rename to src/libraries/runtime/include/runtime/rtapi_global.h index 0a1ebce1ed..4f1aa7f5e9 100644 --- a/src/libraries/runtime/include/rtapi_global.h +++ b/src/libraries/runtime/include/runtime/rtapi_global.h @@ -61,11 +61,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ********************************************************************/ -#include "rtapi_shmkeys.h" -#include "rtapi_bitops.h" // rtapi_atomic_type -#include "rtapi_exception.h" // thread status descriptors -#include "rtapi_heap.h" // shared memory allocator -#include "rtapi_heap_private.h" +#include "runtime/rtapi_shmkeys.h" +#include "runtime/rtapi_bitops.h" // rtapi_atomic_type +#include "runtime/rtapi_exception.h" // thread status descriptors +#include "runtime/rtapi_heap.h" // shared memory allocator +#include "runtime/rtapi_heap_private.h" #define MESSAGE_RING_SIZE (4096 * 128) diff --git a/src/libraries/runtime/include/rtapi_heap.h b/src/libraries/runtime/include/runtime/rtapi_heap.h similarity index 97% rename from src/libraries/runtime/include/rtapi_heap.h rename to src/libraries/runtime/include/runtime/rtapi_heap.h index fd2e344333..8ce1c4bec8 100644 --- a/src/libraries/runtime/include/rtapi_heap.h +++ b/src/libraries/runtime/include/runtime/rtapi_heap.h @@ -14,7 +14,7 @@ RTAPI_BEGIN_DECLS #include "stdarg.h" -#include "rtapi_bitops.h" // RTAPI_BIT +#include "runtime/rtapi_bitops.h" // RTAPI_BIT // flags for _rtapi_heap_setflags() #define RTAPIHEAP_TRACE_MALLOC RTAPI_BIT(0) diff --git a/src/libraries/runtime/include/rtapi_heap_private.h b/src/libraries/runtime/include/runtime/rtapi_heap_private.h similarity index 94% rename from src/libraries/runtime/include/rtapi_heap_private.h rename to src/libraries/runtime/include/runtime/rtapi_heap_private.h index 92284f5dbe..c73f933829 100644 --- a/src/libraries/runtime/include/rtapi_heap_private.h +++ b/src/libraries/runtime/include/runtime/rtapi_heap_private.h @@ -1,14 +1,14 @@ #ifndef _RTAPI_HEAP_PRIVATE_INCLUDED #define _RTAPI_HEAP_PRIVATE_INCLUDED -#include "rtapi.h" -#include "rtapi_bitops.h" // rtapi_atomic_type +#include "runtime/rtapi.h" +#include "runtime/rtapi_bitops.h" // rtapi_atomic_type #ifdef HAVE_CK #include #endif #include "stdarg.h" -#include "rtapi_heap.h" +#include "runtime/rtapi_heap.h" // assumptions: // heaps live in a single shared memory segment diff --git a/src/libraries/runtime/include/rtapi_hexdump.h b/src/libraries/runtime/include/runtime/rtapi_hexdump.h similarity index 99% rename from src/libraries/runtime/include/rtapi_hexdump.h rename to src/libraries/runtime/include/runtime/rtapi_hexdump.h index 0abdee81d7..dbc033b4ba 100644 --- a/src/libraries/runtime/include/rtapi_hexdump.h +++ b/src/libraries/runtime/include/runtime/rtapi_hexdump.h @@ -14,7 +14,7 @@ #ifndef RTAPI_HEXDUMP_H #define RTAPI_HEXDUMP_H -#include "rtapi.h" +#include "runtime/rtapi.h" RTAPI_BEGIN_DECLS diff --git a/src/libraries/runtime/include/rtapi_int.h b/src/libraries/runtime/include/runtime/rtapi_int.h similarity index 100% rename from src/libraries/runtime/include/rtapi_int.h rename to src/libraries/runtime/include/runtime/rtapi_int.h diff --git a/src/libraries/runtime/include/rtapi_io.h b/src/libraries/runtime/include/runtime/rtapi_io.h similarity index 98% rename from src/libraries/runtime/include/rtapi_io.h rename to src/libraries/runtime/include/runtime/rtapi_io.h index 04454b2ab1..afbcb426e1 100644 --- a/src/libraries/runtime/include/rtapi_io.h +++ b/src/libraries/runtime/include/runtime/rtapi_io.h @@ -24,7 +24,7 @@ #ifndef RTAPI_IO_H #define RTAPI_IO_H -#include "rtapi.h" // these functions +#include "runtime/rtapi.h" // these functions #include /* inb(), outb() */ /** 'rtapi_outb() writes 'byte' to 'port'. May be called from diff --git a/src/libraries/runtime/include/rtapi_limits.h b/src/libraries/runtime/include/runtime/rtapi_limits.h similarity index 100% rename from src/libraries/runtime/include/rtapi_limits.h rename to src/libraries/runtime/include/runtime/rtapi_limits.h diff --git a/src/libraries/runtime/include/rtapi_mbarrier.h b/src/libraries/runtime/include/runtime/rtapi_mbarrier.h similarity index 100% rename from src/libraries/runtime/include/rtapi_mbarrier.h rename to src/libraries/runtime/include/runtime/rtapi_mbarrier.h diff --git a/src/libraries/runtime/include/rtapi_mutex.h b/src/libraries/runtime/include/runtime/rtapi_mutex.h similarity index 97% rename from src/libraries/runtime/include/rtapi_mutex.h rename to src/libraries/runtime/include/runtime/rtapi_mutex.h index 917add14a7..58c32241ec 100644 --- a/src/libraries/runtime/include/rtapi_mutex.h +++ b/src/libraries/runtime/include/runtime/rtapi_mutex.h @@ -27,6 +27,6 @@ * These functions are moved into rtapi.h. This file exists for compatibility * with LinuxCNC. */ -#include +#include #endif diff --git a/src/libraries/runtime/include/rtapi_shmkeys.h b/src/libraries/runtime/include/runtime/rtapi_shmkeys.h similarity index 100% rename from src/libraries/runtime/include/rtapi_shmkeys.h rename to src/libraries/runtime/include/runtime/rtapi_shmkeys.h diff --git a/src/libraries/runtime/include/rtapi_stdint.h b/src/libraries/runtime/include/runtime/rtapi_stdint.h similarity index 100% rename from src/libraries/runtime/include/rtapi_stdint.h rename to src/libraries/runtime/include/runtime/rtapi_stdint.h diff --git a/src/libraries/runtime/include/rtapi_string.h b/src/libraries/runtime/include/runtime/rtapi_string.h similarity index 98% rename from src/libraries/runtime/include/rtapi_string.h rename to src/libraries/runtime/include/runtime/rtapi_string.h index f893c21c27..72cf1dab7e 100644 --- a/src/libraries/runtime/include/rtapi_string.h +++ b/src/libraries/runtime/include/runtime/rtapi_string.h @@ -18,7 +18,7 @@ #include -#include "rtapi.h" +#include "runtime/rtapi.h" #ifdef __cplusplus #include diff --git a/src/libraries/runtime/include/triple-buffer.h b/src/libraries/runtime/include/runtime/triple-buffer.h similarity index 99% rename from src/libraries/runtime/include/triple-buffer.h rename to src/libraries/runtime/include/runtime/triple-buffer.h index c827cba3e0..2af391455b 100644 --- a/src/libraries/runtime/include/triple-buffer.h +++ b/src/libraries/runtime/include/runtime/triple-buffer.h @@ -2,7 +2,7 @@ #define _TRIPLE_BUFFER_H #include #include -#include +#include // A triple buffer is a message passing scheme for a single producer, and single consumer // diff --git a/src/libraries/runtime/src/rt-preempt.c b/src/libraries/runtime/src/rt-preempt.c index 3fc0700163..b059ad4326 100644 --- a/src/libraries/runtime/src/rt-preempt.c +++ b/src/libraries/runtime/src/rt-preempt.c @@ -28,13 +28,13 @@ #define _GNU_SOURCE #endif -#include "rtapi_flavor.h" +#include "runtime/rtapi_flavor.h" #include "rt-preempt.h" -#include "rtapi.h" -#include "rtapi_common.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_common.h" #include -#include "config.h" +#include "runtime/config.h" #include // sched_get_priority_*() #include /* pthread_* */ diff --git a/src/libraries/runtime/include/rt-preempt.h b/src/libraries/runtime/src/rt-preempt.h similarity index 98% rename from src/libraries/runtime/include/rt-preempt.h rename to src/libraries/runtime/src/rt-preempt.h index 5056628c1b..01a2a81810 100644 --- a/src/libraries/runtime/include/rt-preempt.h +++ b/src/libraries/runtime/src/rt-preempt.h @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ********************************************************************/ -#include "rtapi_flavor.h" +#include "runtime/rtapi_flavor.h" typedef enum { RTP_EXCEPTION_NONE=0, diff --git a/src/libraries/runtime/src/rtapi.c b/src/libraries/runtime/src/rtapi.c index fd55ca3fc9..7a2f04a5b9 100644 --- a/src/libraries/runtime/src/rtapi.c +++ b/src/libraries/runtime/src/rtapi.c @@ -16,13 +16,13 @@ #include // strtol -#include "rtapi_flavor.h" -#include "config.h" -#include "rtapi.h" -#include "rtapi_common.h" -#include "rtapi_compat.h" -#include "shmdrv.h" /* common shm driver API */ -#include "ring.h" +#include "runtime/rtapi_flavor.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_common.h" +#include "runtime/rtapi_compat.h" +#include "runtime/shmdrv.h" /* common shm driver API */ +#include "runtime/ring.h" /* these pointers are initialized at startup to point to resource data in the master data structure above diff --git a/src/libraries/runtime/src/rtapi_exception.c b/src/libraries/runtime/src/rtapi_exception.c index ebc5bf0608..50bae97f12 100644 --- a/src/libraries/runtime/src/rtapi_exception.c +++ b/src/libraries/runtime/src/rtapi_exception.c @@ -21,10 +21,10 @@ * RT exception handling * ************************************************************************/ -#include "config.h" -#include "rtapi.h" -#include "rtapi_exception.h" -#include "rtapi_flavor.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_exception.h" +#include "runtime/rtapi_flavor.h" #ifdef RTAPI diff --git a/src/libraries/runtime/src/rtapi_flavor.c b/src/libraries/runtime/src/rtapi_flavor.c index ebde53a268..f297d00737 100644 --- a/src/libraries/runtime/src/rtapi_flavor.c +++ b/src/libraries/runtime/src/rtapi_flavor.c @@ -4,7 +4,7 @@ #include "ulapi.h" #endif #ifdef RTAPI -#include "rtapi_flavor.h" +#include "runtime/rtapi_flavor.h" #include "rt-preempt.h" #endif #ifdef HAVE_XENOMAI2_THREADS diff --git a/src/libraries/runtime/src/rtapi_flavor_hook_wrappers.c b/src/libraries/runtime/src/rtapi_flavor_hook_wrappers.c index 1c4e03e9df..f75c54a876 100644 --- a/src/libraries/runtime/src/rtapi_flavor_hook_wrappers.c +++ b/src/libraries/runtime/src/rtapi_flavor_hook_wrappers.c @@ -3,7 +3,7 @@ // // They must be in a separate file from functions calling them for mock calls to // work. -#include "rtapi_flavor.h" +#include "runtime/rtapi_flavor.h" #define SET_FLAVOR_DESCRIPTOR_DEFAULT() \ do { if (f == NULL) f = flavor_descriptor; } while (0) diff --git a/src/libraries/runtime/src/rtapi_heap.c b/src/libraries/runtime/src/rtapi_heap.c index 384dd5d1d3..368d7e09f8 100644 --- a/src/libraries/runtime/src/rtapi_heap.c +++ b/src/libraries/runtime/src/rtapi_heap.c @@ -16,14 +16,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ********************************************************************/ -#include "config.h" -#include "rtapi.h" -#include "rtapi_int.h" -#include "rtapi_heap.h" -#include "rtapi_heap_private.h" -#include "rtapi_export.h" -#include "rtapi_bitops.h" -#include "rtapi_string.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_int.h" +#include "runtime/rtapi_heap.h" +#include "runtime/rtapi_heap_private.h" +#include "runtime/rtapi_export.h" +#include "runtime/rtapi_bitops.h" +#include "runtime/rtapi_string.h" #ifdef ULAPI #include #include diff --git a/src/libraries/runtime/src/rtapi_hexdump.c b/src/libraries/runtime/src/rtapi_hexdump.c index e6a6994728..a2ddc16c95 100644 --- a/src/libraries/runtime/src/rtapi_hexdump.c +++ b/src/libraries/runtime/src/rtapi_hexdump.c @@ -10,9 +10,9 @@ * more details. */ -#include "config.h" -#include "rtapi.h" -#include "rtapi_hexdump.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_hexdump.h" #define scnprintf snprintf // should carry over scnprintf, vscnprintf too diff --git a/src/libraries/runtime/src/rtapi_shmem.c b/src/libraries/runtime/src/rtapi_shmem.c index 775f9ba215..01ba149a41 100644 --- a/src/libraries/runtime/src/rtapi_shmem.c +++ b/src/libraries/runtime/src/rtapi_shmem.c @@ -22,10 +22,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************************/ -#include "config.h" // build configuration -#include "rtapi.h" // these functions -#include "rtapi_common.h" -#include "shmdrv.h" +#include "runtime/config.h" // build configuration +#include "runtime/rtapi.h" // these functions +#include "runtime/rtapi_common.h" +#include "runtime/shmdrv.h" #include #include diff --git a/src/libraries/runtime/src/rtapi_task.c b/src/libraries/runtime/src/rtapi_task.c index f065070388..55039b850f 100644 --- a/src/libraries/runtime/src/rtapi_task.c +++ b/src/libraries/runtime/src/rtapi_task.c @@ -28,10 +28,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************************/ -#include "config.h" // build configuration -#include "rtapi.h" // these functions -#include "rtapi_common.h" // RTAPI macros and decls -#include "rtapi_flavor.h" // flavor_* +#include "runtime/config.h" // build configuration +#include "runtime/rtapi.h" // these functions +#include "runtime/rtapi_common.h" // RTAPI macros and decls +#include "runtime/rtapi_flavor.h" // flavor_* /* These functions are completely different between each userland diff --git a/src/libraries/runtime/src/rtapi_time.c b/src/libraries/runtime/src/rtapi_time.c index 4871debf18..bde07bdceb 100644 --- a/src/libraries/runtime/src/rtapi_time.c +++ b/src/libraries/runtime/src/rtapi_time.c @@ -21,10 +21,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************************/ -#include "config.h" // build configuration -#include "rtapi.h" // these functions -#include "rtapi_common.h" // these functions -#include "rtapi_flavor.h" // flavor_* +#include "runtime/config.h" // build configuration +#include "runtime/rtapi.h" // these functions +#include "runtime/rtapi_common.h" // these functions +#include "runtime/rtapi_flavor.h" // flavor_* #include // clock_getres(), clock_gettime() diff --git a/src/libraries/runtime/src/ulapi.c b/src/libraries/runtime/src/ulapi.c index fe6a1160c1..f71f5bae09 100644 --- a/src/libraries/runtime/src/ulapi.c +++ b/src/libraries/runtime/src/ulapi.c @@ -1,4 +1,4 @@ -#include "rtapi_flavor.h" +#include "runtime/rtapi_flavor.h" int ulapi_module_init_hook(void) { if (global_data->magic != GLOBAL_READY) { diff --git a/src/libraries/runtime/include/ulapi.h b/src/libraries/runtime/src/ulapi.h similarity index 96% rename from src/libraries/runtime/include/ulapi.h rename to src/libraries/runtime/src/ulapi.h index f951293062..972abe5ed4 100644 --- a/src/libraries/runtime/include/ulapi.h +++ b/src/libraries/runtime/src/ulapi.h @@ -20,6 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ********************************************************************/ -#include "rtapi_flavor.h" +#include "runtime/rtapi_flavor.h" extern flavor_descriptor_t flavor_ulapi_descriptor; diff --git a/src/libraries/runtime/include/xenomai2.h b/src/libraries/runtime/src/xenomai2.h similarity index 98% rename from src/libraries/runtime/include/xenomai2.h rename to src/libraries/runtime/src/xenomai2.h index 48c147717d..6a07b680b2 100644 --- a/src/libraries/runtime/include/xenomai2.h +++ b/src/libraries/runtime/src/xenomai2.h @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ********************************************************************/ -#include "rtapi_flavor.h" +#include "runtime/rtapi_flavor.h" typedef enum { XU_EXCEPTION_NONE=0, diff --git a/src/libraries/runtime/src/xenomai2_loader.c b/src/libraries/runtime/src/xenomai2_loader.c index 8884545158..5e57aa0ada 100644 --- a/src/libraries/runtime/src/xenomai2_loader.c +++ b/src/libraries/runtime/src/xenomai2_loader.c @@ -27,7 +27,7 @@ ********************************************************************/ #include "xenomai2.h" -#include "config.h" +#include "runtime/config.h" #include // RT_TASK, rt_task_*() #include // rt_timer_*() diff --git a/src/libraries/runtime/test/CMakeLists.txt b/src/libraries/runtime/test/CMakeLists.txt index 5419caddb5..645ba1e7ec 100644 --- a/src/libraries/runtime/test/CMakeLists.txt +++ b/src/libraries/runtime/test/CMakeLists.txt @@ -59,6 +59,7 @@ target_link_libraries( syslog_async runtime_memory_api mkini) target_link_libraries(test_runtime_module_init PRIVATE runtime_api runtime hal) +target_compile_definitions(test_runtime_bitops PRIVATE "ULAPI") # target_compile_definitions(test_runtime_rtapi_flavor_RTAPI PRIVATE "RTAPI") target_compile_definitions(test_runtime_rtapi_flavor_ULAPI PRIVATE "ULAPI") target_compile_definitions(test_runtime_module_init PRIVATE "ULAPI") diff --git a/src/libraries/runtime/test/bitops/src/bitops.c b/src/libraries/runtime/test/bitops/src/bitops.c index 7cc72e8b22..d57d9019ea 100644 --- a/src/libraries/runtime/test/bitops/src/bitops.c +++ b/src/libraries/runtime/test/bitops/src/bitops.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include // the symbol RTAPI_USE_ATOMIC is #defined only in the // new version of rtapi_bitops.h and either 0 or 1, but defined diff --git a/src/libraries/runtime/test/module_init/src/module_init.c b/src/libraries/runtime/test/module_init/src/module_init.c index 094277f203..654360dd90 100644 --- a/src/libraries/runtime/test/module_init/src/module_init.c +++ b/src/libraries/runtime/test/module_init/src/module_init.c @@ -19,7 +19,7 @@ #include #include #include -#include "rtapi.h" +#include "runtime/rtapi.h" #include int main() diff --git a/src/libraries/runtime/test/rtapi_flavor/src/rtapi_flavor.c b/src/libraries/runtime/test/rtapi_flavor/src/rtapi_flavor.c index 32a1ab4e4f..515405b7b5 100644 --- a/src/libraries/runtime/test/rtapi_flavor/src/rtapi_flavor.c +++ b/src/libraries/runtime/test/rtapi_flavor/src/rtapi_flavor.c @@ -1,4 +1,4 @@ -#include "rtapi_flavor.h" +#include "runtime/rtapi_flavor.h" #include #include #include diff --git a/src/libraries/runtime_bootstrap/CMakeLists.txt b/src/libraries/runtime_bootstrap/CMakeLists.txt index 515647aa1a..94c83d5d93 100644 --- a/src/libraries/runtime_bootstrap/CMakeLists.txt +++ b/src/libraries/runtime_bootstrap/CMakeLists.txt @@ -31,8 +31,8 @@ add_library(runtime_config-install SHARED) add_library(${MACHINEKIT_HAL_NAMESPACE}::runtime_config-install ALIAS runtime_config-install) -set(RUNTIME_CONFIG include/config.h.in) -set(SOURCE_FILE src/runtime_config.c.in) +set(RUNTIME_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/config.h.in) +set(SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/runtime_config.c.in) set(LINELEN "255") set(ZMQIPC_FORMAT "ipc://%s/%d.%s.%s") @@ -41,8 +41,8 @@ set(MACHINEKIT_HAL_CONFIG_DIRECTORY "${MACHINEKIT_HAL_SYSTEM_CONFIG_OUTPUT_DIRECTORY}") set(MACHINEKIT_HAL_INI_FILE "${MACHINEKIT_HAL_SYSTEM_CONFIG_OUTPUT_DIRECTORY}/machinekit.ini") -set(MACHINEKIT_HAL_LOG_FILE "/var/log/hal.log" -)# "${MACHINEKIT_HAL_LOCAL_STATE_OUTPUT_DIRECTORY}/log/hal.log") +set(MACHINEKIT_HAL_LOG_FILE + "${MACHINEKIT_HAL_LOCAL_STATE_OUTPUT_DIRECTORY}/log/hal.log") set(MACHINEKIT_HAL_BIN_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") configure_file( @@ -68,9 +68,9 @@ set(MACHINEKIT_HAL_CONFIG_DIRECTORY "${CMAKE_INSTALL_FULL_SYSCONFDIR}/machinekit/hal") set(MACHINEKIT_HAL_INI_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/machinekit/hal/machinekit.ini") -set(MACHINEKIT_HAL_LOG_FILE "/var/log/hal.log" -)# "${CMAKE_INSTALL_FULL_LOCALSTATEDIT}/log/hal.log") -set(MACHINEKIT_HAL_BIN_DIRECTORY "${MACHINEKIT_HAL_EXECUTABLE_FULL_INSTALL_DIRECTORY}") +set(MACHINEKIT_HAL_LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/hal.log") +set(MACHINEKIT_HAL_BIN_DIRECTORY + "${MACHINEKIT_HAL_EXECUTABLE_FULL_INSTALL_DIRECTORY}") configure_file( ${RUNTIME_CONFIG} @@ -92,7 +92,7 @@ target_sources( target_include_directories( runtime_config - PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/build/runtime_config/include/runtime) + PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/build/runtime_config/include) target_sources( runtime_config-install @@ -103,7 +103,7 @@ target_sources( target_include_directories( runtime_config-install - PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/install/runtime_config/include/runtime) + PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/install/runtime_config/include) set_target_properties(runtime_config PROPERTIES SOVERSION 0 VERSION ${CMAKE_PROJECT_VERSION}) diff --git a/src/libraries/runtime_bootstrap/include/config.h.in b/src/libraries/runtime_bootstrap/include/runtime/config.h.in similarity index 84% rename from src/libraries/runtime_bootstrap/include/config.h.in rename to src/libraries/runtime_bootstrap/include/runtime/config.h.in index 84ec527a9d..385760f2b5 100644 --- a/src/libraries/runtime_bootstrap/include/config.h.in +++ b/src/libraries/runtime_bootstrap/include/runtime/config.h.in @@ -62,27 +62,6 @@ extern const char *const machinekit_hal_bin_directory; /* directory for IPC sockets and other transient files */ #define RUNDIR "@RUNDIR@" -/* build for BeagleBone platform */ -#cmakedefine TARGET_PLATFORM_BEAGLEBONE - -/* build for Chip platform */ -#cmakedefine TARGET_PLATFORM_CHIP - -/* build for H3 SoC platform */ -#cmakedefine TARGET_PLATFORM_H3 - -/* build for PC platform */ -#cmakedefine TARGET_PLATFORM_PC - -/* build for Raspberry Pi platform */ -#cmakedefine TARGET_PLATFORM_RASPBERRY - -/* build for Socfpga platform */ -#cmakedefine TARGET_PLATFORM_SOCFPGA - -/* build for Zedboard platform */ -#cmakedefine TARGET_PLATFORM_ZEDBOARD - /* use ppdev ioctl instead of inb/outb */ #cmakedefine USE_PORTABLE_PARPORT_IO diff --git a/src/libraries/runtime_bootstrap/src/runtime_config.c.in b/src/libraries/runtime_bootstrap/src/runtime_config.c.in index 737a958a1d..bd148b7e08 100644 --- a/src/libraries/runtime_bootstrap/src/runtime_config.c.in +++ b/src/libraries/runtime_bootstrap/src/runtime_config.c.in @@ -28,7 +28,7 @@ * *********************************************************************/ -#include "config.h" +#include "runtime/config.h" const char *const machinekit_hal_version = "@CMAKE_PROJECT_VERSION@"; const char *const machinekit_hal_git_build_sha = "@MACHINEKIT_HAL_GIT_BUILD_SHA@"; diff --git a/src/libraries/runtime_math/CMakeLists.txt b/src/libraries/runtime_math/CMakeLists.txt index d6911f38e0..09533daebb 100644 --- a/src/libraries/runtime_math/CMakeLists.txt +++ b/src/libraries/runtime_math/CMakeLists.txt @@ -30,92 +30,105 @@ if(BUILD_RUNTIME_MATH_LIBRARY) runtime_math) set(SOURCE_FILES - src/e_acos.c - src/e_acosh.c - src/e_asin.c - src/e_atan2.c - src/e_atanh.c - src/e_cosh.c - src/e_exp.c - src/e_fmod.c - src/e_gamma.c - src/e_gamma_r.c - src/e_hypot.c - src/e_j0.c - src/e_j1.c - src/e_jn.c - src/e_lgamma.c - src/e_lgamma_r.c - src/e_log10.c - src/e_log.c - src/e_pow.c - src/e_remainder.c - src/e_rem_pio2.c - src/e_scalb.c - src/e_sinh.c - src/e_sqrt.c - src/k_cos.c - src/k_rem_pio2.c - # src/krtapi_math.c TODO: Decide what to do with it - src/k_sin.c - src/k_standard.c - src/k_tan.c - src/librtapi_math.c - src/powidf.c - src/s_asinh.c - src/s_atan.c - src/s_cbrt.c - src/s_ceil.c - src/s_copysign.c - src/s_cos.c - src/s_erf.c - src/s_expm1.c - src/s_fabs.c - src/s_finite.c - src/s_floor.c - src/s_fminmax.c - # src/s_frexp.c TODO: Decide what to do with it - src/s_ilogb.c - src/s_ldexp.c - # src/s_lib_version.c TODO: Decide what to do with it - src/s_log1p.c - src/s_logb.c - src/s_matherr.c - src/s_modf.c - src/s_nextafter.c - src/s_rint.c - src/s_scalbn.c - src/s_significand.c - src/s_sin.c - src/s_tan.c - src/s_tanh.c - src/w_acos.c - src/w_acosh.c - src/w_asin.c - src/w_atan2.c - src/w_atanh.c - src/w_cabs.c - src/w_cosh.c - src/w_drem.c - src/w_exp.c - src/w_fmod.c - src/w_gamma.c - src/w_gamma_r.c - src/w_hypot.c - src/w_j0.c - src/w_j1.c - src/w_jn.c - src/w_lgamma.c - src/w_lgamma_r.c - src/w_log10.c - src/w_log.c - src/w_pow.c - src/w_remainder.c - src/w_scalb.c - src/w_sinh.c - src/w_sqrt.c) + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_acos.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_acosh.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_asin.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_atan2.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_atanh.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_cosh.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_exp.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_fmod.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_gamma.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_gamma_r.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_hypot.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_j0.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_j1.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_jn.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_lgamma.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_lgamma_r.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_log10.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_log.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_pow.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_remainder.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_rem_pio2.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_scalb.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_sinh.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/e_sqrt.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/k_cos.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/k_rem_pio2.c + # ${CMAKE_CURRENT_SOURCE_DIR}/src/krtapi_math.c TODO: Decide what to do + # with it + ${CMAKE_CURRENT_SOURCE_DIR}/src/k_sin.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/k_standard.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/k_tan.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/librtapi_math.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/powidf.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_asinh.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_atan.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_cbrt.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_ceil.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_copysign.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_cos.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_erf.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_expm1.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_fabs.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_finite.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_floor.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_fminmax.c + # ${CMAKE_CURRENT_SOURCE_DIR}/src/s_frexp.c TODO: Decide what to do with + # it + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_ilogb.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_ldexp.c + # ${CMAKE_CURRENT_SOURCE_DIR}/src/s_lib_version.c TODO: Decide what to do + # with it + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_log1p.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_logb.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_matherr.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_modf.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_nextafter.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_rint.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_scalbn.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_significand.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_sin.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_tan.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/s_tanh.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_acos.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_acosh.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_asin.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_atan2.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_atanh.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_cabs.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_cosh.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_drem.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_exp.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_fmod.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_gamma.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_gamma_r.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_hypot.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_j0.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_j1.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_jn.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_lgamma.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_lgamma_r.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_log10.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_log.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_pow.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_remainder.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_scalb.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_sinh.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/w_sqrt.c) - target_sources(runtime_math PRIVATE ${SOURCE_FILES}) + set(PUBLIC_HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_byteorder.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_math64.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/rtapi_math.h) + + set(PRIVATE_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/mathP.h) + + target_sources( + runtime_math + PUBLIC ${PUBLIC_HEADER_FILES} + PRIVATE ${SOURCE_FILES} ${PRIVATE_HEADER_FILES}) target_include_directories( runtime_math PUBLIC $) @@ -129,9 +142,8 @@ if(BUILD_RUNTIME_MATH_LIBRARY) runtime_math PROPERTIES SOVERSION 0 VERSION ${CMAKE_PROJECT_VERSION} - PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/rtapi_math.h" - PUBLIC_HEADER - "${CMAKE_CURRENT_SOURCE_DIR}/include/rtapi_math64.h" + PUBLIC_HEADER "${PUBLIC_HEADER_FILES}" + PRIVATE_HEADER "${PRIVATE_HEADER_FILES}" POSITION_INDEPENDENT_CODE TRUE) install( TARGETS runtime_math diff --git a/src/libraries/runtime_math/include/rtapi_byteorder.h b/src/libraries/runtime_math/include/runtime/rtapi_byteorder.h similarity index 100% rename from src/libraries/runtime_math/include/rtapi_byteorder.h rename to src/libraries/runtime_math/include/runtime/rtapi_byteorder.h diff --git a/src/libraries/runtime_math/include/rtapi_math.h b/src/libraries/runtime_math/include/runtime/rtapi_math.h similarity index 96% rename from src/libraries/runtime_math/include/rtapi_math.h rename to src/libraries/runtime_math/include/runtime/rtapi_math.h index f81b0b5d62..989b804452 100644 --- a/src/libraries/runtime_math/include/rtapi_math.h +++ b/src/libraries/runtime_math/include/runtime/rtapi_math.h @@ -16,8 +16,8 @@ #ifndef RTAPI_MATH_H #define RTAPI_MATH_H -#include "rtapi_byteorder.h" /* Using the bytorder to specify the ieee types */ -#include "rtapi_errno.h" /* Using the error codes */ +#include /* Using the bytorder to specify the ieee types */ +#include "runtime/rtapi_errno.h" /* Using the error codes */ #include /* DBL_MAX and other FP goodies */ #ifdef __cplusplus @@ -112,7 +112,7 @@ extern double rtapi_cbrt(double); #define rtapi_isinf(x) ({ double v=((x)); !isnan(v) && isnan(v-v); }) #endif -#include "rtapi_byteorder.h" +#include // adapted from ieee754.h union ieee754_double diff --git a/src/libraries/runtime_math/include/rtapi_math64.h b/src/libraries/runtime_math/include/runtime/rtapi_math64.h similarity index 100% rename from src/libraries/runtime_math/include/rtapi_math64.h rename to src/libraries/runtime_math/include/runtime/rtapi_math64.h diff --git a/src/libraries/runtime_math/src/e_acos.c b/src/libraries/runtime_math/src/e_acos.c index 00c8b26a6f..1b2587cecb 100644 --- a/src/libraries/runtime_math/src/e_acos.c +++ b/src/libraries/runtime_math/src/e_acos.c @@ -38,7 +38,7 @@ static char rcsid[] = "$NetBSD: e_acos.c,v 1.9 1995/05/12 04:57:13 jtc Exp $"; * Function needed: __ieee754_sqrt */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_acosh.c b/src/libraries/runtime_math/src/e_acosh.c index c7b7595477..66971a6645 100644 --- a/src/libraries/runtime_math/src/e_acosh.c +++ b/src/libraries/runtime_math/src/e_acosh.c @@ -28,7 +28,7 @@ static char rcsid[] = "$NetBSD: e_acosh.c,v 1.9 1995/05/12 04:57:18 jtc Exp $"; * acosh(NaN) is NaN without signal. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_asin.c b/src/libraries/runtime_math/src/e_asin.c index b338f4968a..6c5ef9976e 100644 --- a/src/libraries/runtime_math/src/e_asin.c +++ b/src/libraries/runtime_math/src/e_asin.c @@ -45,7 +45,7 @@ static char rcsid[] = "$NetBSD: e_asin.c,v 1.9 1995/05/12 04:57:22 jtc Exp $"; */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_atan2.c b/src/libraries/runtime_math/src/e_atan2.c index 6d32625ea9..3159f27d58 100644 --- a/src/libraries/runtime_math/src/e_atan2.c +++ b/src/libraries/runtime_math/src/e_atan2.c @@ -41,7 +41,7 @@ static char rcsid[] = "$NetBSD: e_atan2.c,v 1.8 1995/05/10 20:44:51 jtc Exp $"; * to produce the hexadecimal values shown. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_atanh.c b/src/libraries/runtime_math/src/e_atanh.c index 52b8e0d032..f5b147de35 100644 --- a/src/libraries/runtime_math/src/e_atanh.c +++ b/src/libraries/runtime_math/src/e_atanh.c @@ -32,7 +32,7 @@ static char rcsid[] = "$NetBSD: e_atanh.c,v 1.8 1995/05/10 20:44:55 jtc Exp $"; * */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_cosh.c b/src/libraries/runtime_math/src/e_cosh.c index 496941755e..504413d06b 100644 --- a/src/libraries/runtime_math/src/e_cosh.c +++ b/src/libraries/runtime_math/src/e_cosh.c @@ -35,7 +35,7 @@ static char rcsid[] = "$NetBSD: e_cosh.c,v 1.7 1995/05/10 20:44:58 jtc Exp $"; * only cosh(0)=1 is exact for finite x. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_exp.c b/src/libraries/runtime_math/src/e_exp.c index ab5c4da6b5..de5cae9aad 100644 --- a/src/libraries/runtime_math/src/e_exp.c +++ b/src/libraries/runtime_math/src/e_exp.c @@ -77,7 +77,7 @@ static char rcsid[] = "$NetBSD: e_exp.c,v 1.8 1995/05/10 20:45:03 jtc Exp $"; * to produce the hexadecimal values shown. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_fmod.c b/src/libraries/runtime_math/src/e_fmod.c index 68df6015ae..5140fb40ab 100644 --- a/src/libraries/runtime_math/src/e_fmod.c +++ b/src/libraries/runtime_math/src/e_fmod.c @@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: e_fmod.c,v 1.8 1995/05/10 20:45:07 jtc Exp $"; * Method: shift and subtract */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_hypot.c b/src/libraries/runtime_math/src/e_hypot.c index 23775f0dec..01d27995fb 100644 --- a/src/libraries/runtime_math/src/e_hypot.c +++ b/src/libraries/runtime_math/src/e_hypot.c @@ -46,7 +46,7 @@ static char rcsid[] = "$NetBSD: e_hypot.c,v 1.9 1995/05/12 04:57:27 jtc Exp $"; * than 1 ulps (units in the last place) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_j0.c b/src/libraries/runtime_math/src/e_j0.c index 488730dbf3..af83b76a8f 100644 --- a/src/libraries/runtime_math/src/e_j0.c +++ b/src/libraries/runtime_math/src/e_j0.c @@ -59,7 +59,7 @@ static char rcsid[] = "$NetBSD: e_j0.c,v 1.8 1995/05/10 20:45:23 jtc Exp $"; * 3. Special cases: y0(0)=-inf, y0(x<0)=NaN, y0(inf)=0. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_j1.c b/src/libraries/runtime_math/src/e_j1.c index 5399f382a1..778a736aa8 100644 --- a/src/libraries/runtime_math/src/e_j1.c +++ b/src/libraries/runtime_math/src/e_j1.c @@ -59,7 +59,7 @@ static char rcsid[] = "$NetBSD: e_j1.c,v 1.8 1995/05/10 20:45:27 jtc Exp $"; * by method mentioned above. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_jn.c b/src/libraries/runtime_math/src/e_jn.c index 9197faf2f3..a824c93cb6 100644 --- a/src/libraries/runtime_math/src/e_jn.c +++ b/src/libraries/runtime_math/src/e_jn.c @@ -40,7 +40,7 @@ static char rcsid[] = "$NetBSD: e_jn.c,v 1.9 1995/05/10 20:45:34 jtc Exp $"; * */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_lgamma_r.c b/src/libraries/runtime_math/src/e_lgamma_r.c index c8b9c7bdce..45c27c5167 100644 --- a/src/libraries/runtime_math/src/e_lgamma_r.c +++ b/src/libraries/runtime_math/src/e_lgamma_r.c @@ -81,7 +81,7 @@ static char rcsid[] = "$NetBSD: e_lgamma_r.c,v 1.7 1995/05/10 20:45:42 jtc Exp $ * */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_log.c b/src/libraries/runtime_math/src/e_log.c index d8dd146c01..492677fa8e 100644 --- a/src/libraries/runtime_math/src/e_log.c +++ b/src/libraries/runtime_math/src/e_log.c @@ -65,7 +65,7 @@ static char rcsid[] = "$NetBSD: e_log.c,v 1.8 1995/05/10 20:45:49 jtc Exp $"; * to produce the hexadecimal values shown. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_log10.c b/src/libraries/runtime_math/src/e_log10.c index 351b0f819a..88f622dafa 100644 --- a/src/libraries/runtime_math/src/e_log10.c +++ b/src/libraries/runtime_math/src/e_log10.c @@ -47,7 +47,7 @@ static char rcsid[] = "$NetBSD: e_log10.c,v 1.9 1995/05/10 20:45:51 jtc Exp $"; * shown. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_pow.c b/src/libraries/runtime_math/src/e_pow.c index ea76b8374e..6cc20776d2 100644 --- a/src/libraries/runtime_math/src/e_pow.c +++ b/src/libraries/runtime_math/src/e_pow.c @@ -59,7 +59,7 @@ static char rcsid[] = "$NetBSD: e_pow.c,v 1.9 1995/05/12 04:57:32 jtc Exp $"; * to produce the hexadecimal values shown. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_rem_pio2.c b/src/libraries/runtime_math/src/e_rem_pio2.c index 07da674b06..b032f2b291 100644 --- a/src/libraries/runtime_math/src/e_rem_pio2.c +++ b/src/libraries/runtime_math/src/e_rem_pio2.c @@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: e_rem_pio2.c,v 1.8 1995/05/10 20:46:02 jtc Exp $ * use __kernel_rem_pio2() */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" /* diff --git a/src/libraries/runtime_math/src/e_remainder.c b/src/libraries/runtime_math/src/e_remainder.c index a3c2c7b566..4e363c83dc 100644 --- a/src/libraries/runtime_math/src/e_remainder.c +++ b/src/libraries/runtime_math/src/e_remainder.c @@ -23,7 +23,7 @@ static char rcsid[] = "$NetBSD: e_remainder.c,v 1.8 1995/05/10 20:46:05 jtc Exp * Based on fmod() return x-[x/p]chopped*p exactlp. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_scalb.c b/src/libraries/runtime_math/src/e_scalb.c index 2cc0b946e1..bb7b0ab941 100644 --- a/src/libraries/runtime_math/src/e_scalb.c +++ b/src/libraries/runtime_math/src/e_scalb.c @@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: e_scalb.c,v 1.6 1995/05/10 20:46:09 jtc Exp $"; * should use scalbn() instead. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef _SCALB_INT diff --git a/src/libraries/runtime_math/src/e_sinh.c b/src/libraries/runtime_math/src/e_sinh.c index fd6988bd28..5dfd4026c0 100644 --- a/src/libraries/runtime_math/src/e_sinh.c +++ b/src/libraries/runtime_math/src/e_sinh.c @@ -32,7 +32,7 @@ static char rcsid[] = "$NetBSD: e_sinh.c,v 1.7 1995/05/10 20:46:13 jtc Exp $"; * only sinh(0)=0 is exact for finite x. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/e_sqrt.c b/src/libraries/runtime_math/src/e_sqrt.c index c0dd72cbef..77d7c65327 100644 --- a/src/libraries/runtime_math/src/e_sqrt.c +++ b/src/libraries/runtime_math/src/e_sqrt.c @@ -84,7 +84,7 @@ static char rcsid[] = "$NetBSD: e_sqrt.c,v 1.8 1995/05/10 20:46:17 jtc Exp $"; *--------------- */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/k_cos.c b/src/libraries/runtime_math/src/k_cos.c index 81794af485..7219a0bf96 100644 --- a/src/libraries/runtime_math/src/k_cos.c +++ b/src/libraries/runtime_math/src/k_cos.c @@ -49,7 +49,7 @@ static char rcsid[] = "$NetBSD: k_cos.c,v 1.8 1995/05/10 20:46:22 jtc Exp $"; * thus, reducing the rounding error in the subtraction. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/k_rem_pio2.c b/src/libraries/runtime_math/src/k_rem_pio2.c index 35470db3c6..a7a476f65a 100644 --- a/src/libraries/runtime_math/src/k_rem_pio2.c +++ b/src/libraries/runtime_math/src/k_rem_pio2.c @@ -130,7 +130,7 @@ static char rcsid[] = "$NetBSD: k_rem_pio2.c,v 1.7 1995/05/10 20:46:25 jtc Exp $ * to produce the hexadecimal values shown. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/k_sin.c b/src/libraries/runtime_math/src/k_sin.c index 451060a7bd..9472b444bb 100644 --- a/src/libraries/runtime_math/src/k_sin.c +++ b/src/libraries/runtime_math/src/k_sin.c @@ -42,7 +42,7 @@ static char rcsid[] = "$NetBSD: k_sin.c,v 1.8 1995/05/10 20:46:31 jtc Exp $"; * sin(x) = x + (S1*x + (x *(r-y/2)+y)) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/k_standard.c b/src/libraries/runtime_math/src/k_standard.c index baef666606..b579a42413 100644 --- a/src/libraries/runtime_math/src/k_standard.c +++ b/src/libraries/runtime_math/src/k_standard.c @@ -14,7 +14,7 @@ static char rcsid[] = "$NetBSD: k_standard.c,v 1.6 1995/05/10 20:46:35 jtc Exp $"; #endif -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" extern int libm_errno; diff --git a/src/libraries/runtime_math/src/k_tan.c b/src/libraries/runtime_math/src/k_tan.c index 474bed57a3..0674f324ce 100644 --- a/src/libraries/runtime_math/src/k_tan.c +++ b/src/libraries/runtime_math/src/k_tan.c @@ -48,7 +48,7 @@ static char rcsid[] = "$NetBSD: k_tan.c,v 1.8 1995/05/10 20:46:37 jtc Exp $"; * = 1 - 2*(tan(y) - (tan(y)^2)/(1+tan(y))) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ static const double diff --git a/src/libraries/runtime_math/src/krtapi_math.c b/src/libraries/runtime_math/src/krtapi_math.c index 442f4c99b5..b7efba726b 100644 --- a/src/libraries/runtime_math/src/krtapi_math.c +++ b/src/libraries/runtime_math/src/krtapi_math.c @@ -23,7 +23,7 @@ #include #include -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" _LIB_VERSION_TYPE _LIB_VERSION = _IEEE_; diff --git a/src/libraries/runtime_math/include/mathP.h b/src/libraries/runtime_math/src/mathP.h similarity index 99% rename from src/libraries/runtime_math/include/mathP.h rename to src/libraries/runtime_math/src/mathP.h index 727d8dc3cb..52e56f980d 100644 --- a/src/libraries/runtime_math/include/mathP.h +++ b/src/libraries/runtime_math/src/mathP.h @@ -18,7 +18,7 @@ #define _MATH_PRIVATE_H_ #include -#include "rtapi_byteorder.h" +#include #define __P(args) args diff --git a/src/libraries/runtime_math/src/s_asinh.c b/src/libraries/runtime_math/src/s_asinh.c index 19d20f0476..3e76cd93ee 100644 --- a/src/libraries/runtime_math/src/s_asinh.c +++ b/src/libraries/runtime_math/src/s_asinh.c @@ -25,7 +25,7 @@ static char rcsid[] = "$NetBSD: s_asinh.c,v 1.9 1995/05/12 04:57:37 jtc Exp $"; * := sign(x)*log1p(|x| + x^2/(1 + sqrt(1+x^2))) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_atan.c b/src/libraries/runtime_math/src/s_atan.c index 1beb06b8b0..ea44e559d7 100644 --- a/src/libraries/runtime_math/src/s_atan.c +++ b/src/libraries/runtime_math/src/s_atan.c @@ -34,7 +34,7 @@ static char rcsid[] = "$NetBSD: s_atan.c,v 1.8 1995/05/10 20:46:45 jtc Exp $"; * to produce the hexadecimal values shown. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_cbrt.c b/src/libraries/runtime_math/src/s_cbrt.c index 1d5c9c35f9..1c3d5b3014 100644 --- a/src/libraries/runtime_math/src/s_cbrt.c +++ b/src/libraries/runtime_math/src/s_cbrt.c @@ -14,7 +14,7 @@ static char rcsid[] = "$NetBSD: s_cbrt.c,v 1.8 1995/05/10 20:46:49 jtc Exp $"; #endif -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" /* cbrt(x) diff --git a/src/libraries/runtime_math/src/s_ceil.c b/src/libraries/runtime_math/src/s_ceil.c index 0942c4c955..0bc361b69c 100644 --- a/src/libraries/runtime_math/src/s_ceil.c +++ b/src/libraries/runtime_math/src/s_ceil.c @@ -24,7 +24,7 @@ static char rcsid[] = "$NetBSD: s_ceil.c,v 1.8 1995/05/10 20:46:53 jtc Exp $"; * Inexact flag raised if x not equal to ceil(x). */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_copysign.c b/src/libraries/runtime_math/src/s_copysign.c index 83d1d409c9..22dee6e04d 100644 --- a/src/libraries/runtime_math/src/s_copysign.c +++ b/src/libraries/runtime_math/src/s_copysign.c @@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: s_copysign.c,v 1.8 1995/05/10 20:46:57 jtc Exp $ * with the sign bit of y. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_cos.c b/src/libraries/runtime_math/src/s_cos.c index ed5e1f8840..15ea6617b6 100644 --- a/src/libraries/runtime_math/src/s_cos.c +++ b/src/libraries/runtime_math/src/s_cos.c @@ -45,7 +45,7 @@ static char rcsid[] = "$NetBSD: s_cos.c,v 1.7 1995/05/10 20:47:02 jtc Exp $"; * TRIG(x) returns trig(x) nearly rounded */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_erf.c b/src/libraries/runtime_math/src/s_erf.c index 2acf6a9b2e..48315ca2d0 100644 --- a/src/libraries/runtime_math/src/s_erf.c +++ b/src/libraries/runtime_math/src/s_erf.c @@ -109,7 +109,7 @@ static char rcsid[] = "$NetBSD: s_erf.c,v 1.8 1995/05/10 20:47:05 jtc Exp $"; */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_expm1.c b/src/libraries/runtime_math/src/s_expm1.c index 1fe882eb9b..cd61b72311 100644 --- a/src/libraries/runtime_math/src/s_expm1.c +++ b/src/libraries/runtime_math/src/s_expm1.c @@ -109,7 +109,7 @@ static char rcsid[] = "$NetBSD: s_expm1.c,v 1.8 1995/05/10 20:47:09 jtc Exp $"; * to produce the hexadecimal values shown. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_fabs.c b/src/libraries/runtime_math/src/s_fabs.c index a048b28a87..587fa1dda6 100644 --- a/src/libraries/runtime_math/src/s_fabs.c +++ b/src/libraries/runtime_math/src/s_fabs.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: s_fabs.c,v 1.7 1995/05/10 20:47:13 jtc Exp $"; * fabs(x) returns the absolute value of x. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_finite.c b/src/libraries/runtime_math/src/s_finite.c index 343a9a0d1a..a593b326d9 100644 --- a/src/libraries/runtime_math/src/s_finite.c +++ b/src/libraries/runtime_math/src/s_finite.c @@ -19,7 +19,7 @@ static char rcsid[] = "$NetBSD: s_finite.c,v 1.8 1995/05/10 20:47:17 jtc Exp $"; * no branching! */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_floor.c b/src/libraries/runtime_math/src/s_floor.c index 8c48e790bd..7d7925b046 100644 --- a/src/libraries/runtime_math/src/s_floor.c +++ b/src/libraries/runtime_math/src/s_floor.c @@ -24,7 +24,7 @@ static char rcsid[] = "$NetBSD: s_floor.c,v 1.8 1995/05/10 20:47:20 jtc Exp $"; * Inexact flag raised if x not equal to floor(x). */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_fminmax.c b/src/libraries/runtime_math/src/s_fminmax.c index 118e7c91b7..e09d04cda4 100644 --- a/src/libraries/runtime_math/src/s_fminmax.c +++ b/src/libraries/runtime_math/src/s_fminmax.c @@ -1,4 +1,4 @@ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" double rtapi_fmax(double __y, double __x) { return __y > __x ? __y : __x; diff --git a/src/libraries/runtime_math/src/s_frexp.c b/src/libraries/runtime_math/src/s_frexp.c index 8e06fa3de7..8a7d9aac14 100644 --- a/src/libraries/runtime_math/src/s_frexp.c +++ b/src/libraries/runtime_math/src/s_frexp.c @@ -25,7 +25,7 @@ static char rcsid[] = "$NetBSD: s_frexp.c,v 1.9 1995/05/10 20:47:24 jtc Exp $"; * with *exp=0. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_ilogb.c b/src/libraries/runtime_math/src/s_ilogb.c index 5027e8b07b..75a77db8e7 100644 --- a/src/libraries/runtime_math/src/s_ilogb.c +++ b/src/libraries/runtime_math/src/s_ilogb.c @@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: s_ilogb.c,v 1.9 1995/05/10 20:47:28 jtc Exp $"; * ilogb(inf/NaN) = 0x7fffffff (no signal is raised) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_ldexp.c b/src/libraries/runtime_math/src/s_ldexp.c index b8b7f47415..1101293436 100644 --- a/src/libraries/runtime_math/src/s_ldexp.c +++ b/src/libraries/runtime_math/src/s_ldexp.c @@ -15,7 +15,7 @@ static char rcsid[] = "$NetBSD: s_ldexp.c,v 1.6 1995/05/10 20:47:40 jtc Exp $"; #endif -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #include diff --git a/src/libraries/runtime_math/src/s_lib_version.c b/src/libraries/runtime_math/src/s_lib_version.c index 1ed875d9c8..55940deda2 100644 --- a/src/libraries/runtime_math/src/s_lib_version.c +++ b/src/libraries/runtime_math/src/s_lib_version.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: s_lib_version.c,v 1.6 1995/05/10 20:47:44 jtc Ex * MACRO for standards */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" /* diff --git a/src/libraries/runtime_math/src/s_log1p.c b/src/libraries/runtime_math/src/s_log1p.c index 22d0b4fc34..bf28df2ce5 100644 --- a/src/libraries/runtime_math/src/s_log1p.c +++ b/src/libraries/runtime_math/src/s_log1p.c @@ -79,7 +79,7 @@ static char rcsid[] = "$NetBSD: s_log1p.c,v 1.8 1995/05/10 20:47:46 jtc Exp $"; * See HP-15C Advanced Functions Handbook, p.193. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_logb.c b/src/libraries/runtime_math/src/s_logb.c index 3aa265d981..7ebbc15c6f 100644 --- a/src/libraries/runtime_math/src/s_logb.c +++ b/src/libraries/runtime_math/src/s_logb.c @@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: s_logb.c,v 1.8 1995/05/10 20:47:50 jtc Exp $"; * Use ilogb instead. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_matherr.c b/src/libraries/runtime_math/src/s_matherr.c index 1c14dc1989..a8d4c3ad28 100644 --- a/src/libraries/runtime_math/src/s_matherr.c +++ b/src/libraries/runtime_math/src/s_matherr.c @@ -14,7 +14,7 @@ static char rcsid[] = "$NetBSD: s_matherr.c,v 1.6 1995/05/10 20:47:53 jtc Exp $"; #endif -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_modf.c b/src/libraries/runtime_math/src/s_modf.c index 174ddf762b..0c6ef9133e 100644 --- a/src/libraries/runtime_math/src/s_modf.c +++ b/src/libraries/runtime_math/src/s_modf.c @@ -25,7 +25,7 @@ static char rcsid[] = "$NetBSD: s_modf.c,v 1.8 1995/05/10 20:47:55 jtc Exp $"; * No exception. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_nextafter.c b/src/libraries/runtime_math/src/s_nextafter.c index eaff6b162b..bad1d5a807 100644 --- a/src/libraries/runtime_math/src/s_nextafter.c +++ b/src/libraries/runtime_math/src/s_nextafter.c @@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: s_nextafter.c,v 1.8 1995/05/10 20:47:58 jtc Exp * Special cases: */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_rint.c b/src/libraries/runtime_math/src/s_rint.c index e496276510..37147540c2 100644 --- a/src/libraries/runtime_math/src/s_rint.c +++ b/src/libraries/runtime_math/src/s_rint.c @@ -25,7 +25,7 @@ static char rcsid[] = "$NetBSD: s_rint.c,v 1.8 1995/05/10 20:48:04 jtc Exp $"; * Inexact flag raised if x not equal to rint(x). */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_scalbn.c b/src/libraries/runtime_math/src/s_scalbn.c index e304d19814..aae31f11da 100644 --- a/src/libraries/runtime_math/src/s_scalbn.c +++ b/src/libraries/runtime_math/src/s_scalbn.c @@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: s_scalbn.c,v 1.8 1995/05/10 20:48:08 jtc Exp $"; * exponentiation or a multiplication. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_significand.c b/src/libraries/runtime_math/src/s_significand.c index 50d7a680f5..4e4de64df2 100644 --- a/src/libraries/runtime_math/src/s_significand.c +++ b/src/libraries/runtime_math/src/s_significand.c @@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: s_significand.c,v 1.6 1995/05/10 20:48:11 jtc Ex * for exercising the fraction-part(F) IEEE 754-1985 test vector. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_sin.c b/src/libraries/runtime_math/src/s_sin.c index 2fb026dad5..a54b804930 100644 --- a/src/libraries/runtime_math/src/s_sin.c +++ b/src/libraries/runtime_math/src/s_sin.c @@ -45,7 +45,7 @@ static char rcsid[] = "$NetBSD: s_sin.c,v 1.7 1995/05/10 20:48:15 jtc Exp $"; * TRIG(x) returns trig(x) nearly rounded */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_tan.c b/src/libraries/runtime_math/src/s_tan.c index 7d9b6754aa..d6dcdf0a44 100644 --- a/src/libraries/runtime_math/src/s_tan.c +++ b/src/libraries/runtime_math/src/s_tan.c @@ -44,7 +44,7 @@ static char rcsid[] = "$NetBSD: s_tan.c,v 1.7 1995/05/10 20:48:18 jtc Exp $"; * TRIG(x) returns trig(x) nearly rounded */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/s_tanh.c b/src/libraries/runtime_math/src/s_tanh.c index 720fd8b22d..83183d3674 100644 --- a/src/libraries/runtime_math/src/s_tanh.c +++ b/src/libraries/runtime_math/src/s_tanh.c @@ -38,7 +38,7 @@ static char rcsid[] = "$NetBSD: s_tanh.c,v 1.7 1995/05/10 20:48:22 jtc Exp $"; * only tanh(0)=0 is exact for finite argument. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/w_acos.c b/src/libraries/runtime_math/src/w_acos.c index 66feb40a18..5a3be82f85 100644 --- a/src/libraries/runtime_math/src/w_acos.c +++ b/src/libraries/runtime_math/src/w_acos.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_acos.c,v 1.6 1995/05/10 20:48:26 jtc Exp $"; * wrap_acos(x) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" diff --git a/src/libraries/runtime_math/src/w_acosh.c b/src/libraries/runtime_math/src/w_acosh.c index b2a133e8dc..ca69f57969 100644 --- a/src/libraries/runtime_math/src/w_acosh.c +++ b/src/libraries/runtime_math/src/w_acosh.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_acosh.c,v 1.6 1995/05/10 20:48:31 jtc Exp $"; * wrapper acosh(x) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/w_asin.c b/src/libraries/runtime_math/src/w_asin.c index a035b7ce11..b218f58644 100644 --- a/src/libraries/runtime_math/src/w_asin.c +++ b/src/libraries/runtime_math/src/w_asin.c @@ -19,7 +19,7 @@ static char rcsid[] = "$NetBSD: w_asin.c,v 1.6 1995/05/10 20:48:35 jtc Exp $"; */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" diff --git a/src/libraries/runtime_math/src/w_atan2.c b/src/libraries/runtime_math/src/w_atan2.c index 3283a2e05d..6390a7fcba 100644 --- a/src/libraries/runtime_math/src/w_atan2.c +++ b/src/libraries/runtime_math/src/w_atan2.c @@ -17,7 +17,7 @@ static char rcsid[] = "$NetBSD: w_atan2.c,v 1.6 1995/05/10 20:48:39 jtc Exp $"; /* * wrapper atan2(y,x) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" diff --git a/src/libraries/runtime_math/src/w_atanh.c b/src/libraries/runtime_math/src/w_atanh.c index 2383c45835..b8206079b1 100644 --- a/src/libraries/runtime_math/src/w_atanh.c +++ b/src/libraries/runtime_math/src/w_atanh.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_atanh.c,v 1.6 1995/05/10 20:48:43 jtc Exp $"; * wrapper atanh(x) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" diff --git a/src/libraries/runtime_math/src/w_cabs.c b/src/libraries/runtime_math/src/w_cabs.c index 0564d26962..77589445ab 100644 --- a/src/libraries/runtime_math/src/w_cabs.c +++ b/src/libraries/runtime_math/src/w_cabs.c @@ -5,7 +5,7 @@ * Placed into the Public Domain, 1994. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" struct complex { double x; diff --git a/src/libraries/runtime_math/src/w_cosh.c b/src/libraries/runtime_math/src/w_cosh.c index 323ecb6206..606807e769 100644 --- a/src/libraries/runtime_math/src/w_cosh.c +++ b/src/libraries/runtime_math/src/w_cosh.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_cosh.c,v 1.6 1995/05/10 20:48:47 jtc Exp $"; * wrapper cosh(x) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/w_drem.c b/src/libraries/runtime_math/src/w_drem.c index eb3f2e6fa3..98cf931aae 100644 --- a/src/libraries/runtime_math/src/w_drem.c +++ b/src/libraries/runtime_math/src/w_drem.c @@ -5,7 +5,7 @@ * Placed into the Public Domain, 1994. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" double rtapi_drem(x, y) diff --git a/src/libraries/runtime_math/src/w_exp.c b/src/libraries/runtime_math/src/w_exp.c index 5b50746a30..abe2542930 100644 --- a/src/libraries/runtime_math/src/w_exp.c +++ b/src/libraries/runtime_math/src/w_exp.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_exp.c,v 1.6 1995/05/10 20:48:51 jtc Exp $"; * wrapper exp(x) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/w_fmod.c b/src/libraries/runtime_math/src/w_fmod.c index 44bf71bd09..37a47bd5ff 100644 --- a/src/libraries/runtime_math/src/w_fmod.c +++ b/src/libraries/runtime_math/src/w_fmod.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_fmod.c,v 1.6 1995/05/10 20:48:55 jtc Exp $"; * wrapper fmod(x,y) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" diff --git a/src/libraries/runtime_math/src/w_gamma.c b/src/libraries/runtime_math/src/w_gamma.c index 7fc20e895f..c2797dc489 100644 --- a/src/libraries/runtime_math/src/w_gamma.c +++ b/src/libraries/runtime_math/src/w_gamma.c @@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: w_gamma.c,v 1.7 1995/11/20 22:06:43 jtc Exp $"; * Method: call gamma_r */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" extern int signgam; diff --git a/src/libraries/runtime_math/src/w_gamma_r.c b/src/libraries/runtime_math/src/w_gamma_r.c index bb12764de3..1c337e148d 100644 --- a/src/libraries/runtime_math/src/w_gamma_r.c +++ b/src/libraries/runtime_math/src/w_gamma_r.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_gamma_r.c,v 1.7 1995/11/20 22:06:45 jtc Exp $" * wrapper double gamma_r(double x, int *signgamp) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" diff --git a/src/libraries/runtime_math/src/w_hypot.c b/src/libraries/runtime_math/src/w_hypot.c index ecc458f85a..f09ad5b1ef 100644 --- a/src/libraries/runtime_math/src/w_hypot.c +++ b/src/libraries/runtime_math/src/w_hypot.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_hypot.c,v 1.6 1995/05/10 20:49:07 jtc Exp $"; * wrapper hypot(x,y) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" diff --git a/src/libraries/runtime_math/src/w_j0.c b/src/libraries/runtime_math/src/w_j0.c index 64bc8c0799..309190ca5a 100644 --- a/src/libraries/runtime_math/src/w_j0.c +++ b/src/libraries/runtime_math/src/w_j0.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_j0.c,v 1.6 1995/05/10 20:49:11 jtc Exp $"; * wrapper j0(double x), y0(double x) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/w_j1.c b/src/libraries/runtime_math/src/w_j1.c index 6eb1321c87..8136d0a88b 100644 --- a/src/libraries/runtime_math/src/w_j1.c +++ b/src/libraries/runtime_math/src/w_j1.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_j1.c,v 1.6 1995/05/10 20:49:15 jtc Exp $"; * wrapper of j1,y1 */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/w_jn.c b/src/libraries/runtime_math/src/w_jn.c index d10c06039f..538fbeca7d 100644 --- a/src/libraries/runtime_math/src/w_jn.c +++ b/src/libraries/runtime_math/src/w_jn.c @@ -40,7 +40,7 @@ static char rcsid[] = "$NetBSD: w_jn.c,v 1.6 1995/05/10 20:49:19 jtc Exp $"; * */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/w_lgamma.c b/src/libraries/runtime_math/src/w_lgamma.c index 649ecd0212..ea087c7aa7 100644 --- a/src/libraries/runtime_math/src/w_lgamma.c +++ b/src/libraries/runtime_math/src/w_lgamma.c @@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: w_lgamma.c,v 1.6 1995/05/10 20:49:24 jtc Exp $"; * Method: call __ieee754_lgamma_r */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" extern int signgam; diff --git a/src/libraries/runtime_math/src/w_lgamma_r.c b/src/libraries/runtime_math/src/w_lgamma_r.c index 1d1b396176..8371cc8e74 100644 --- a/src/libraries/runtime_math/src/w_lgamma_r.c +++ b/src/libraries/runtime_math/src/w_lgamma_r.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_lgamma_r.c,v 1.6 1995/05/10 20:49:27 jtc Exp $ * wrapper double lgamma_r(double x, int *signgamp) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" diff --git a/src/libraries/runtime_math/src/w_log.c b/src/libraries/runtime_math/src/w_log.c index 450e53831d..645ec7aeb1 100644 --- a/src/libraries/runtime_math/src/w_log.c +++ b/src/libraries/runtime_math/src/w_log.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_log.c,v 1.6 1995/05/10 20:49:33 jtc Exp $"; * wrapper log(x) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" diff --git a/src/libraries/runtime_math/src/w_log10.c b/src/libraries/runtime_math/src/w_log10.c index 52430abdcb..5dee99c3e1 100644 --- a/src/libraries/runtime_math/src/w_log10.c +++ b/src/libraries/runtime_math/src/w_log10.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_log10.c,v 1.6 1995/05/10 20:49:35 jtc Exp $"; * wrapper log10(X) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" diff --git a/src/libraries/runtime_math/src/w_pow.c b/src/libraries/runtime_math/src/w_pow.c index 42c3a66ffe..f12926fbb0 100644 --- a/src/libraries/runtime_math/src/w_pow.c +++ b/src/libraries/runtime_math/src/w_pow.c @@ -16,7 +16,7 @@ * wrapper pow(x,y) return x**y */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" diff --git a/src/libraries/runtime_math/src/w_remainder.c b/src/libraries/runtime_math/src/w_remainder.c index 55eb61e8f2..a4a9cd6ef6 100644 --- a/src/libraries/runtime_math/src/w_remainder.c +++ b/src/libraries/runtime_math/src/w_remainder.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_remainder.c,v 1.6 1995/05/10 20:49:44 jtc Exp * wrapper remainder(x,p) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/w_scalb.c b/src/libraries/runtime_math/src/w_scalb.c index d9ec0adb57..19bfaed9b8 100644 --- a/src/libraries/runtime_math/src/w_scalb.c +++ b/src/libraries/runtime_math/src/w_scalb.c @@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_scalb.c,v 1.6 1995/05/10 20:49:48 jtc Exp $"; * should use scalbn() instead. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #include diff --git a/src/libraries/runtime_math/src/w_sinh.c b/src/libraries/runtime_math/src/w_sinh.c index b690a1f01d..0c1936ebb7 100644 --- a/src/libraries/runtime_math/src/w_sinh.c +++ b/src/libraries/runtime_math/src/w_sinh.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_sinh.c,v 1.6 1995/05/10 20:49:51 jtc Exp $"; * wrapper sinh(x) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_math/src/w_sqrt.c b/src/libraries/runtime_math/src/w_sqrt.c index cd15231165..530996c019 100644 --- a/src/libraries/runtime_math/src/w_sqrt.c +++ b/src/libraries/runtime_math/src/w_sqrt.c @@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_sqrt.c,v 1.6 1995/05/10 20:49:55 jtc Exp $"; * wrapper sqrt(x) */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include "mathP.h" #ifdef __STDC__ diff --git a/src/libraries/runtime_memory/CMakeLists.txt b/src/libraries/runtime_memory/CMakeLists.txt index 1169a47bd5..c92c908911 100644 --- a/src/libraries/runtime_memory/CMakeLists.txt +++ b/src/libraries/runtime_memory/CMakeLists.txt @@ -29,15 +29,15 @@ if(BUILD_RUNTIME_MEMORY_LIBRARY) add_library(${MACHINEKIT_HAL_NAMESPACE}::runtime_memory_api ALIAS runtime_memory_api) - set(HEADER_FILES include/shmdrv.h) - set(SOURCE_FILES src/shmdrvapi.c) + set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/shmdrvapi.c) + set(PUBLIC_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/runtime/shmdrv.h) target_include_directories( runtime_memory_api PUBLIC $ $) - target_sources(runtime_memory_api PRIVATE ${SOURCE_FILES}) + target_sources(runtime_memory_api PUBLIC ${PUBLIC_HEADER_FILES} PRIVATE ${SOURCE_FILES}) find_library(RT NAMES "rt" "librt" "librt.so" "librt.so.1" REQUIRED) @@ -45,13 +45,11 @@ if(BUILD_RUNTIME_MEMORY_LIBRARY) target_compile_definitions(runtime_memory_api PRIVATE "ULAPI") - set_target_properties(runtime_memory_api PROPERTIES PUBLIC_HEADER - ${HEADER_FILES}) - set_target_properties( runtime_memory_api PROPERTIES SOVERSION 0 VERSION ${CMAKE_PROJECT_VERSION} + PUBLIC_HEADER "${PUBLIC_HEADER_FILES}" POSITION_INDEPENDENT_CODE TRUE) install( TARGETS runtime_memory_api diff --git a/src/libraries/runtime_memory/include/shmdrv.h b/src/libraries/runtime_memory/include/runtime/shmdrv.h similarity index 100% rename from src/libraries/runtime_memory/include/shmdrv.h rename to src/libraries/runtime_memory/include/runtime/shmdrv.h diff --git a/src/libraries/runtime_memory/src/shmdrv.c b/src/libraries/runtime_memory/src/shmdrv.c index 51e757d566..96a56ec109 100755 --- a/src/libraries/runtime_memory/src/shmdrv.c +++ b/src/libraries/runtime_memory/src/shmdrv.c @@ -63,7 +63,7 @@ #include #include -#include "shmdrv.h" +#include "runtime/shmdrv.h" static int debug = 0; module_param(debug, int, S_IRUGO | S_IWUSR); diff --git a/src/libraries/runtime_memory/src/shmdrvapi.c b/src/libraries/runtime_memory/src/shmdrvapi.c index 2f897230b7..442e1ba9ff 100644 --- a/src/libraries/runtime_memory/src/shmdrvapi.c +++ b/src/libraries/runtime_memory/src/shmdrvapi.c @@ -30,9 +30,9 @@ #include #include -#include "config.h" // build configuration -#include "rtapi.h" -#include "shmdrv.h" +#include "runtime/config.h" // build configuration +#include "runtime/rtapi.h" +#include "runtime/shmdrv.h" static const char *driver_name = "/dev/" DEVICE_NAME; diff --git a/src/libraries/samstr_memdefs/include/samstr_memdefs/samstr_memdefs.h b/src/libraries/samstr_memdefs/include/samstr_memdefs/samstr_memdefs.h index ded3edb46f..6b0563a963 100644 --- a/src/libraries/samstr_memdefs/include/samstr_memdefs/samstr_memdefs.h +++ b/src/libraries/samstr_memdefs/include/samstr_memdefs/samstr_memdefs.h @@ -9,7 +9,7 @@ * Copyright (c) 2006 All rights reserved. * ********************************************************************/ -#include "rtapi_shmkeys.h" +#include "runtime/rtapi_shmkeys.h" #define MAX_STREAMERS 8 #define MAX_SAMPLERS 8 diff --git a/src/libraries/syslog_async/CMakeLists.txt b/src/libraries/syslog_async/CMakeLists.txt index 9fa473c147..37a9304991 100644 --- a/src/libraries/syslog_async/CMakeLists.txt +++ b/src/libraries/syslog_async/CMakeLists.txt @@ -30,21 +30,26 @@ if(BUILD_SYSLOG_ASYNC_LIBRARY) add_library(syslog_async SHARED) add_library(${MACHINEKIT_HAL_NAMESPACE}::syslog_async ALIAS syslog_async) - set(HEADER_FILES include/syslog_async.h) - set(SOURCE_FILES src/syslog_async.c) + set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/syslog_async.c) + set(PUBLIC_HEADER_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/include/syslog_async/syslog_async.h) target_include_directories( syslog_async PUBLIC $ $) - target_sources(syslog_async PRIVATE ${SOURCE_FILES}) + target_sources( + syslog_async + PUBLIC ${PUBLIC_HEADER_FILES} + PRIVATE ${SOURCE_FILES}) set_target_properties( syslog_async PROPERTIES SOVERSION 0 VERSION ${CMAKE_PROJECT_VERSION} RUNTIME_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}" + PUBLIC_HEADER "${PUBLIC_HEADER_FILES}" POSITION_INDEPENDENT_CODE TRUE) install( TARGETS syslog_async diff --git a/src/libraries/syslog_async/include/syslog_async.h b/src/libraries/syslog_async/include/syslog_async/syslog_async.h similarity index 100% rename from src/libraries/syslog_async/include/syslog_async.h rename to src/libraries/syslog_async/include/syslog_async/syslog_async.h diff --git a/src/libraries/syslog_async/src/syslog_async.c b/src/libraries/syslog_async/src/syslog_async.c index 7f69333261..17a8685b2c 100644 --- a/src/libraries/syslog_async/src/syslog_async.c +++ b/src/libraries/syslog_async/src/syslog_async.c @@ -33,7 +33,7 @@ #include #include -#include "syslog_async.h" +#include "syslog_async/syslog_async.h" /* From RFC 3164 */ #define MAX_MESSAGE 1024 diff --git a/src/libraries/upci/CMakeLists.txt b/src/libraries/upci/CMakeLists.txt index 9add3d4076..e386818959 100644 --- a/src/libraries/upci/CMakeLists.txt +++ b/src/libraries/upci/CMakeLists.txt @@ -34,13 +34,25 @@ if(SYS_IO_AVAILABLE) if(BUILD_UPCI_LIBRARY) add_library(upci STATIC) - set(SOURCE_FILES src/upci.c src/bitfile.c) + set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/upci.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/bitfile.c) + set(PUBLIC_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/upci/bitfile.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/upci/upci.h) - target_sources(upci PRIVATE ${SOURCE_FILES}) + target_sources( + upci + PUBLIC ${PUBLIC_HEADER_FILES} + PRIVATE ${SOURCE_FILES}) target_include_directories( upci PUBLIC $) + set_target_properties( + upci + PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}" + PUBLIC_HEADER "${PUBLIC_HEADER_FILES}" + POSITION_INDEPENDENT_CODE TRUE) + install( TARGETS upci EXPORT machinekit_hal diff --git a/src/libraries/upci/include/bitfile.h b/src/libraries/upci/include/upci/bitfile.h similarity index 100% rename from src/libraries/upci/include/bitfile.h rename to src/libraries/upci/include/upci/bitfile.h diff --git a/src/libraries/upci/include/upci.h b/src/libraries/upci/include/upci/upci.h similarity index 100% rename from src/libraries/upci/include/upci.h rename to src/libraries/upci/include/upci/upci.h diff --git a/src/libraries/upci/src/bitfile.c b/src/libraries/upci/src/bitfile.c index 5635b6eef3..e0a54951ea 100644 --- a/src/libraries/upci/src/bitfile.c +++ b/src/libraries/upci/src/bitfile.c @@ -42,7 +42,7 @@ any responsibility for such compliance. #include #include #include -#include "bitfile.h" +#include "upci/bitfile.h" #define XILINX_CHUNKS "abcde" diff --git a/src/libraries/upci/src/upci.c b/src/libraries/upci/src/upci.c index fa2b3bc093..cf1a57e44b 100644 --- a/src/libraries/upci/src/upci.c +++ b/src/libraries/upci/src/upci.c @@ -47,7 +47,7 @@ information, go to https://github.com/machinekit. #include #include #include -#include "upci.h" +#include "upci/upci.h" /************************************************************************/ diff --git a/src/libraries/user_pci/include/user_pci/firmware.h b/src/libraries/user_pci/include/user_pci/firmware.h index 3e32c7323d..a7df51c856 100644 --- a/src/libraries/user_pci/include/user_pci/firmware.h +++ b/src/libraries/user_pci/include/user_pci/firmware.h @@ -48,7 +48,7 @@ #ifndef _LINUX_FIRMWARE_H #define _LINUX_FIRMWARE_H -#include "rtapi.h" // u8 type +#include "runtime/rtapi.h" // u8 type #include // size_t struct firmware { diff --git a/src/libraries/user_pci/include/user_pci/module.h b/src/libraries/user_pci/include/user_pci/module.h index cb457e7b75..5b7f3237cf 100755 --- a/src/libraries/user_pci/include/user_pci/module.h +++ b/src/libraries/user_pci/include/user_pci/module.h @@ -45,7 +45,7 @@ #include RTAPI_INC_LIST_H /* The bulk of the usermode driver support functions */ -#include "rtapi_pci.h" +#include "runtime/rtapi_pci.h" /* Piecemeal bits and pieces to add features that would have otherwise been included by some of the files above diff --git a/src/modules/managed/components/at_pid/src/at_pid.icomp b/src/modules/managed/components/at_pid/src/at_pid.icomp index 38bd8be17e..a3c37ed7cc 100644 --- a/src/modules/managed/components/at_pid/src/at_pid.icomp +++ b/src/modules/managed/components/at_pid/src/at_pid.icomp @@ -148,7 +148,7 @@ license "GPL v2"; author "John Kasunich"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #define PI 3.141592653589 diff --git a/src/modules/managed/components/at_pidv2/src/at_pidv2.icomp b/src/modules/managed/components/at_pidv2/src/at_pidv2.icomp index 230558e335..70864029eb 100644 --- a/src/modules/managed/components/at_pidv2/src/at_pidv2.icomp +++ b/src/modules/managed/components/at_pidv2/src/at_pidv2.icomp @@ -148,7 +148,7 @@ license "GPL v2"; author "John Kasunich"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #define PI 3.141592653589 diff --git a/src/modules/managed/components/biquad/src/biquad.icomp b/src/modules/managed/components/biquad/src/biquad.icomp index 20c0e90f09..3904be3409 100644 --- a/src/modules/managed/components/biquad/src/biquad.icomp +++ b/src/modules/managed/components/biquad/src/biquad.icomp @@ -71,7 +71,7 @@ license "GPL"; #include -#include +#include #define PI 3.141592653589 diff --git a/src/modules/managed/components/biquadv2/src/biquadv2.icomp b/src/modules/managed/components/biquadv2/src/biquadv2.icomp index 78c7e50702..6077243b7a 100644 --- a/src/modules/managed/components/biquadv2/src/biquadv2.icomp +++ b/src/modules/managed/components/biquadv2/src/biquadv2.icomp @@ -73,7 +73,7 @@ license "GPL"; #include -#include +#include #define PI 3.141592653589 diff --git a/src/modules/managed/components/bldc/src/bldc.comp b/src/modules/managed/components/bldc/src/bldc.comp index a78687b0d3..22295fc265 100644 --- a/src/modules/managed/components/bldc/src/bldc.comp +++ b/src/modules/managed/components/bldc/src/bldc.comp @@ -378,7 +378,7 @@ variable int force_trap = 0; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #define MAX_CHAN 8 #define NUM_TAG 8 diff --git a/src/modules/managed/components/clarkeinv/src/clarkeinv.icomp b/src/modules/managed/components/clarkeinv/src/clarkeinv.icomp index afc34f02ad..5e4ab7bc90 100644 --- a/src/modules/managed/components/clarkeinv/src/clarkeinv.icomp +++ b/src/modules/managed/components/clarkeinv/src/clarkeinv.icomp @@ -13,7 +13,7 @@ pin out float c "three phase output vector"; function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" /* for the details, google "clarke transform", or see section 3 of http://focus.ti.com/lit/an/bpra048/bpra048.pdf and/or appendix B of diff --git a/src/modules/managed/components/clarkeinvv2/src/clarkeinvv2.icomp b/src/modules/managed/components/clarkeinvv2/src/clarkeinvv2.icomp index 4f6ea9bb56..d5e1dc10a1 100644 --- a/src/modules/managed/components/clarkeinvv2/src/clarkeinvv2.icomp +++ b/src/modules/managed/components/clarkeinvv2/src/clarkeinvv2.icomp @@ -13,7 +13,7 @@ pin_ptr out float c "three phase output vector"; function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" /* for the details, google "clarke transform", or see section 3 of http://focus.ti.com/lit/an/bpra048/bpra048.pdf and/or appendix B of diff --git a/src/modules/managed/components/const_rt/src/const-rt.cc b/src/modules/managed/components/const_rt/src/const-rt.cc index d29e5591e4..b08e28a5a8 100644 --- a/src/modules/managed/components/const_rt/src/const-rt.cc +++ b/src/modules/managed/components/const_rt/src/const-rt.cc @@ -11,9 +11,9 @@ #include #include /* Standard types */ -#include -#include "rtapi_app.h" -#include "rtapi_string.h" +#include +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" #include #include #include diff --git a/src/modules/managed/components/const_rtv2/src/const-rtv2.cc b/src/modules/managed/components/const_rtv2/src/const-rtv2.cc index 716efaead7..718701e36a 100644 --- a/src/modules/managed/components/const_rtv2/src/const-rtv2.cc +++ b/src/modules/managed/components/const_rtv2/src/const-rtv2.cc @@ -12,9 +12,9 @@ #include #include /* Standard types */ -#include -#include "rtapi_app.h" -#include "rtapi_string.h" +#include +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" #include #include #include diff --git a/src/modules/managed/components/counter/src/counter.c b/src/modules/managed/components/counter/src/counter.c index 0f8a48ff1f..0c24ede345 100644 --- a/src/modules/managed/components/counter/src/counter.c +++ b/src/modules/managed/components/counter/src/counter.c @@ -42,9 +42,9 @@ * Based heavily on the "encoder" hal module by John Kasunich */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "rtapi_errno.h" /* EINVAL etc */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_errno.h" /* EINVAL etc */ #include "hal/hal.h" /* HAL public API decls */ /* module information */ diff --git a/src/modules/managed/components/cpp_test/src/cpptest.cc b/src/modules/managed/components/cpp_test/src/cpptest.cc index 8ebc634cb8..b3b382fc80 100644 --- a/src/modules/managed/components/cpp_test/src/cpptest.cc +++ b/src/modules/managed/components/cpp_test/src/cpptest.cc @@ -24,8 +24,8 @@ // # setp lut5.N.function 0xe -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_accessor.h" diff --git a/src/modules/managed/components/delayline/src/delayline.c b/src/modules/managed/components/delayline/src/delayline.c index 25138a372d..dad04682d2 100644 --- a/src/modules/managed/components/delayline/src/delayline.c +++ b/src/modules/managed/components/delayline/src/delayline.c @@ -11,9 +11,9 @@ // // see manpage delayline.9 -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" #include "hal/hal.h" #include "hal/hal_ring.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/components/encoder/src/encoder.c b/src/modules/managed/components/encoder/src/encoder.c index 3c3ab23338..27e4a81cb4 100644 --- a/src/modules/managed/components/encoder/src/encoder.c +++ b/src/modules/managed/components/encoder/src/encoder.c @@ -59,9 +59,9 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "rtapi_string.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_string.h" #include "hal/hal.h" /* HAL public API decls */ /* module information */ diff --git a/src/modules/managed/components/encoder_ratio/src/encoder_ratio.c b/src/modules/managed/components/encoder_ratio/src/encoder_ratio.c index 72aa62ae55..a7933d378d 100644 --- a/src/modules/managed/components/encoder_ratio/src/encoder_ratio.c +++ b/src/modules/managed/components/encoder_ratio/src/encoder_ratio.c @@ -92,8 +92,8 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ /* module information */ diff --git a/src/modules/managed/components/encoder_ratiov2/src/encoder_ratiov2.c b/src/modules/managed/components/encoder_ratiov2/src/encoder_ratiov2.c index 86194d00f7..8fc508703f 100644 --- a/src/modules/managed/components/encoder_ratiov2/src/encoder_ratiov2.c +++ b/src/modules/managed/components/encoder_ratiov2/src/encoder_ratiov2.c @@ -94,9 +94,9 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "rtapi_atomics.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_atomics.h" #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" // SHMPTR,SHMOFF #include "hal/hal_list.h" diff --git a/src/modules/managed/components/encoderv2/src/encoderv2.c b/src/modules/managed/components/encoderv2/src/encoderv2.c index bbb59091f5..c51f463b79 100644 --- a/src/modules/managed/components/encoderv2/src/encoderv2.c +++ b/src/modules/managed/components/encoderv2/src/encoderv2.c @@ -59,10 +59,10 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "rtapi_atomics.h" -#include "rtapi_string.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_atomics.h" +#include "runtime/rtapi_string.h" #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" // SHMPTR,SHMOFF #include "hal/hal_list.h" diff --git a/src/modules/managed/components/hypot/src/hypot.icomp b/src/modules/managed/components/hypot/src/hypot.icomp index b68cf9ea0b..0b3e59a045 100644 --- a/src/modules/managed/components/hypot/src/hypot.icomp +++ b/src/modules/managed/components/hypot/src/hypot.icomp @@ -6,7 +6,7 @@ pin out float out "out = sqrt(in0^2 + in1^2 + in2^2)"; function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { hal_float_t a = in0, b = in1, c = in2; diff --git a/src/modules/managed/components/hypotv2/src/hypotv2.icomp b/src/modules/managed/components/hypotv2/src/hypotv2.icomp index 7d7fff3e20..d60582af7d 100644 --- a/src/modules/managed/components/hypotv2/src/hypotv2.icomp +++ b/src/modules/managed/components/hypotv2/src/hypotv2.icomp @@ -6,7 +6,7 @@ pin_ptr out float out "out = sqrt(in0^2 + in1^2 + in2^2)"; function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { hal_float_t a = gf(in0), b = gf(in1), c = gf(in2); diff --git a/src/modules/managed/components/icomp/src/icomp.c b/src/modules/managed/components/icomp/src/icomp.c index ddff095e1f..d417df642d 100644 --- a/src/modules/managed/components/icomp/src/icomp.c +++ b/src/modules/managed/components/icomp/src/icomp.c @@ -2,8 +2,8 @@ #include #include -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/components/interpolator/src/interpolate.c b/src/modules/managed/components/interpolator/src/interpolate.c index c691c6531b..461eb35fd5 100644 --- a/src/modules/managed/components/interpolator/src/interpolate.c +++ b/src/modules/managed/components/interpolator/src/interpolate.c @@ -1,6 +1,6 @@ -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_ring.h" diff --git a/src/modules/managed/components/invert/src/invert.icomp b/src/modules/managed/components/invert/src/invert.icomp index b246ec0d49..ce6f207bb5 100644 --- a/src/modules/managed/components/invert/src/invert.icomp +++ b/src/modules/managed/components/invert/src/invert.icomp @@ -26,7 +26,7 @@ function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/components/invertv2/src/invertv2.icomp b/src/modules/managed/components/invertv2/src/invertv2.icomp index 1683cdc44b..9a4cfa25ea 100644 --- a/src/modules/managed/components/invertv2/src/invertv2.icomp +++ b/src/modules/managed/components/invertv2/src/invertv2.icomp @@ -26,7 +26,7 @@ function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/components/iring_demo/src/iring.c b/src/modules/managed/components/iring_demo/src/iring.c index 8d51b98f7f..7522173907 100644 --- a/src/modules/managed/components/iring_demo/src/iring.c +++ b/src/modules/managed/components/iring_demo/src/iring.c @@ -1,5 +1,5 @@ -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_accessor.h" diff --git a/src/modules/managed/components/joyhandle/src/joyhandle.icomp b/src/modules/managed/components/joyhandle/src/joyhandle.icomp index 0a62cc617e..24b4792e74 100644 --- a/src/modules/managed/components/joyhandle/src/joyhandle.icomp +++ b/src/modules/managed/components/joyhandle/src/joyhandle.icomp @@ -46,7 +46,7 @@ All values can be adjusted for each instance separately. function _; license "GPL"; ;; -#include +#include FUNCTION(_) { diff --git a/src/modules/managed/components/joyhandlev2/src/joyhandlev2.icomp b/src/modules/managed/components/joyhandlev2/src/joyhandlev2.icomp index cab1ce61ef..5862814cad 100644 --- a/src/modules/managed/components/joyhandlev2/src/joyhandlev2.icomp +++ b/src/modules/managed/components/joyhandlev2/src/joyhandlev2.icomp @@ -46,7 +46,7 @@ All values can be adjusted for each instance separately. function _; license "GPL"; ;; -#include +#include FUNCTION(_) { diff --git a/src/modules/managed/components/jplanner/src/jplan.c b/src/modules/managed/components/jplanner/src/jplan.c index 5528d6afc9..2074036410 100644 --- a/src/modules/managed/components/jplanner/src/jplan.c +++ b/src/modules/managed/components/jplanner/src/jplan.c @@ -1,6 +1,6 @@ -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_ring.h" diff --git a/src/modules/managed/components/lcd/src/lcd.c b/src/modules/managed/components/lcd/src/lcd.c index ba0adbdad3..041b1cb3f7 100644 --- a/src/modules/managed/components/lcd/src/lcd.c +++ b/src/modules/managed/components/lcd/src/lcd.c @@ -19,11 +19,11 @@ /* A component to stream HAL data to an LCD in a user-defined format */ -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" #include "hal/hal.h" -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include #include diff --git a/src/modules/managed/components/led_dim/src/led_dim.icomp b/src/modules/managed/components/led_dim/src/led_dim.icomp index 37a6c09f1f..1074224d71 100644 --- a/src/modules/managed/components/led_dim/src/led_dim.icomp +++ b/src/modules/managed/components/led_dim/src/led_dim.icomp @@ -47,7 +47,7 @@ The output is calculated using the CIE 1931 formula. license "GPL"; variable hal_float_t last_in = 0.0; ;; -#include +#include #define MIN(x,y) (x < y ? x : y) FUNCTION(_) { diff --git a/src/modules/managed/components/led_dimv2/src/led_dimv2.icomp b/src/modules/managed/components/led_dimv2/src/led_dimv2.icomp index 9f49d04a32..8b0cc997b0 100644 --- a/src/modules/managed/components/led_dimv2/src/led_dimv2.icomp +++ b/src/modules/managed/components/led_dimv2/src/led_dimv2.icomp @@ -47,7 +47,7 @@ The output is calculated using the CIE 1931 formula. license "GPL"; variable hal_float_t last_in = 0.0; ;; -#include +#include #define MIN(x,y) (x < y ? x : y) FUNCTION(_) { diff --git a/src/modules/managed/components/limit3/src/limit3.icomp b/src/modules/managed/components/limit3/src/limit3.icomp index 6bf1366c5f..fbb3dee82b 100644 --- a/src/modules/managed/components/limit3/src/limit3.icomp +++ b/src/modules/managed/components/limit3/src/limit3.icomp @@ -29,7 +29,7 @@ function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #define SET_NEXT_STATE(_out, _in) \ do { \ diff --git a/src/modules/managed/components/limit3v2/src/limit3v2.icomp b/src/modules/managed/components/limit3v2/src/limit3v2.icomp index a8bfeb36f3..bc75e6be01 100644 --- a/src/modules/managed/components/limit3v2/src/limit3v2.icomp +++ b/src/modules/managed/components/limit3v2/src/limit3v2.icomp @@ -29,7 +29,7 @@ function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #define SET_NEXT_STATE(_out, _in) \ do { \ diff --git a/src/modules/managed/components/lutn/src/lutn.c b/src/modules/managed/components/lutn/src/lutn.c index 778c00734c..d23bc0c48a 100644 --- a/src/modules/managed/components/lutn/src/lutn.c +++ b/src/modules/managed/components/lutn/src/lutn.c @@ -24,8 +24,8 @@ // # setp lut5.N.function 0xe -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/components/lutn_demo/src/lutn_demo.c b/src/modules/managed/components/lutn_demo/src/lutn_demo.c index e07a41f6c6..81031c570e 100644 --- a/src/modules/managed/components/lutn_demo/src/lutn_demo.c +++ b/src/modules/managed/components/lutn_demo/src/lutn_demo.c @@ -24,8 +24,8 @@ // # setp lut5.N.function 0xe -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/components/lutnv2/src/lutnv2c.c b/src/modules/managed/components/lutnv2/src/lutnv2c.c index 6d1d4820f8..b09bf96433 100644 --- a/src/modules/managed/components/lutnv2/src/lutnv2c.c +++ b/src/modules/managed/components/lutnv2/src/lutnv2c.c @@ -24,8 +24,8 @@ // # setp lut5.N.function 0xe -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_accessor.h" diff --git a/src/modules/managed/components/matrix_kb/src/matrix_kb.c b/src/modules/managed/components/matrix_kb/src/matrix_kb.c index 2c6c652327..c969678023 100644 --- a/src/modules/managed/components/matrix_kb/src/matrix_kb.c +++ b/src/modules/managed/components/matrix_kb/src/matrix_kb.c @@ -16,8 +16,8 @@ // /* A component to convert 7i73 bytecodes to bit pins */ -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #define MAX_CHAN 8 diff --git a/src/modules/managed/components/maxn/src/maxn.icomp b/src/modules/managed/components/maxn/src/maxn.icomp index 367ed4ef89..695aaede5a 100644 --- a/src/modules/managed/components/maxn/src/maxn.icomp +++ b/src/modules/managed/components/maxn/src/maxn.icomp @@ -10,7 +10,7 @@ function _; license "GPL"; author "Alexander Roessler"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/components/maxnv2/src/maxnv2.icomp b/src/modules/managed/components/maxnv2/src/maxnv2.icomp index 50e3e5f2b5..1f0dd551a0 100644 --- a/src/modules/managed/components/maxnv2/src/maxnv2.icomp +++ b/src/modules/managed/components/maxnv2/src/maxnv2.icomp @@ -10,7 +10,7 @@ function _; license "GPL"; author "Alexander Roessler"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/components/minn/src/minn.icomp b/src/modules/managed/components/minn/src/minn.icomp index a471c51ca4..3297d3e1be 100644 --- a/src/modules/managed/components/minn/src/minn.icomp +++ b/src/modules/managed/components/minn/src/minn.icomp @@ -10,7 +10,7 @@ function _; license "GPL"; author "Alexander Roessler"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/components/minnv2/src/minnv2.icomp b/src/modules/managed/components/minnv2/src/minnv2.icomp index 9f9d11146b..019972fd38 100644 --- a/src/modules/managed/components/minnv2/src/minnv2.icomp +++ b/src/modules/managed/components/minnv2/src/minnv2.icomp @@ -10,7 +10,7 @@ function _; license "GPL"; author "Alexander Roessler"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/components/mux_generic/src/mux_generic.c b/src/modules/managed/components/mux_generic/src/mux_generic.c index fbdd83e8e3..c3276c522a 100644 --- a/src/modules/managed/components/mux_generic/src/mux_generic.c +++ b/src/modules/managed/components/mux_generic/src/mux_generic.c @@ -17,9 +17,9 @@ // A generic/configurable multiplexer component -#include "config.h" -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/components/near/src/near.icomp b/src/modules/managed/components/near/src/near.icomp index 0730ff1ac0..207a89ff34 100644 --- a/src/modules/managed/components/near/src/near.icomp +++ b/src/modules/managed/components/near/src/near.icomp @@ -11,7 +11,7 @@ if their absolute difference is no greater than \\fBdifference\\fR (i.e., function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { hal_float_t in1 = in1_, in2 = in2_; diff --git a/src/modules/managed/components/nearv2/src/nearv2.icomp b/src/modules/managed/components/nearv2/src/nearv2.icomp index ef46af3c02..9d26909fea 100644 --- a/src/modules/managed/components/nearv2/src/nearv2.icomp +++ b/src/modules/managed/components/nearv2/src/nearv2.icomp @@ -11,7 +11,7 @@ if their absolute difference is no greater than \\fBdifference\\fR (i.e., function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { hal_float_t in1 = gf(in1_), in2 = gf(in2_); diff --git a/src/modules/managed/components/orient/src/orient.icomp b/src/modules/managed/components/orient/src/orient.icomp index 5f456975c8..8ae909f7f0 100644 --- a/src/modules/managed/components/orient/src/orient.icomp +++ b/src/modules/managed/components/orient/src/orient.icomp @@ -61,7 +61,7 @@ net orient-command orient.command orient-pid.command license "GPL"; ;; -#include +#include FUNCTION(_) { diff --git a/src/modules/managed/components/orientv2/src/orientv2.icomp b/src/modules/managed/components/orientv2/src/orientv2.icomp index 17ac71807b..a1420a6011 100644 --- a/src/modules/managed/components/orientv2/src/orientv2.icomp +++ b/src/modules/managed/components/orientv2/src/orientv2.icomp @@ -61,7 +61,7 @@ net orient-command orient.command orient-pid.command license "GPL"; ;; -#include +#include FUNCTION(_) { diff --git a/src/modules/managed/components/pbmsgs/include/pbmsgs.h b/src/modules/managed/components/pbmsgs/include/pbmsgs.h index f25dcf941f..a64b546a70 100644 --- a/src/modules/managed/components/pbmsgs/include/pbmsgs.h +++ b/src/modules/managed/components/pbmsgs/include/pbmsgs.h @@ -1,7 +1,7 @@ #ifndef _PBMSGS_H #define _PBMSGS_H -#include +#include #include #include diff --git a/src/modules/managed/components/pbmsgs/src/pbmsgs.c b/src/modules/managed/components/pbmsgs/src/pbmsgs.c index 647136664f..191b2720d1 100644 --- a/src/modules/managed/components/pbmsgs/src/pbmsgs.c +++ b/src/modules/managed/components/pbmsgs/src/pbmsgs.c @@ -12,9 +12,9 @@ // (stanza pbmsgs-objs := ..) // add an PB_DESCRIPTOR(..) at the end of this file -#include "config.h" /* GIT_BUILD_SHA */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/config.h" /* GIT_BUILD_SHA */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL API */ #include "pbmsgs.h" diff --git a/src/modules/managed/components/pbring/pbring.c.v2 b/src/modules/managed/components/pbring/pbring.c.v2 index bc4e9527ea..6924829880 100644 --- a/src/modules/managed/components/pbring/pbring.c.v2 +++ b/src/modules/managed/components/pbring/pbring.c.v2 @@ -1,6 +1,6 @@ // demo actor component to show sending/receiving protobuf-encoded messages over HAL rings -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_ring.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/components/pbring/src/pbring.c b/src/modules/managed/components/pbring/src/pbring.c index 61799ea682..8ea656a06b 100644 --- a/src/modules/managed/components/pbring/src/pbring.c +++ b/src/modules/managed/components/pbring/src/pbring.c @@ -1,6 +1,6 @@ // demo actor component to show sending/receiving protobuf-encoded messages over HAL rings -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_ring.h" #include "hal/hal_priv.h" @@ -8,10 +8,10 @@ // the nanopb library and compiled message definitions are brought in once by // 'halcmd loadrt pbmsgs' (message descriptors for parsing and generating pb msgs) // the nanopb library functions per se are now linked into hal_lib.so -#include +#include #include #include -#include +#include typedef struct { hal_u32_t *underrun; // number of thread invocations with no new command available diff --git a/src/modules/managed/components/pepper/src/pepper.c b/src/modules/managed/components/pepper/src/pepper.c index c965f4bdac..94fb828fc1 100644 --- a/src/modules/managed/components/pepper/src/pepper.c +++ b/src/modules/managed/components/pepper/src/pepper.c @@ -79,12 +79,12 @@ */ #include -#include "rtapi_math.h" -#include +#include "runtime/rtapi_math.h" +#include #include -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ /* module information */ diff --git a/src/modules/managed/components/plug_demo/src/plug.c b/src/modules/managed/components/plug_demo/src/plug.c index df26dc650a..16e1bde2b7 100644 --- a/src/modules/managed/components/plug_demo/src/plug.c +++ b/src/modules/managed/components/plug_demo/src/plug.c @@ -1,6 +1,6 @@ -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_ring.h" diff --git a/src/modules/managed/components/probe_parport/src/probe_parport.c b/src/modules/managed/components/probe_parport/src/probe_parport.c index cdcd6cac5a..086f7ac9ce 100644 --- a/src/modules/managed/components/probe_parport/src/probe_parport.c +++ b/src/modules/managed/components/probe_parport/src/probe_parport.c @@ -38,10 +38,10 @@ * Updated probing logic - Adam Belay */ -#include "config.h" +#include "runtime/config.h" #include "hal/hal.h" -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" static int comp_id; diff --git a/src/modules/managed/components/pwmgen/src/pwmgen.c b/src/modules/managed/components/pwmgen/src/pwmgen.c index c92290c144..d9f4733e4c 100644 --- a/src/modules/managed/components/pwmgen/src/pwmgen.c +++ b/src/modules/managed/components/pwmgen/src/pwmgen.c @@ -65,8 +65,8 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ #define MAX_CHAN 8 diff --git a/src/modules/managed/components/pwmgenv2/src/pwmgenv2.c b/src/modules/managed/components/pwmgenv2/src/pwmgenv2.c index 7dff5fa8d2..d8bc49dfee 100644 --- a/src/modules/managed/components/pwmgenv2/src/pwmgenv2.c +++ b/src/modules/managed/components/pwmgenv2/src/pwmgenv2.c @@ -71,9 +71,9 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "triple-buffer.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/triple-buffer.h" #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" // SHMPTR,SHMOFF #include "hal/hal_list.h" diff --git a/src/modules/managed/components/random/src/random.c b/src/modules/managed/components/random/src/random.c index 1f75ddc55a..1833c5af73 100644 --- a/src/modules/managed/components/random/src/random.c +++ b/src/modules/managed/components/random/src/random.c @@ -1,5 +1,5 @@ -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_accessor.h" diff --git a/src/modules/managed/components/rtapi-malloc-free/src/testalloc.comp b/src/modules/managed/components/rtapi-malloc-free/src/testalloc.comp index fd2d835a5c..7a98b2e1b9 100644 --- a/src/modules/managed/components/rtapi-malloc-free/src/testalloc.comp +++ b/src/modules/managed/components/rtapi-malloc-free/src/testalloc.comp @@ -13,7 +13,7 @@ license "GPLv2 or later"; ;; #include "hal/hal.h" -#include "rtapi_heap.h" +#include "runtime/rtapi_heap.h" static char *name = "testalloc"; static char *p1,*p2,*p3; diff --git a/src/modules/managed/components/rtfault/src/rtfault.comp b/src/modules/managed/components/rtfault/src/rtfault.comp index 95fcd2022e..6612130e7f 100644 --- a/src/modules/managed/components/rtfault/src/rtfault.comp +++ b/src/modules/managed/components/rtfault/src/rtfault.comp @@ -10,7 +10,7 @@ function _; license "GPL"; ;; -#include "rtapi.h" +#include "runtime/rtapi.h" #include #include #include diff --git a/src/modules/managed/components/rtmon/src/rtmon.comp b/src/modules/managed/components/rtmon/src/rtmon.comp index dcf65f075d..62d930db91 100644 --- a/src/modules/managed/components/rtmon/src/rtmon.comp +++ b/src/modules/managed/components/rtmon/src/rtmon.comp @@ -55,7 +55,7 @@ function _ ; license "GPL"; ;; -#include "rtapi.h" +#include "runtime/rtapi.h" #include // need a bit of trickery here - we're accessing the (sole) instance data diff --git a/src/modules/managed/components/sample_channel/src/sample_channel_pb.c b/src/modules/managed/components/sample_channel/src/sample_channel_pb.c index 9a43c5ed3d..017cabd5d2 100644 --- a/src/modules/managed/components/sample_channel/src/sample_channel_pb.c +++ b/src/modules/managed/components/sample_channel/src/sample_channel_pb.c @@ -63,9 +63,9 @@ *****************************************************************************/ -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_ring.h" diff --git a/src/modules/managed/components/sampler/src/sampler.c b/src/modules/managed/components/sampler/src/sampler.c index 65315abefd..90e2c9257e 100644 --- a/src/modules/managed/components/sampler/src/sampler.c +++ b/src/modules/managed/components/sampler/src/sampler.c @@ -53,12 +53,12 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ #include "samstr_memdefs/samstr_memdefs.h" /* decls and such for fifos */ -#include "rtapi_errno.h" -#include "rtapi_string.h" +#include "runtime/rtapi_errno.h" +#include "runtime/rtapi_string.h" /* module information */ MODULE_AUTHOR("John Kasunich"); diff --git a/src/modules/managed/components/scope_rt/src/scope_rt.c b/src/modules/managed/components/scope_rt/src/scope_rt.c index 9900540eb6..674f9883f7 100644 --- a/src/modules/managed/components/scope_rt/src/scope_rt.c +++ b/src/modules/managed/components/scope_rt/src/scope_rt.c @@ -32,12 +32,12 @@ information, go to https://github.com/machinekit. */ -#include /* RTAPI realtime OS API */ -#include /* RTAPI realtime module decls */ +#include /* RTAPI realtime OS API */ +#include /* RTAPI realtime module decls */ #include /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private API decls */ #include "scope_rt.h" /* scope related declarations */ -#include "rtapi_string.h" +#include "runtime/rtapi_string.h" /* module information */ MODULE_AUTHOR("John Kasunich"); diff --git a/src/modules/managed/components/siggen/src/siggen.c b/src/modules/managed/components/siggen/src/siggen.c index 46e1441193..753e96068b 100644 --- a/src/modules/managed/components/siggen/src/siggen.c +++ b/src/modules/managed/components/siggen/src/siggen.c @@ -69,12 +69,12 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ #include -#include "rtapi_math.h" -#include +#include "runtime/rtapi_math.h" +#include /* module information */ MODULE_AUTHOR("John Kasunich"); diff --git a/src/modules/managed/components/sim_encoder/src/sim_encoder.c b/src/modules/managed/components/sim_encoder/src/sim_encoder.c index 1aaa532268..b71a27bff0 100644 --- a/src/modules/managed/components/sim_encoder/src/sim_encoder.c +++ b/src/modules/managed/components/sim_encoder/src/sim_encoder.c @@ -58,9 +58,9 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "rtapi_string.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_string.h" #include "hal/hal.h" /* HAL public API decls */ #define MAX_CHAN 8 diff --git a/src/modules/managed/components/sim_spindle/src/sim_spindle.icomp b/src/modules/managed/components/sim_spindle/src/sim_spindle.icomp index 3d44ab4781..77a28513d1 100644 --- a/src/modules/managed/components/sim_spindle/src/sim_spindle.icomp +++ b/src/modules/managed/components/sim_spindle/src/sim_spindle.icomp @@ -10,7 +10,7 @@ license "GPL"; function _; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/components/sim_spindlev2/src/sim_spindlev2.icomp b/src/modules/managed/components/sim_spindlev2/src/sim_spindlev2.icomp index 4910ea876b..2576c216cc 100644 --- a/src/modules/managed/components/sim_spindlev2/src/sim_spindlev2.icomp +++ b/src/modules/managed/components/sim_spindlev2/src/sim_spindlev2.icomp @@ -10,7 +10,7 @@ license "GPL"; function _; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/components/stepgen/src/stepgen.c b/src/modules/managed/components/stepgen/src/stepgen.c index db9b8ef676..95e795a2ea 100644 --- a/src/modules/managed/components/stepgen/src/stepgen.c +++ b/src/modules/managed/components/stepgen/src/stepgen.c @@ -297,12 +297,12 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ #include -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #define MAX_CHAN 16 #define MAX_CYCLE 18 diff --git a/src/modules/managed/components/stepgenv2/src/stepgenv2.c b/src/modules/managed/components/stepgenv2/src/stepgenv2.c index f7dffb043f..e00d908696 100644 --- a/src/modules/managed/components/stepgenv2/src/stepgenv2.c +++ b/src/modules/managed/components/stepgenv2/src/stepgenv2.c @@ -299,16 +299,16 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "triple-buffer.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/triple-buffer.h" #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" // SHMPTR,SHMOFF #include "hal/hal_list.h" #include "hal/hal_logging.h" #include -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" // debugging // #define TRACE_TB diff --git a/src/modules/managed/components/streamer/src/streamer.c b/src/modules/managed/components/streamer/src/streamer.c index a0af64d5b6..1d720b2497 100644 --- a/src/modules/managed/components/streamer/src/streamer.c +++ b/src/modules/managed/components/streamer/src/streamer.c @@ -53,12 +53,12 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ #include "samstr_memdefs/samstr_memdefs.h" /* decls and such for fifos */ -#include "rtapi_errno.h" -#include "rtapi_string.h" +#include "runtime/rtapi_errno.h" +#include "runtime/rtapi_string.h" /* module information */ MODULE_AUTHOR("John Kasunich"); diff --git a/src/modules/managed/components/thc/src/thc.comp b/src/modules/managed/components/thc/src/thc.comp index b79f59e73c..454141b3a3 100644 --- a/src/modules/managed/components/thc/src/thc.comp +++ b/src/modules/managed/components/thc/src/thc.comp @@ -86,7 +86,7 @@ function _; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { // convert encoder velocity to volts diff --git a/src/modules/managed/components/thcud/src/thcud.comp b/src/modules/managed/components/thcud/src/thcud.comp index bb6a45827c..14dde5ed94 100644 --- a/src/modules/managed/components/thcud/src/thcud.comp +++ b/src/modules/managed/components/thcud/src/thcud.comp @@ -91,7 +91,7 @@ function _; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { if(enable){ diff --git a/src/modules/managed/components/threads/src/threads.c b/src/modules/managed/components/threads/src/threads.c index 95fc82b438..487c8e52ca 100644 --- a/src/modules/managed/components/threads/src/threads.c +++ b/src/modules/managed/components/threads/src/threads.c @@ -48,10 +48,10 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ -#include "rtapi_string.h" +#include "runtime/rtapi_string.h" /* module information */ MODULE_AUTHOR("John Kasunich"); diff --git a/src/modules/managed/components/time/src/time.icomp b/src/modules/managed/components/time/src/time.icomp index 7417d7a5b7..de79ba8a8b 100644 --- a/src/modules/managed/components/time/src/time.icomp +++ b/src/modules/managed/components/time/src/time.icomp @@ -85,7 +85,7 @@ function _; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/components/timev2/src/timev2.icomp b/src/modules/managed/components/timev2/src/timev2.icomp index ab92862478..98189922e0 100644 --- a/src/modules/managed/components/timev2/src/timev2.icomp +++ b/src/modules/managed/components/timev2/src/timev2.icomp @@ -84,7 +84,7 @@ function _; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/components/uf_demo/src/ufdemo.c b/src/modules/managed/components/uf_demo/src/ufdemo.c index d69e771764..667e6fa237 100644 --- a/src/modules/managed/components/uf_demo/src/ufdemo.c +++ b/src/modules/managed/components/uf_demo/src/ufdemo.c @@ -1,6 +1,6 @@ -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/components/watch/src/watch.c b/src/modules/managed/components/watch/src/watch.c index ddd5f1ccd3..c7fc0266ea 100644 --- a/src/modules/managed/components/watch/src/watch.c +++ b/src/modules/managed/components/watch/src/watch.c @@ -78,10 +78,10 @@ */ -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_errno.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_errno.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/hal_accessor.h" diff --git a/src/modules/managed/components/xhc_hb04_util/src/xhc_hb04_util.icomp b/src/modules/managed/components/xhc_hb04_util/src/xhc_hb04_util.icomp index 2faa34c6a7..b835edc3e8 100644 --- a/src/modules/managed/components/xhc_hb04_util/src/xhc_hb04_util.icomp +++ b/src/modules/managed/components/xhc_hb04_util/src/xhc_hb04_util.icomp @@ -43,7 +43,7 @@ variable hal_bit_t old_start_or_pause = false; function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/components/xhc_hb04_utilv2/src/xhc_hb04_utilv2.icomp b/src/modules/managed/components/xhc_hb04_utilv2/src/xhc_hb04_utilv2.icomp index 6311ef246d..47669934e0 100644 --- a/src/modules/managed/components/xhc_hb04_utilv2/src/xhc_hb04_utilv2.icomp +++ b/src/modules/managed/components/xhc_hb04_utilv2/src/xhc_hb04_utilv2.icomp @@ -43,7 +43,7 @@ variable hal_bit_t old_start_or_pause = false; function _; license "GPL"; ;; -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" FUNCTION(_) { diff --git a/src/modules/managed/drivers/chip/src/hal_chip_gpio.c b/src/modules/managed/drivers/chip/src/hal_chip_gpio.c index a26e571db6..40933abe45 100644 --- a/src/modules/managed/drivers/chip/src/hal_chip_gpio.c +++ b/src/modules/managed/drivers/chip/src/hal_chip_gpio.c @@ -9,8 +9,8 @@ ********************************************************************/ -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hal_arm335xQEP/src/hal_arm335xQEP.c b/src/modules/managed/drivers/hal_arm335xQEP/src/hal_arm335xQEP.c index 18c3828d52..99e066309a 100644 --- a/src/modules/managed/drivers/hal_arm335xQEP/src/hal_arm335xQEP.c +++ b/src/modules/managed/drivers/hal_arm335xQEP/src/hal_arm335xQEP.c @@ -45,9 +45,9 @@ /* Use config_module.h instead of config.h so we can use RTAPI_INC_LIST_H */ #include "hal/config_module.h" -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" #include "hal/hal.h" #include diff --git a/src/modules/managed/drivers/hal_ax5214h/src/hal_ax5214h.c b/src/modules/managed/drivers/hal_ax5214h/src/hal_ax5214h.c index 3dc3308faf..a38fcde359 100644 --- a/src/modules/managed/drivers/hal_ax5214h/src/hal_ax5214h.c +++ b/src/modules/managed/drivers/hal_ax5214h/src/hal_ax5214h.c @@ -87,13 +87,13 @@ information, go to https://github.com/machinekit. */ -#include "config.h" +#include "runtime/config.h" #include /* isspace() */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ -#include "rtapi_io.h" +#include "runtime/rtapi_io.h" /* module information */ MODULE_AUTHOR("John Kasunich"); diff --git a/src/modules/managed/drivers/hal_bb_gpio/src/hal_bb_gpio.c b/src/modules/managed/drivers/hal_bb_gpio/src/hal_bb_gpio.c index 7b32e7f747..c8926c5980 100644 --- a/src/modules/managed/drivers/hal_bb_gpio/src/hal_bb_gpio.c +++ b/src/modules/managed/drivers/hal_bb_gpio/src/hal_bb_gpio.c @@ -9,8 +9,8 @@ ********************************************************************/ -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hal_evoreg/src/hal_evoreg.c b/src/modules/managed/drivers/hal_evoreg/src/hal_evoreg.c index 83f1f5fad0..09d425ad68 100644 --- a/src/modules/managed/drivers/hal_evoreg/src/hal_evoreg.c +++ b/src/modules/managed/drivers/hal_evoreg/src/hal_evoreg.c @@ -64,10 +64,10 @@ */ #include /* isspace() */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ -#include "rtapi_io.h" +#include "runtime/rtapi_io.h" /* module information */ MODULE_AUTHOR("Martin Kuhnle"); diff --git a/src/modules/managed/drivers/hal_gm/src/hal_gm.c b/src/modules/managed/drivers/hal_gm/src/hal_gm.c index 4760d73331..971e06c22b 100644 --- a/src/modules/managed/drivers/hal_gm/src/hal_gm.c +++ b/src/modules/managed/drivers/hal_gm/src/hal_gm.c @@ -1,10 +1,10 @@ #include -#include "rtapi.h" // RTAPI realtime OS API -#include "rtapi_app.h" // RTAPI realtime module decls +#include "runtime/rtapi.h" // RTAPI realtime OS API +#include "runtime/rtapi_app.h" // RTAPI realtime module decls #include "hal/hal.h" // HAL public API decls #include "gm.h" // Hardware dependent defines -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" // Module information. MODULE_AUTHOR("Bence Kovacs"); diff --git a/src/modules/managed/drivers/hal_h3_gpio/src/hal_h3_gpio.c b/src/modules/managed/drivers/hal_h3_gpio/src/hal_h3_gpio.c index be7e361a3b..89b2e14743 100644 --- a/src/modules/managed/drivers/hal_h3_gpio/src/hal_h3_gpio.c +++ b/src/modules/managed/drivers/hal_h3_gpio/src/hal_h3_gpio.c @@ -6,8 +6,8 @@ * ********************************************************************/ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ /* this also includes config.h */ #include "hal/hal.h" /* HAL public API decls */ #include diff --git a/src/modules/managed/drivers/hal_motenc/src/hal_motenc.c b/src/modules/managed/drivers/hal_motenc/src/hal_motenc.c index 5746661c53..2e17188166 100644 --- a/src/modules/managed/drivers/hal_motenc/src/hal_motenc.c +++ b/src/modules/managed/drivers/hal_motenc/src/hal_motenc.c @@ -124,9 +124,9 @@ #include -#include "rtapi.h" // RTAPI realtime OS API. -#include "rtapi_app.h" // RTAPI realtime module decls. -#include "rtapi_pci.h" +#include "runtime/rtapi.h" // RTAPI realtime OS API. +#include "runtime/rtapi_app.h" // RTAPI realtime module decls. +#include "runtime/rtapi_pci.h" #include "hal/hal.h" // HAL public API decls. #include "motenc.h" // Hardware dependent defines. diff --git a/src/modules/managed/drivers/hal_p260c/src/hal_p260c.c b/src/modules/managed/drivers/hal_p260c/src/hal_p260c.c index 7ad51203d6..6d4e74a4b7 100644 --- a/src/modules/managed/drivers/hal_p260c/src/hal_p260c.c +++ b/src/modules/managed/drivers/hal_p260c/src/hal_p260c.c @@ -9,8 +9,8 @@ //#define NO_SERIAL 1 #define OPEN_ON_ERROR 1 -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ diff --git a/src/modules/managed/drivers/hal_parport/src/hal_parport.c b/src/modules/managed/drivers/hal_parport/src/hal_parport.c index da637f8b32..15693df4e3 100644 --- a/src/modules/managed/drivers/hal_parport/src/hal_parport.c +++ b/src/modules/managed/drivers/hal_parport/src/hal_parport.c @@ -95,17 +95,17 @@ information, go to https://github.com/machinekit. */ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include /* isspace() */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "rtapi_io.h" +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_io.h" #include "hal/hal.h" /* HAL public API decls */ # include -#include "hal_parport.h" +#include "hal_parport/hal_parport.h" /* module information */ MODULE_AUTHOR("John Kasunich"); diff --git a/src/modules/managed/drivers/hal_ppmc/src/hal_ppmc.c b/src/modules/managed/drivers/hal_ppmc/src/hal_ppmc.c index 5b172db0f1..182a288d8e 100644 --- a/src/modules/managed/drivers/hal_ppmc/src/hal_ppmc.c +++ b/src/modules/managed/drivers/hal_ppmc/src/hal_ppmc.c @@ -67,10 +67,10 @@ */ //#include /* kmalloc() */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ -#include "hal_parport.h" +#include "hal_parport/hal_parport.h" #define MAX_BUS 3 /* max number of parports (EPP busses) */ diff --git a/src/modules/managed/drivers/hal_pru_generic/include/hal_pru_generic.h b/src/modules/managed/drivers/hal_pru_generic/include/hal_pru_generic.h index 01b1571ae3..253affe7d9 100644 --- a/src/modules/managed/drivers/hal_pru_generic/include/hal_pru_generic.h +++ b/src/modules/managed/drivers/hal_pru_generic/include/hal_pru_generic.h @@ -61,7 +61,7 @@ #include "hal/config_module.h" #include RTAPI_INC_LIST_H -#include "rtapi.h" +#include "runtime/rtapi.h" #include "hal/hal.h" #include "hal/drivers/hal_pru_generic/pru_tasks.h" diff --git a/src/modules/managed/drivers/hal_pru_generic/src/encoder.c b/src/modules/managed/drivers/hal_pru_generic/src/encoder.c index ceda8ba141..ad5120280f 100644 --- a/src/modules/managed/drivers/hal_pru_generic/src/encoder.c +++ b/src/modules/managed/drivers/hal_pru_generic/src/encoder.c @@ -47,13 +47,13 @@ // Use config_module.h instead of config.h so we can use RTAPI_INC_LIST_H #include "hal/config_module.h" -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" -#include "config.h" // TARGET_PLATFORM_BEAGLEBONE +#include "runtime/config.h" // TARGET_PLATFORM_BEAGLEBONE #include "hal/drivers/hal_pru_generic/hal_pru_generic.h" diff --git a/src/modules/managed/drivers/hal_pru_generic/src/hal_pru_generic.c b/src/modules/managed/drivers/hal_pru_generic/src/hal_pru_generic.c index 0528c41b51..3b0dc2dd63 100644 --- a/src/modules/managed/drivers/hal_pru_generic/src/hal_pru_generic.c +++ b/src/modules/managed/drivers/hal_pru_generic/src/hal_pru_generic.c @@ -62,12 +62,12 @@ #include "hal/config_module.h" #include RTAPI_INC_LIST_H -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "rtapi_compat.h" /* RTAPI support functions */ -#include "rtapi_math.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_compat.h" /* RTAPI support functions */ +#include "runtime/rtapi_math.h" #include "hal/hal.h" /* HAL public API decls */ -#include "config.h" // TARGET_PLATFORM_BEAGLEBONE +#include "runtime/config.h" // TARGET_PLATFORM_BEAGLEBONE #include "hal/hal_priv.h" #include diff --git a/src/modules/managed/drivers/hal_pru_generic/src/pwmgen.c b/src/modules/managed/drivers/hal_pru_generic/src/pwmgen.c index a1775c33d2..73b49acd8f 100644 --- a/src/modules/managed/drivers/hal_pru_generic/src/pwmgen.c +++ b/src/modules/managed/drivers/hal_pru_generic/src/pwmgen.c @@ -53,13 +53,13 @@ // Use config_module.h instead of config.h so we can use RTAPI_INC_LIST_H #include "hal/config_module.h" -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" -#include "config.h" // TARGET_PLATFORM_BEAGLEBONE +#include "runtime/config.h" // TARGET_PLATFORM_BEAGLEBONE #include "hal/drivers/hal_pru_generic/hal_pru_generic.h" diff --git a/src/modules/managed/drivers/hal_pru_generic/src/pwmread.c b/src/modules/managed/drivers/hal_pru_generic/src/pwmread.c index 8c017513d0..4165b86c15 100644 --- a/src/modules/managed/drivers/hal_pru_generic/src/pwmread.c +++ b/src/modules/managed/drivers/hal_pru_generic/src/pwmread.c @@ -43,16 +43,16 @@ // Use config_module.h instead of config.h so we can use RTAPI_INC_LIST_H #include "hal/config_module.h" -#include "config.h" // TARGET_PLATFORM_BEAGLEBONE +#include "runtime/config.h" // TARGET_PLATFORM_BEAGLEBONE #if !defined(TARGET_PLATFORM_BEAGLEBONE) #error "This driver is for the beaglebone platform only" #endif -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hal_pru_generic/src/stepgen.c b/src/modules/managed/drivers/hal_pru_generic/src/stepgen.c index 8dfdadc1d0..2e12db40ab 100644 --- a/src/modules/managed/drivers/hal_pru_generic/src/stepgen.c +++ b/src/modules/managed/drivers/hal_pru_generic/src/stepgen.c @@ -54,9 +54,9 @@ #include "hal/config_module.h" // #include RTAPI_INC_LIST_H -// #include "rtapi.h" /* RTAPI realtime OS API */ -// #include "rtapi_app.h" /* RTAPI realtime module decls */ -// #include "rtapi_math.h" +// #include "runtime/rtapi.h" /* RTAPI realtime OS API */ +// #include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +// #include "runtime/rtapi_math.h" // #include "hal/hal.h" /* HAL public API decls */ // #include // @@ -65,13 +65,13 @@ // #include // #include -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" -#include "config.h" // TARGET_PLATFORM_BEAGLEBONE +#include "runtime/config.h" // TARGET_PLATFORM_BEAGLEBONE #include "hal/drivers/hal_pru_generic/hal_pru_generic.h" diff --git a/src/modules/managed/drivers/hal_raspi_gpio/hal_raspi_spi/src/hal_spi.c b/src/modules/managed/drivers/hal_raspi_gpio/hal_raspi_spi/src/hal_spi.c index e6c92e2534..93ba4ea46c 100644 --- a/src/modules/managed/drivers/hal_raspi_gpio/hal_raspi_spi/src/hal_spi.c +++ b/src/modules/managed/drivers/hal_raspi_gpio/hal_raspi_spi/src/hal_spi.c @@ -18,18 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include #include #include #include "hal_spi.h" -#include "cpuinfo.h" +#include "raspi_cpuinfo/cpuinfo.h" #define MODNAME "hal_spi" #define PREFIX "spi" diff --git a/src/modules/managed/drivers/hal_raspi_gpio/src/hal_gpio.c b/src/modules/managed/drivers/hal_raspi_gpio/src/hal_gpio.c index 53f261a30d..6d6e90bb0f 100644 --- a/src/modules/managed/drivers/hal_raspi_gpio/src/hal_gpio.c +++ b/src/modules/managed/drivers/hal_raspi_gpio/src/hal_gpio.c @@ -17,13 +17,13 @@ s********************************************************************/ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_bitops.h" -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_bitops.h" +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ /* this also includes config.h */ #include "hal/hal.h" /* HAL public API decls */ #include "bcm2835.h" -#include "cpuinfo.h" +#include "raspi_cpuinfo/cpuinfo.h" #define BCM2708_PERI_BASE 0x20000000 #define BCM2708_GPIO_BASE (BCM2708_PERI_BASE + 0x200000) diff --git a/src/modules/managed/drivers/hal_skeleton/src/hal_skeleton.c b/src/modules/managed/drivers/hal_skeleton/src/hal_skeleton.c index b91e8610da..76942248be 100644 --- a/src/modules/managed/drivers/hal_skeleton/src/hal_skeleton.c +++ b/src/modules/managed/drivers/hal_skeleton/src/hal_skeleton.c @@ -75,9 +75,9 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "rtapi_io.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_io.h" #include "hal/hal.h" /* HAL public API decls */ diff --git a/src/modules/managed/drivers/hal_speaker/src/hal_speaker.c b/src/modules/managed/drivers/hal_speaker/src/hal_speaker.c index 176b65c1ba..a1f2808ace 100644 --- a/src/modules/managed/drivers/hal_speaker/src/hal_speaker.c +++ b/src/modules/managed/drivers/hal_speaker/src/hal_speaker.c @@ -60,9 +60,9 @@ information, go to https://github.com/machinekit. */ -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "rtapi_io.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_io.h" #include "hal/hal.h" /* HAL public API decls */ /* module information */ diff --git a/src/modules/managed/drivers/hal_tiro/src/hal_tiro.c b/src/modules/managed/drivers/hal_tiro/src/hal_tiro.c index f4a8965f9a..901da43733 100644 --- a/src/modules/managed/drivers/hal_tiro/src/hal_tiro.c +++ b/src/modules/managed/drivers/hal_tiro/src/hal_tiro.c @@ -57,10 +57,10 @@ information, go to https://github.com/machinekit. */ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "rtapi_io.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_io.h" #include "hal/hal.h" /* HAL public API decls */ /* module information */ diff --git a/src/modules/managed/drivers/hal_vti/src/hal_vti.c b/src/modules/managed/drivers/hal_vti/src/hal_vti.c index be6c6996a7..b4f41a3c94 100644 --- a/src/modules/managed/drivers/hal_vti/src/hal_vti.c +++ b/src/modules/managed/drivers/hal_vti/src/hal_vti.c @@ -152,9 +152,9 @@ information, go to https://github.com/machinekit. */ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include #include "hal/hal.h" /* HAL public API decls */ #include "hal_vti.h" /* VTI related defines */ @@ -208,7 +208,7 @@ typedef struct { } vti_struct; static vti_struct *vti_driver; -#include "rtapi_pci.h" +#include "runtime/rtapi_pci.h" static struct rtapi_pcidev *dev = NULL; volatile struct encoder *encoder = NULL; volatile struct timer *timer = NULL; diff --git a/src/modules/managed/drivers/hal_vti/src/hal_vti.h b/src/modules/managed/drivers/hal_vti/src/hal_vti.h index 64a8ee8d28..e4441ceb5e 100644 --- a/src/modules/managed/drivers/hal_vti/src/hal_vti.h +++ b/src/modules/managed/drivers/hal_vti/src/hal_vti.h @@ -47,7 +47,7 @@ information, go to https://github.com/machinekit. **/ -#include "rtapi.h" +#include "runtime/rtapi.h" /* Vigilant Technologies' board decls diff --git a/src/modules/managed/drivers/hal_zed_can/src/hal_zed_can.c b/src/modules/managed/drivers/hal_zed_can/src/hal_zed_can.c index bb844aae89..780f792a76 100644 --- a/src/modules/managed/drivers/hal_zed_can/src/hal_zed_can.c +++ b/src/modules/managed/drivers/hal_zed_can/src/hal_zed_can.c @@ -76,9 +76,9 @@ \version 00 */ -#include "rtapi.h" // rtapi_print_msg() -#include "rtapi_bitops.h" // RTAPI_BIT(n) -#include "rtapi_app.h" // +#include "runtime/rtapi.h" // rtapi_print_msg() +#include "runtime/rtapi_bitops.h" // RTAPI_BIT(n) +#include "runtime/rtapi_app.h" // #include "hal/hal.h" #include diff --git a/src/modules/managed/drivers/hal_zed_gpio/src/hal_zed_gpio.c b/src/modules/managed/drivers/hal_zed_gpio/src/hal_zed_gpio.c index 04854d7d57..bb25e5dacf 100644 --- a/src/modules/managed/drivers/hal_zed_gpio/src/hal_zed_gpio.c +++ b/src/modules/managed/drivers/hal_zed_gpio/src/hal_zed_gpio.c @@ -172,9 +172,9 @@ INT_TYPE is set to level sensitive. #include #include #include -#include "rtapi.h" -#include "rtapi_bitops.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_bitops.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" MODULE_AUTHOR("Claudio Lorini"); diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_7i43/src/hm2_7i43.c b/src/modules/managed/drivers/hostmot2/hostmot2_7i43/src/hm2_7i43.c index 6d659f7fcd..1b878d8b34 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_7i43/src/hm2_7i43.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_7i43/src/hm2_7i43.c @@ -19,10 +19,10 @@ #include "hal/config_module.h" -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_math.h" -#include "rtapi_string.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_math.h" +#include "runtime/rtapi_string.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_7i43/src/hm2_7i43.h b/src/modules/managed/drivers/hostmot2/hostmot2_7i43/src/hm2_7i43.h index 6e5a07a33c..587ed789be 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_7i43/src/hm2_7i43.h +++ b/src/modules/managed/drivers/hostmot2/hostmot2_7i43/src/hm2_7i43.h @@ -21,7 +21,7 @@ #define HM2_LLIO_NAME "hm2_7i43" -#include "hal_parport.h" +#include "hal_parport/hal_parport.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_7i90/src/hm2_7i90.c b/src/modules/managed/drivers/hostmot2/hostmot2_7i90/src/hm2_7i90.c index e5781ae080..ee12917ef2 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_7i90/src/hm2_7i90.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_7i90/src/hm2_7i90.c @@ -18,12 +18,12 @@ // -#include +#include -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_math.h" -#include "rtapi_string.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_math.h" +#include "runtime/rtapi_string.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_7i90/src/hm2_7i90.h b/src/modules/managed/drivers/hostmot2/hostmot2_7i90/src/hm2_7i90.h index d590e61bab..e125aa2d50 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_7i90/src/hm2_7i90.h +++ b/src/modules/managed/drivers/hostmot2/hostmot2_7i90/src/hm2_7i90.h @@ -21,7 +21,7 @@ #define HM2_LLIO_NAME "hm2_7i90" -#include "hal_parport.h" +#include "hal_parport/hal_parport.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_bitfile/src/bitfile.c b/src/modules/managed/drivers/hostmot2/hostmot2_bitfile/src/bitfile.c index dc1659a117..24c21df001 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_bitfile/src/bitfile.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_bitfile/src/bitfile.c @@ -26,9 +26,9 @@ #include "hal/config_module.h" #include RTAPI_INC_FIRMWARE_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/include/hostmot2-lowlevel.h b/src/modules/managed/drivers/hostmot2/hostmot2_core/include/hostmot2-lowlevel.h index e85266aa42..207ba24d9d 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/include/hostmot2-lowlevel.h +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/include/hostmot2-lowlevel.h @@ -23,7 +23,7 @@ #include RTAPI_INC_DEVICE_H #include RTAPI_INC_FIRMWARE_H -#include "rtapi.h" +#include "runtime/rtapi.h" #include "hal/hal.h" #include "bitfile.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/include/hostmot2.h b/src/modules/managed/drivers/hostmot2/hostmot2_core/include/hostmot2.h index 9025dbb0f8..1e0364fd8f 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/include/hostmot2.h +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/include/hostmot2.h @@ -29,7 +29,7 @@ #include "hal/config_module.h" #include RTAPI_INC_LIST_H -#include "rtapi.h" +#include "runtime/rtapi.h" #include "hal/hal.h" #include "sserial.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/abs_encoder.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/abs_encoder.c index 5c0853547a..e8917796d4 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/abs_encoder.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/abs_encoder.c @@ -12,11 +12,11 @@ #include RTAPI_INC_SLAB_H #include "rtapi/rtapi_compat.h" //simple_strtol -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" -#include "rtapi_math64.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" +#include "runtime/rtapi_math64.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/drivers/mesa-hostmot2/hostmot2.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/bspi.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/bspi.c index 68ff3e0682..51c47d93a8 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/bspi.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/bspi.c @@ -19,10 +19,10 @@ #include #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hostmot2.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/capsense.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/capsense.c index 0a70646fe1..2c43a28f45 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/capsense.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/capsense.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/dbspi.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/dbspi.c index 6c7279043e..0572053bb3 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/dbspi.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/dbspi.c @@ -19,10 +19,10 @@ #include #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hostmot2.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/dpll.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/dpll.c index e579659bd7..ba1309ebc5 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/dpll.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/dpll.c @@ -23,9 +23,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/encoder.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/encoder.c index bfb062a533..ce8e169287 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/encoder.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/encoder.c @@ -29,9 +29,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/fwid.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/fwid.c index d105e6b0ae..7879c3dfc3 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/fwid.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/fwid.c @@ -21,9 +21,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_hexdump.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_hexdump.h" #include "hal/drivers/mesa-hostmot2/hostmot2.h" #include diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/hostmot2.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/hostmot2.c index d961931719..8e1bdce603 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/hostmot2.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/hostmot2.c @@ -22,10 +22,10 @@ #include RTAPI_INC_CTYPE_H #include RTAPI_INC_STRING_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/ioport.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/ioport.c index 06dfc2815c..ac1845d53a 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/ioport.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/ioport.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/irq.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/irq.c index 66360ff707..4ab0934104 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/irq.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/irq.c @@ -22,9 +22,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/led.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/led.c index d45104fcde..fd0ae18a64 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/led.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/led.c @@ -23,9 +23,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/nano_soc_adc.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/nano_soc_adc.c index 85f83019a4..12f7290e4f 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/nano_soc_adc.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/nano_soc_adc.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pins.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pins.c index 4f070c0515..7881f4134f 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pins.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pins.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pktuart.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pktuart.c index 07ef71ed3a..dd2a2b7ba2 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pktuart.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pktuart.c @@ -18,10 +18,10 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hostmot2.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pwmgen.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pwmgen.c index 80a21cc376..cf84adbe36 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pwmgen.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/pwmgen.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/raw.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/raw.c index 3df4d15a5f..296c96a47f 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/raw.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/raw.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/resolver.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/resolver.c index 64ed8fc0e5..95f8aacf90 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/resolver.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/resolver.c @@ -26,10 +26,10 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/sserial.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/sserial.c index 74478829dc..a4fde87879 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/sserial.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/sserial.c @@ -21,10 +21,10 @@ #include RTAPI_INC_SLAB_H #include RTAPI_INC_STRING_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" -#include "rtapi_math64.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" +#include "runtime/rtapi_math64.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/stepgen.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/stepgen.c index 948818d7dd..b6c6c0dfb3 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/stepgen.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/stepgen.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/tp_pwmgen.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/tp_pwmgen.c index 72d235d481..f69097be2f 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/tp_pwmgen.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/tp_pwmgen.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/tram.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/tram.c index 8084d4c566..4705a2e1b0 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/tram.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/tram.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/uart.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/uart.c index e8f214fe85..409a50dce3 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/uart.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/uart.c @@ -18,10 +18,10 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hostmot2.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/watchdog.c b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/watchdog.c index 33040d5a71..b0483118ea 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_core/src/watchdog.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_core/src/watchdog.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_eth/src/hm2_eth.c b/src/modules/managed/drivers/hostmot2/hostmot2_eth/src/hm2_eth.c index f4cc709e7c..066137958b 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_eth/src/hm2_eth.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_eth/src/hm2_eth.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" +#include "runtime/config.h" #include "hal/config_module.h" #include RTAPI_INC_SLAB_H #include RTAPI_INC_CTYPE_H @@ -39,9 +39,9 @@ #include #include -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_pci/src/hm2_pci.c b/src/modules/managed/drivers/hostmot2/hostmot2_pci/src/hm2_pci.c index dba8c15e20..7879f8346d 100755 --- a/src/modules/managed/drivers/hostmot2/hostmot2_pci/src/hm2_pci.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_pci/src/hm2_pci.c @@ -18,16 +18,16 @@ // -#include "config.h" +#include "runtime/config.h" #include -#include +#include #include -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_pci.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_pci.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_setsserial/src/setsserial.c b/src/modules/managed/drivers/hostmot2/hostmot2_setsserial/src/setsserial.c index 922452ce9c..7bb334db36 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_setsserial/src/setsserial.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_setsserial/src/setsserial.c @@ -23,8 +23,8 @@ #include RTAPI_INC_CTYPE_H #include RTAPI_INC_STRING_H -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" #include "hostmot2.h" #include "sserial.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_soc_ol/src/hm2_soc_ol.c b/src/modules/managed/drivers/hostmot2/hostmot2_soc_ol/src/hm2_soc_ol.c index 4d33854eeb..3efdee0235 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_soc_ol/src/hm2_soc_ol.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_soc_ol/src/hm2_soc_ol.c @@ -84,18 +84,18 @@ see configs/hm2-soc-stepper/irqtest.hal for a usage example */ //---------------------------------------------------------------------------// -#include "config.h" +#include "runtime/config.h" // this should be an general socfpga #define /* #if !defined(TARGET_PLATFORM_SOCFPGA) */ /* #error "This driver is for the socfpga platform only" */ /* #endif */ -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_hexdump.h" -#include "rtapi_compat.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_hexdump.h" +#include "runtime/rtapi_compat.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/lib/config_module.h" diff --git a/src/modules/managed/drivers/hostmot2/hostmot2_test/src/hm2_test.c b/src/modules/managed/drivers/hostmot2/hostmot2_test/src/hm2_test.c index 8cb506cd28..a6396af1cf 100644 --- a/src/modules/managed/drivers/hostmot2/hostmot2_test/src/hm2_test.c +++ b/src/modules/managed/drivers/hostmot2/hostmot2_test/src/hm2_test.c @@ -25,14 +25,14 @@ // verify that the hostmot2 driver functions as it ought. // -#include "config.h" +#include "runtime/config.h" -#include +#include #include -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/abs_encoder.c b/src/modules/managed/drivers/hostmot2/src/abs_encoder.c index 5c0853547a..e8917796d4 100644 --- a/src/modules/managed/drivers/hostmot2/src/abs_encoder.c +++ b/src/modules/managed/drivers/hostmot2/src/abs_encoder.c @@ -12,11 +12,11 @@ #include RTAPI_INC_SLAB_H #include "rtapi/rtapi_compat.h" //simple_strtol -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" -#include "rtapi_math64.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" +#include "runtime/rtapi_math64.h" #include "hal/hal.h" #include "hal/hal_priv.h" #include "hal/drivers/mesa-hostmot2/hostmot2.h" diff --git a/src/modules/managed/drivers/hostmot2/src/bspi.c b/src/modules/managed/drivers/hostmot2/src/bspi.c index 68ff3e0682..51c47d93a8 100644 --- a/src/modules/managed/drivers/hostmot2/src/bspi.c +++ b/src/modules/managed/drivers/hostmot2/src/bspi.c @@ -19,10 +19,10 @@ #include #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hostmot2.h" diff --git a/src/modules/managed/drivers/hostmot2/src/capsense.c b/src/modules/managed/drivers/hostmot2/src/capsense.c index 0a70646fe1..2c43a28f45 100644 --- a/src/modules/managed/drivers/hostmot2/src/capsense.c +++ b/src/modules/managed/drivers/hostmot2/src/capsense.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/dbspi.c b/src/modules/managed/drivers/hostmot2/src/dbspi.c index 6c7279043e..0572053bb3 100644 --- a/src/modules/managed/drivers/hostmot2/src/dbspi.c +++ b/src/modules/managed/drivers/hostmot2/src/dbspi.c @@ -19,10 +19,10 @@ #include #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hostmot2.h" diff --git a/src/modules/managed/drivers/hostmot2/src/dpll.c b/src/modules/managed/drivers/hostmot2/src/dpll.c index e579659bd7..ba1309ebc5 100644 --- a/src/modules/managed/drivers/hostmot2/src/dpll.c +++ b/src/modules/managed/drivers/hostmot2/src/dpll.c @@ -23,9 +23,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/encoder.c b/src/modules/managed/drivers/hostmot2/src/encoder.c index bfb062a533..ce8e169287 100755 --- a/src/modules/managed/drivers/hostmot2/src/encoder.c +++ b/src/modules/managed/drivers/hostmot2/src/encoder.c @@ -29,9 +29,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/fwid.c b/src/modules/managed/drivers/hostmot2/src/fwid.c index d105e6b0ae..7879c3dfc3 100644 --- a/src/modules/managed/drivers/hostmot2/src/fwid.c +++ b/src/modules/managed/drivers/hostmot2/src/fwid.c @@ -21,9 +21,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_hexdump.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_hexdump.h" #include "hal/drivers/mesa-hostmot2/hostmot2.h" #include diff --git a/src/modules/managed/drivers/hostmot2/src/hostmot2.c b/src/modules/managed/drivers/hostmot2/src/hostmot2.c index d961931719..8e1bdce603 100755 --- a/src/modules/managed/drivers/hostmot2/src/hostmot2.c +++ b/src/modules/managed/drivers/hostmot2/src/hostmot2.c @@ -22,10 +22,10 @@ #include RTAPI_INC_CTYPE_H #include RTAPI_INC_STRING_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/drivers/hostmot2/src/ioport.c b/src/modules/managed/drivers/hostmot2/src/ioport.c index 06dfc2815c..ac1845d53a 100755 --- a/src/modules/managed/drivers/hostmot2/src/ioport.c +++ b/src/modules/managed/drivers/hostmot2/src/ioport.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/irq.c b/src/modules/managed/drivers/hostmot2/src/irq.c index 66360ff707..4ab0934104 100644 --- a/src/modules/managed/drivers/hostmot2/src/irq.c +++ b/src/modules/managed/drivers/hostmot2/src/irq.c @@ -22,9 +22,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/drivers/hostmot2/src/led.c b/src/modules/managed/drivers/hostmot2/src/led.c index d45104fcde..fd0ae18a64 100755 --- a/src/modules/managed/drivers/hostmot2/src/led.c +++ b/src/modules/managed/drivers/hostmot2/src/led.c @@ -23,9 +23,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/nano_soc_adc.c b/src/modules/managed/drivers/hostmot2/src/nano_soc_adc.c index 85f83019a4..12f7290e4f 100644 --- a/src/modules/managed/drivers/hostmot2/src/nano_soc_adc.c +++ b/src/modules/managed/drivers/hostmot2/src/nano_soc_adc.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/pins.c b/src/modules/managed/drivers/hostmot2/src/pins.c index 4f070c0515..7881f4134f 100755 --- a/src/modules/managed/drivers/hostmot2/src/pins.c +++ b/src/modules/managed/drivers/hostmot2/src/pins.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/pktuart.c b/src/modules/managed/drivers/hostmot2/src/pktuart.c index 07ef71ed3a..dd2a2b7ba2 100755 --- a/src/modules/managed/drivers/hostmot2/src/pktuart.c +++ b/src/modules/managed/drivers/hostmot2/src/pktuart.c @@ -18,10 +18,10 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hostmot2.h" diff --git a/src/modules/managed/drivers/hostmot2/src/pwmgen.c b/src/modules/managed/drivers/hostmot2/src/pwmgen.c index 80a21cc376..cf84adbe36 100755 --- a/src/modules/managed/drivers/hostmot2/src/pwmgen.c +++ b/src/modules/managed/drivers/hostmot2/src/pwmgen.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/raw.c b/src/modules/managed/drivers/hostmot2/src/raw.c index 3df4d15a5f..296c96a47f 100755 --- a/src/modules/managed/drivers/hostmot2/src/raw.c +++ b/src/modules/managed/drivers/hostmot2/src/raw.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/resolver.c b/src/modules/managed/drivers/hostmot2/src/resolver.c index 64ed8fc0e5..95f8aacf90 100755 --- a/src/modules/managed/drivers/hostmot2/src/resolver.c +++ b/src/modules/managed/drivers/hostmot2/src/resolver.c @@ -26,10 +26,10 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/sserial.c b/src/modules/managed/drivers/hostmot2/src/sserial.c index 74478829dc..a4fde87879 100644 --- a/src/modules/managed/drivers/hostmot2/src/sserial.c +++ b/src/modules/managed/drivers/hostmot2/src/sserial.c @@ -21,10 +21,10 @@ #include RTAPI_INC_SLAB_H #include RTAPI_INC_STRING_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" -#include "rtapi_math64.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" +#include "runtime/rtapi_math64.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/stepgen.c b/src/modules/managed/drivers/hostmot2/src/stepgen.c index 948818d7dd..b6c6c0dfb3 100755 --- a/src/modules/managed/drivers/hostmot2/src/stepgen.c +++ b/src/modules/managed/drivers/hostmot2/src/stepgen.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/tp_pwmgen.c b/src/modules/managed/drivers/hostmot2/src/tp_pwmgen.c index 72d235d481..f69097be2f 100755 --- a/src/modules/managed/drivers/hostmot2/src/tp_pwmgen.c +++ b/src/modules/managed/drivers/hostmot2/src/tp_pwmgen.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/tram.c b/src/modules/managed/drivers/hostmot2/src/tram.c index 8084d4c566..4705a2e1b0 100755 --- a/src/modules/managed/drivers/hostmot2/src/tram.c +++ b/src/modules/managed/drivers/hostmot2/src/tram.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" diff --git a/src/modules/managed/drivers/hostmot2/src/uart.c b/src/modules/managed/drivers/hostmot2/src/uart.c index e8f214fe85..409a50dce3 100644 --- a/src/modules/managed/drivers/hostmot2/src/uart.c +++ b/src/modules/managed/drivers/hostmot2/src/uart.c @@ -18,10 +18,10 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_app.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hostmot2.h" diff --git a/src/modules/managed/drivers/hostmot2/src/watchdog.c b/src/modules/managed/drivers/hostmot2/src/watchdog.c index 33040d5a71..b0483118ea 100755 --- a/src/modules/managed/drivers/hostmot2/src/watchdog.c +++ b/src/modules/managed/drivers/hostmot2/src/watchdog.c @@ -20,9 +20,9 @@ #include "hal/config_module.h" #include RTAPI_INC_SLAB_H -#include "rtapi.h" -#include "rtapi_string.h" -#include "rtapi_math.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_math.h" #include "hal/hal.h" #include "hal/hal_priv.h" diff --git a/src/modules/managed/drivers/opto_ac5/src/opto_ac5.c b/src/modules/managed/drivers/opto_ac5/src/opto_ac5.c index eee3608429..acda69ffdd 100644 --- a/src/modules/managed/drivers/opto_ac5/src/opto_ac5.c +++ b/src/modules/managed/drivers/opto_ac5/src/opto_ac5.c @@ -1,6 +1,6 @@ #include -#include "rtapi.h" // RTAPI realtime OS API. -#include "rtapi_app.h" // RTAPI realtime module decls. +#include "runtime/rtapi.h" // RTAPI realtime OS API. +#include "runtime/rtapi_app.h" // RTAPI realtime module decls. #include "hal/hal.h" // HAL public API decls. #include "opto_ac5.h" // Hardware dependent defines. diff --git a/src/modules/managed/drivers/pci_8255/src/pci_8255.c b/src/modules/managed/drivers/pci_8255/src/pci_8255.c index 9ed039f154..b3fdef8b58 100644 --- a/src/modules/managed/drivers/pci_8255/src/pci_8255.c +++ b/src/modules/managed/drivers/pci_8255/src/pci_8255.c @@ -13,11 +13,11 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#include "rtapi.h" -#include "rtapi_app.h" +#include "runtime/rtapi.h" +#include "runtime/rtapi_app.h" #include "hal/hal.h" -#include "rtapi_string.h" -#include "rtapi_io.h" /* rtapi_outb() rtapi_inb() */ +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_io.h" /* rtapi_outb() rtapi_inb() */ #define MAX 16 @@ -247,7 +247,7 @@ void rtapi_app_exit(void) { #define ioaddr (inst->ioaddr) #define dir_ (inst->dir_) -#include "rtapi_errno.h" +#include "runtime/rtapi_errno.h" int get_count(void) { int i = 0; diff --git a/src/modules/managed/drivers/plc720/src/pcl720.comp b/src/modules/managed/drivers/plc720/src/pcl720.comp index f640242552..1f011bbe93 100644 --- a/src/modules/managed/drivers/plc720/src/pcl720.comp +++ b/src/modules/managed/drivers/plc720/src/pcl720.comp @@ -45,7 +45,7 @@ license "GPL"; author "Andy Pugh"; ;; -#include +#include #define MAX_CHAN 8 static int ioaddr[MAX_CHAN] = {-1, -1, -1, -1, -1, -1, -1, -1}; diff --git a/src/modules/managed/drivers/serport/src/serport.comp b/src/modules/managed/drivers/serport/src/serport.comp index 8fba16585a..8bb248fb87 100644 --- a/src/modules/managed/drivers/serport/src/serport.comp +++ b/src/modules/managed/drivers/serport/src/serport.comp @@ -46,8 +46,8 @@ function write nofp; license "GPL"; ;; -#include -#include +#include +#include #define MAX 8 int io[MAX] = {0,}; diff --git a/src/modules/managed/drivers/servo_to_go/src/hal_stg.c b/src/modules/managed/drivers/servo_to_go/src/hal_stg.c index f172ccb71a..4b3d7694f6 100644 --- a/src/modules/managed/drivers/servo_to_go/src/hal_stg.c +++ b/src/modules/managed/drivers/servo_to_go/src/hal_stg.c @@ -135,10 +135,10 @@ information, go to https://github.com/machinekit. */ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ -#include "rtapi_io.h" +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_io.h" #include "hal/hal.h" /* HAL public API decls */ #include "hal_stg.h" /* STG related defines */ diff --git a/src/modules/managed/drivers/uparport/src/uparport.c b/src/modules/managed/drivers/uparport/src/uparport.c index 28713d669a..2f34b47121 100644 --- a/src/modules/managed/drivers/uparport/src/uparport.c +++ b/src/modules/managed/drivers/uparport/src/uparport.c @@ -96,9 +96,9 @@ */ // extern int rtapi_app_main(void); -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include /* isspace() */ -#include "rtapi_app.h" /* RTAPI realtime module decls */ +#include "runtime/rtapi_app.h" /* RTAPI realtime module decls */ #include "hal/hal.h" /* HAL public API decls */ diff --git a/src/modules/managed/support-what_to_do/pru/prussdrv.c b/src/modules/managed/support-what_to_do/pru/prussdrv.c index 497daffcb3..9c869eb8db 100644 --- a/src/modules/managed/support-what_to_do/pru/prussdrv.c +++ b/src/modules/managed/support-what_to_do/pru/prussdrv.c @@ -46,8 +46,8 @@ * ============================================================================ */ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include #include diff --git a/src/modules/unmanaged/adxl345/src/adxl345.comp b/src/modules/unmanaged/adxl345/src/adxl345.comp index 079dce32d6..901e5d06ef 100644 --- a/src/modules/unmanaged/adxl345/src/adxl345.comp +++ b/src/modules/unmanaged/adxl345/src/adxl345.comp @@ -33,7 +33,7 @@ pin out float yaw "rotation about Z axis, -180..180 deg"; license "GPL"; ;; -#include +#include #include #include #include diff --git a/src/modules/unmanaged/constv2/include/constv2/LCNC_Headers.h b/src/modules/unmanaged/constv2/include/constv2/LCNC_Headers.h index 94245810c5..4637e0028a 100644 --- a/src/modules/unmanaged/constv2/include/constv2/LCNC_Headers.h +++ b/src/modules/unmanaged/constv2/include/constv2/LCNC_Headers.h @@ -24,17 +24,17 @@ #include // /usr/include/hal -#include +#include #ifdef RTAPI -#include "rtapi_app.h" +#include "runtime/rtapi_app.h" #endif -#include "rtapi_string.h" +#include "runtime/rtapi_string.h" #include #include // need to get this from source and add it #include #include "hal/hal_internal.h" -#include // INIFILE +#include // INIFILE //#include //#include diff --git a/src/modules/unmanaged/gs2_vfd/src/gs2_vfd.c b/src/modules/unmanaged/gs2_vfd/src/gs2_vfd.c index aa1068de61..c77ed1c16c 100644 --- a/src/modules/unmanaged/gs2_vfd/src/gs2_vfd.c +++ b/src/modules/unmanaged/gs2_vfd/src/gs2_vfd.c @@ -34,7 +34,7 @@ #include #include #include -#include "rtapi.h" +#include "runtime/rtapi.h" #include "hal/hal.h" #include diff --git a/src/modules/unmanaged/halscope/src/scope.c b/src/modules/unmanaged/halscope/src/scope.c index 9fa995dc03..25519c5531 100644 --- a/src/modules/unmanaged/halscope/src/scope.c +++ b/src/modules/unmanaged/halscope/src/scope.c @@ -35,7 +35,7 @@ static char *license = \ \n\ "; -#include "config.h" +#include "runtime/config.h" #include #include #define _(x) gettext(x) @@ -49,13 +49,13 @@ static char *license = \ #include #include /* getopt() */ -#include "config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/config.h" +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private API decls */ #include -#include "miscgtk.h" /* generic GTK stuff */ +#include "misc_gtk/miscgtk.h" /* generic GTK stuff */ #include "scope_usr.h" /* scope related declarations */ /*********************************************************************** diff --git a/src/modules/unmanaged/halscope/src/scope_disp.c b/src/modules/unmanaged/halscope/src/scope_disp.c index 2d2711c2e6..08ea8846aa 100644 --- a/src/modules/unmanaged/halscope/src/scope_disp.c +++ b/src/modules/unmanaged/halscope/src/scope_disp.c @@ -31,7 +31,7 @@ information, go to https://github.com/machinekit. */ -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include #include #include @@ -39,12 +39,12 @@ #include #include -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* private HAL decls */ #include -#include "miscgtk.h" /* generic GTK stuff */ +#include "misc_gtk/miscgtk.h" /* generic GTK stuff */ #include "scope_usr.h" /* scope related declarations */ #define BUFLEN 80 /* length for sprintf buffers */ diff --git a/src/modules/unmanaged/halscope/src/scope_files.c b/src/modules/unmanaged/halscope/src/scope_files.c index 5f94b076e2..83e6eab401 100644 --- a/src/modules/unmanaged/halscope/src/scope_files.c +++ b/src/modules/unmanaged/halscope/src/scope_files.c @@ -40,11 +40,11 @@ #include #include -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include -#include "miscgtk.h" /* generic GTK stuff */ +#include "misc_gtk/miscgtk.h" /* generic GTK stuff */ #include "scope_usr.h" /* scope related declarations */ /*********************************************************************** diff --git a/src/modules/unmanaged/halscope/src/scope_horiz.c b/src/modules/unmanaged/halscope/src/scope_horiz.c index 7924c3a910..dc9263c066 100644 --- a/src/modules/unmanaged/halscope/src/scope_horiz.c +++ b/src/modules/unmanaged/halscope/src/scope_horiz.c @@ -32,7 +32,7 @@ information, go to https://github.com/machinekit. */ -#include "config.h" +#include "runtime/config.h" #include #include #define _(x) gettext(x) @@ -44,14 +44,14 @@ #include #include -#include "config.h" +#include "runtime/config.h" -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* private HAL decls */ #include -#include "miscgtk.h" /* generic GTK stuff */ +#include "misc_gtk/miscgtk.h" /* generic GTK stuff */ #include "scope_usr.h" /* scope related declarations */ #define BUFLEN 80 /* length for sprintf buffers */ diff --git a/src/modules/unmanaged/halscope/src/scope_trig.c b/src/modules/unmanaged/halscope/src/scope_trig.c index 86fe9a35b1..07c2f9302b 100644 --- a/src/modules/unmanaged/halscope/src/scope_trig.c +++ b/src/modules/unmanaged/halscope/src/scope_trig.c @@ -31,7 +31,7 @@ information, go to https://github.com/machinekit. */ -#include "config.h" +#include "runtime/config.h" #include #include #define _(x) gettext(x) @@ -43,12 +43,12 @@ #include #include -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* private HAL decls */ #include -#include "miscgtk.h" /* generic GTK stuff */ +#include "misc_gtk/miscgtk.h" /* generic GTK stuff */ #include "scope_usr.h" /* scope related declarations */ #define BUFLEN 80 /* length for sprintf buffers */ diff --git a/src/modules/unmanaged/halscope/src/scope_vert.c b/src/modules/unmanaged/halscope/src/scope_vert.c index ca8e5226da..a9a180b796 100644 --- a/src/modules/unmanaged/halscope/src/scope_vert.c +++ b/src/modules/unmanaged/halscope/src/scope_vert.c @@ -32,7 +32,7 @@ information, go to https://github.com/machinekit. */ -#include "config.h" +#include "runtime/config.h" #include #include #define _(x) gettext(x) @@ -44,14 +44,14 @@ #include #include -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* private HAL decls */ #include #include -#include "miscgtk.h" /* generic GTK stuff */ +#include "misc_gtk/miscgtk.h" /* generic GTK stuff */ #include "scope_usr.h" /* scope related declarations */ #define BUFLEN 80 /* length for sprintf buffers */ diff --git a/src/modules/unmanaged/haltalk/src/haltalk.hh b/src/modules/unmanaged/haltalk/src/haltalk.hh index 9dc47c3f86..5c663d7111 100644 --- a/src/modules/unmanaged/haltalk/src/haltalk.hh +++ b/src/modules/unmanaged/haltalk/src/haltalk.hh @@ -37,16 +37,16 @@ #error This is intended as a userspace component only. #endif -#include +#include #include #include #include #include -#include -#include +#include +#include -#include "mk-service.hh" -#include "mk-zeroconf.hh" +#include "machinetalk/mk-service.hh" +#include "machinetalk/mk-zeroconf.hh" #include namespace gpb = google::protobuf; diff --git a/src/modules/unmanaged/haltalk/src/haltalk_bridge.cc b/src/modules/unmanaged/haltalk/src/haltalk_bridge.cc index ea1ca9329a..f886cf07bb 100644 --- a/src/modules/unmanaged/haltalk/src/haltalk_bridge.cc +++ b/src/modules/unmanaged/haltalk/src/haltalk_bridge.cc @@ -24,8 +24,8 @@ #include #include // #include "hal/halpb.hh" -// #include "pbutil.hh" -// #include "rtapi_hexdump.h" +// #include "machinetalk/pbutil.hh" +// #include "runtime/rtapi_hexdump.h" // #include diff --git a/src/modules/unmanaged/haltalk/src/haltalk_command.cc b/src/modules/unmanaged/haltalk/src/haltalk_command.cc index 9cecfdf031..44bb1e849f 100644 --- a/src/modules/unmanaged/haltalk/src/haltalk_command.cc +++ b/src/modules/unmanaged/haltalk/src/haltalk_command.cc @@ -19,8 +19,8 @@ #include "haltalk.hh" #include "hal/halpb.hh" #include "hal/hal_object.h" -#include "pbutil.hh" -#include "rtapi_hexdump.h" +#include "machinetalk/pbutil.hh" +#include "runtime/rtapi_hexdump.h" #include #include diff --git a/src/modules/unmanaged/haltalk/src/haltalk_group.cc b/src/modules/unmanaged/haltalk/src/haltalk_group.cc index 9955a3ab29..29f30f6953 100644 --- a/src/modules/unmanaged/haltalk/src/haltalk_group.cc +++ b/src/modules/unmanaged/haltalk/src/haltalk_group.cc @@ -18,7 +18,7 @@ #include "haltalk.hh" #include "hal/halpb.hh" -#include "pbutil.hh" +#include "machinetalk/pbutil.hh" static int group_report_cb(int phase, hal_compiled_group_t *cgroup, hal_sig_t *sig, void *cb_data); diff --git a/src/modules/unmanaged/haltalk/src/haltalk_introspect.cc b/src/modules/unmanaged/haltalk/src/haltalk_introspect.cc index 787344de24..02329cc783 100644 --- a/src/modules/unmanaged/haltalk/src/haltalk_introspect.cc +++ b/src/modules/unmanaged/haltalk/src/haltalk_introspect.cc @@ -19,8 +19,8 @@ #include "haltalk.hh" #include "hal/hal_logging.h" #include "hal/halpb.hh" -#include "pbutil.hh" -#include "rtapi_hexdump.h" +#include "machinetalk/pbutil.hh" +#include "runtime/rtapi_hexdump.h" #include diff --git a/src/modules/unmanaged/haltalk/src/haltalk_main.cc b/src/modules/unmanaged/haltalk/src/haltalk_main.cc index 525e7a7090..2a0357b160 100644 --- a/src/modules/unmanaged/haltalk/src/haltalk_main.cc +++ b/src/modules/unmanaged/haltalk/src/haltalk_main.cc @@ -30,11 +30,11 @@ // // 6. [notyet] optional may bridge to a remote HAL instance through a remote component. -#include "config.h" +#include "runtime/config.h" #include "haltalk.hh" -#include -#include -#include +#include +#include +#include int print_container; // see pbutil.cc diff --git a/src/modules/unmanaged/haltalk/src/haltalk_rcomp.cc b/src/modules/unmanaged/haltalk/src/haltalk_rcomp.cc index 0b92e31adf..be01cc2691 100644 --- a/src/modules/unmanaged/haltalk/src/haltalk_rcomp.cc +++ b/src/modules/unmanaged/haltalk/src/haltalk_rcomp.cc @@ -18,7 +18,7 @@ #include "haltalk.hh" #include "hal/halpb.hh" -#include "pbutil.hh" +#include "machinetalk/pbutil.hh" static int comp_report_cb(const int phase, diff --git a/src/modules/unmanaged/huanyang_vfd/src/hy_comm.c b/src/modules/unmanaged/huanyang_vfd/src/hy_comm.c index cd16d0d59a..2ca0a36f75 100644 --- a/src/modules/unmanaged/huanyang_vfd/src/hy_comm.c +++ b/src/modules/unmanaged/huanyang_vfd/src/hy_comm.c @@ -34,7 +34,7 @@ #include #include #include -#include "rtapi.h" +#include "runtime/rtapi.h" #include "hy_comm.h" diff --git a/src/modules/unmanaged/huanyang_vfd/src/hy_vfd.c b/src/modules/unmanaged/huanyang_vfd/src/hy_vfd.c index e93510a9d6..4a3ee40f2c 100644 --- a/src/modules/unmanaged/huanyang_vfd/src/hy_vfd.c +++ b/src/modules/unmanaged/huanyang_vfd/src/hy_vfd.c @@ -33,7 +33,7 @@ #include #include #include -#include "rtapi.h" +#include "runtime/rtapi.h" #include "hal/hal.h" #include "hy_comm.h" diff --git a/src/modules/unmanaged/mb2hal/include/mb2hal/mb2hal.h b/src/modules/unmanaged/mb2hal/include/mb2hal/mb2hal.h index 9a78125e71..cdf992f210 100644 --- a/src/modules/unmanaged/mb2hal/include/mb2hal/mb2hal.h +++ b/src/modules/unmanaged/mb2hal/include/mb2hal/mb2hal.h @@ -5,14 +5,14 @@ #include #include -#include "rtapi.h" +#include "runtime/rtapi.h" #ifdef RTAPI -#include "rtapi_app.h" +#include "runtime/rtapi_app.h" #endif -#include "rtapi_string.h" -#include "rtapi_errno.h" +#include "runtime/rtapi_string.h" +#include "runtime/rtapi_errno.h" #include "hal/hal.h" -#include "mk-inifile.h" +#include "mkini/mk-inifile.h" #include diff --git a/src/modules/unmanaged/meter/src/meter.c b/src/modules/unmanaged/meter/src/meter.c index 09d745f35e..42b2061eac 100644 --- a/src/modules/unmanaged/meter/src/meter.c +++ b/src/modules/unmanaged/meter/src/meter.c @@ -46,7 +46,7 @@ information, go to https://github.com/machinekit. */ -#include "config.h" +#include "runtime/config.h" #include #include #define _(x) gettext(x) @@ -59,12 +59,12 @@ #include #include -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* private HAL decls */ #include -#include "miscgtk.h" /* generic GTK stuff */ +#include "misc_gtk/miscgtk.h" /* generic GTK stuff */ /*********************************************************************** * TYPEDEFS * diff --git a/src/modules/unmanaged/ringbench/src/ringbench.c b/src/modules/unmanaged/ringbench/src/ringbench.c index 4f017d5063..45ff48fc7a 100644 --- a/src/modules/unmanaged/ringbench/src/ringbench.c +++ b/src/modules/unmanaged/ringbench/src/ringbench.c @@ -10,7 +10,7 @@ #include #include -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "hal/hal_priv.h" /* HAL private API decls */ #include "hal/hal_ring.h" /* ringbuffer declarations */ diff --git a/src/modules/unmanaged/sampler_latency_usr/src/sampler_latency_usr.c b/src/modules/unmanaged/sampler_latency_usr/src/sampler_latency_usr.c index fc295b2b97..69ae30e168 100644 --- a/src/modules/unmanaged/sampler_latency_usr/src/sampler_latency_usr.c +++ b/src/modules/unmanaged/sampler_latency_usr/src/sampler_latency_usr.c @@ -18,7 +18,7 @@ #include #include -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "samstr_memdefs/samstr_memdefs.h" diff --git a/src/modules/unmanaged/sampler_usr/src/sampler_usr.c b/src/modules/unmanaged/sampler_usr/src/sampler_usr.c index 5cfee577b6..69c41a4e38 100644 --- a/src/modules/unmanaged/sampler_usr/src/sampler_usr.c +++ b/src/modules/unmanaged/sampler_usr/src/sampler_usr.c @@ -70,7 +70,7 @@ #include #include -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "samstr_memdefs/samstr_memdefs.h" diff --git a/src/modules/unmanaged/streamer_usr/src/streamer_usr.c b/src/modules/unmanaged/streamer_usr/src/streamer_usr.c index a2ccd2426e..2b80e2936f 100644 --- a/src/modules/unmanaged/streamer_usr/src/streamer_usr.c +++ b/src/modules/unmanaged/streamer_usr/src/streamer_usr.c @@ -66,7 +66,7 @@ #include -#include "rtapi.h" /* RTAPI realtime OS API */ +#include "runtime/rtapi.h" /* RTAPI realtime OS API */ #include "hal/hal.h" /* HAL public API decls */ #include "samstr_memdefs/samstr_memdefs.h" diff --git a/src/modules/unmanaged/vfdb_vfd/src/vfdb_vfd.c b/src/modules/unmanaged/vfdb_vfd/src/vfdb_vfd.c index 946f19ad70..3a6d54076a 100644 --- a/src/modules/unmanaged/vfdb_vfd/src/vfdb_vfd.c +++ b/src/modules/unmanaged/vfdb_vfd/src/vfdb_vfd.c @@ -54,18 +54,18 @@ #include #include #include -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include #include #include #include #include -#include "rtapi.h" +#include "runtime/rtapi.h" #include "hal/hal.h" #include #include -#include "mk-inifile.h" +#include "mkini/mk-inifile.h" // command registers for DELTA VFD-B Inverter diff --git a/src/modules/unmanaged/xhc_hb04/src/xhc_hb04.cc b/src/modules/unmanaged/xhc_hb04/src/xhc_hb04.cc index 6263985dce..8e90a130ac 100755 --- a/src/modules/unmanaged/xhc_hb04/src/xhc_hb04.cc +++ b/src/modules/unmanaged/xhc_hb04/src/xhc_hb04.cc @@ -24,7 +24,7 @@ #include #include #include -#include "rtapi_math.h" +#include "runtime/rtapi_math.h" #include #include #include @@ -33,9 +33,9 @@ #include #include -#include +#include -#include "config.h" +#include "runtime/config.h" const char *modname = "xhc-hb04"; int hal_comp_id; diff --git a/src/modules/unmanaged/xhc_whb04b_6/src/main.cc b/src/modules/unmanaged/xhc_whb04b_6/src/main.cc index 6c05b7ccf8..67348eff20 100755 --- a/src/modules/unmanaged/xhc_whb04b_6/src/main.cc +++ b/src/modules/unmanaged/xhc_whb04b_6/src/main.cc @@ -32,7 +32,7 @@ // local library includes // local includes -#include "config.h" +#include "runtime/config.h" #include "xhc_whb04b_6/xhc-whb04b6.h" // forward declarations diff --git a/src/modules/unmanaged/xhc_whb04b_6/src/usb.cc b/src/modules/unmanaged/xhc_whb04b_6/src/usb.cc index 6bfa649157..089d7f250a 100644 --- a/src/modules/unmanaged/xhc_whb04b_6/src/usb.cc +++ b/src/modules/unmanaged/xhc_whb04b_6/src/usb.cc @@ -29,7 +29,7 @@ // 3rd party includes // local library includes -#include +#include // local includes #include "xhc_whb04b_6/hal.h"