FEATURE: Namespace the main 'hal' library includes

Move the header files from 'HAL' library ('hal_api' INTERFACE library) into folder 'include/hal', which creates a namespace - for example 'hal.h' header should now be included as 'hal/hal.h'.
PocketNC · Dec 22, 2021 · 5c8619d · 5c8619d
1 parent 02e223c
commit 5c8619d
Show file tree

Hide file tree

Showing 252 changed files with 579 additions and 557 deletions.
diff --git a/decide_what_to_do/hal/components/attic/boss_plc.c b/decide_what_to_do/hal/components/attic/boss_plc.c
@@ -117,7 +117,7 @@
 
 #include "rtapi.h"              // RTAPI realtime OS API.
 #include "rtapi_app.h"          // RTAPI realtime module decls.
-#include "hal.h"                // HAL public API decls.
+#include "hal/hal.h"                // HAL public API decls.
 
 
 #define TRUE                    1

diff --git a/decide_what_to_do/hal/components/attic/modmath.c b/decide_what_to_do/hal/components/attic/modmath.c
@@ -33,7 +33,7 @@
 
 #include "rtapi.h"		/* RTAPI realtime OS API */
 #include "rtapi_app.h"		/* RTAPI realtime module decls */
-#include "hal.h"		/* HAL public API decls */
+#include "hal/hal.h"		/* HAL public API decls */
 
 #include <linux/types.h>
 #include "rtapi_math.h"

diff --git a/decide_what_to_do/hal/components/attic/supply.c b/decide_what_to_do/hal/components/attic/supply.c
@@ -46,7 +46,7 @@
 
 #include "rtapi.h"		/* RTAPI realtime OS API */
 #include "rtapi_app.h"		/* RTAPI realtime module decls */
-#include "hal.h"		/* HAL public API decls */
+#include "hal/hal.h"		/* HAL public API decls */
 
 /* module information */
 MODULE_AUTHOR("Matt Shaver");

diff --git a/decide_what_to_do/hal/components/hal_pru.c b/decide_what_to_do/hal/components/hal_pru.c
@@ -11,7 +11,7 @@
 #include "rtapi.h"		/* RTAPI realtime OS API */
 #include "rtapi_compat.h"       /* RTAPI support functions */
 #include "rtapi_app.h"		/* RTAPI realtime module decls */
-#include "hal.h"		/* HAL public API decls */
+#include "hal/hal.h"		/* HAL public API decls */
 #include <pthread.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/decide_what_to_do/hal/components/hal_prudebug.c b/decide_what_to_do/hal/components/hal_prudebug.c
@@ -14,7 +14,7 @@
 
 #include "rtapi.h"		/* RTAPI realtime OS API */
 #include "rtapi_app.h"		/* RTAPI realtime module decls */
-#include "hal.h"		/* HAL public API decls */
+#include "hal/hal.h"		/* HAL public API decls */
 #include <pthread.h>
 
 #include "prussdrv.h"           // UIO interface to uio_pruss

diff --git a/decide_what_to_do/hal/lib/hal_alias.c b/decide_what_to_do/hal/lib/hal_alias.c
@@ -3,9 +3,9 @@
 
 #include "config.h"
 #include "rtapi.h"		/* RTAPI realtime OS API */
-#include "hal.h"		/* HAL public API decls */
-#include "hal_priv.h"		/* HAL private decls */
-#include "hal_internal.h"
+#include "hal/hal.h"		/* HAL public API decls */
+#include "hal/hal_priv.h"		/* HAL private decls */
+#include "hal/hal_internal.h"
 
 
 hal_oldname_t *halpr_alloc_oldname_struct(void)

diff --git a/decide_what_to_do/hal/lib/hal_iter.c b/decide_what_to_do/hal/lib/hal_iter.c
@@ -1,3 +1,3 @@
-#include "hal_iter.h"
+#include "hal/hal_iter.h"
 
 
diff --git a/decide_what_to_do/hal/lib/hal_plug.c b/decide_what_to_do/hal/lib/hal_plug.c
@@ -1,10 +1,10 @@
 
 #include "config.h"
 #include "rtapi.h"		/* RTAPI realtime OS API */
-#include "hal.h"		/* HAL public API decls */
-#include "hal_priv.h"		/* HAL private decls */
-#include "hal_ring.h"
-#include "hal_internal.h"
+#include "hal/hal.h"		/* HAL public API decls */
+#include "hal/hal_priv.h"		/* HAL private decls */
+#include "hal/hal_ring.h"
+#include "hal/hal_internal.h"
 
 
 

diff --git a/decide_what_to_do/hal/vtable-example/vtexport.c b/decide_what_to_do/hal/vtable-example/vtexport.c
@@ -1,8 +1,8 @@
 
 #include "rtapi.h"
 #include "rtapi_app.h"
-#include "hal.h"
-#include "hal_priv.h"
+#include "hal/hal.h"
+#include "hal/hal_priv.h"
 
 #include "vtexample.h"
 

diff --git a/decide_what_to_do/hal/vtable-example/vtuse.c b/decide_what_to_do/hal/vtable-example/vtuse.c
@@ -1,8 +1,8 @@
 
 #include "rtapi.h"
 #include "rtapi_app.h"
-#include "hal.h"
-#include "hal_priv.h"
+#include "hal/hal.h"
+#include "hal/hal_priv.h"
 
 #include "vtexample.h"
 

diff --git a/decide_what_to_do/hal_comp.c b/decide_what_to_do/hal_comp.c
@@ -2,9 +2,9 @@
 
 #include "config.h"
 #include "rtapi.h"		/* RTAPI realtime OS API */
-#include "hal.h"		/* HAL public API decls */
-#include "hal_priv.h"		/* HAL private decls */
-#include "hal_internal.h"
+#include "hal/hal.h"		/* HAL public API decls */
+#include "hal/hal_priv.h"		/* HAL private decls */
+#include "hal/hal_internal.h"
 
 #if defined(ULAPI)
 #include <sys/types.h>		/* pid_t */

diff --git a/..._build_workflow/build_packagecloud_upload → ..._build_workflow/build_packagecloud_upload b/..._build_workflow/build_packagecloud_upload → ..._build_workflow/build_packagecloud_upload
diff --git a/...ld_workflow/check-system-configuration.sh → ...ld_workflow/check-system-configuration.sh b/...ld_workflow/check-system-configuration.sh → ...ld_workflow/check-system-configuration.sh
diff --git a/src/executables/CMakeLists.txt b/src/executables/CMakeLists.txt
@@ -30,7 +30,6 @@ add_subdirectory(encdec)
 add_subdirectory(fix_uuid)
 add_subdirectory(halcmd)
 add_subdirectory(halrun)
-add_subdirectory(haltalk)
 add_subdirectory(inivar)
 add_subdirectory(instcomp)
 add_subdirectory(linmove)

diff --git a/src/executables/comp/src/comp.g b/src/executables/comp/src/comp.g
@@ -260,7 +260,7 @@ def prologue(f):
 #endif
 #include "rtapi_string.h"
 #include "rtapi_errno.h"
-#include "hal.h"
+#include "hal/hal.h"
 
 static int comp_id;
 """)

diff --git a/src/executables/halcmd/CMakeLists.txt b/src/executables/halcmd/CMakeLists.txt
@@ -28,13 +28,11 @@ if(BUILD_HALCMD_EXECUTABLE)
   add_executable(halcmd)
 
   set(SOURCE_FILES src/halcmd_completion.c src/halcmd_main.c)
+  set(PRIVATE_HEADER_FILES src/halcmd_completion.h)
 
   find_package(Readline REQUIRED)
 
-  target_sources(halcmd PRIVATE ${SOURCE_FILES})
-
-  target_include_directories(
-    halcmd PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+  target_sources(halcmd PRIVATE ${SOURCE_FILES} ${PRIVATE_HEADER_FILES})
 
   target_compile_definitions(halcmd PRIVATE "ULAPI")
 

diff --git a/src/executables/halcmd/src/halcmd_completion.c b/src/executables/halcmd/src/halcmd_completion.c
@@ -42,10 +42,10 @@
 #include "linux/limits.h"
 #include "stdlib.h"
 #include "rtapi.h"      /* RTAPI realtime OS API */
-#include "hal.h"        /* HAL public API decls */
-#include "hal_priv.h"   /* private HAL decls */
-#include "hal_ring.h"           /* ringbuffer declarations */
-#include "hal_group.h"          /* halgroups declarations */
+#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"          /* halgroups declarations */
 
 static int argno;
 

diff --git a/...tables/halcmd/include/halcmd_completion.h → ...xecutables/halcmd/src/halcmd_completion.h b/...tables/halcmd/include/halcmd_completion.h → ...xecutables/halcmd/src/halcmd_completion.h
diff --git a/src/executables/halcmd/src/halcmd_main.c b/src/executables/halcmd/src/halcmd_main.c
@@ -39,8 +39,8 @@
 
 #include "config.h"
 #include "rtapi.h"
-#include "hal.h"
-#include "hal_priv.h"
+#include "hal/hal.h"
+#include "hal/hal_priv.h"
 #include "halcmd.h"
 #include "halcmd_commands.h"
 #include "halcmd_completion.h"

diff --git a/src/executables/haltalk/CMakeLists.txt b/src/executables/haltalk/CMakeLists.txt
diff --git a/src/executables/haltalk/Submakefile b/src/executables/haltalk/Submakefile
diff --git a/src/executables/instcomp/src/instcomp.g b/src/executables/instcomp/src/instcomp.g
@@ -339,10 +339,10 @@ def prologue(f):
 #endif
 #include "rtapi_string.h"
 #include "rtapi_errno.h"
-#include "hal.h"
-#include "hal_priv.h"
-#include "hal_accessor.h"
-#include "hal_internal.h"
+#include "hal/hal.h"
+#include "hal/hal_priv.h"
+#include "hal/hal_accessor.h"
+#include "hal/hal_internal.h"
 \nstatic int comp_id;
 \n""")
     for value in userdef_includes:
@@ -1044,7 +1044,7 @@ def prologue(f):
         f.write("#define local_argv(i) (ip->local_argv[i])\n")
 
         if (pin_ptrs):
-            f.write("#include <hal_accessor_macros.h>\n")
+            f.write("#include <hal/hal_accessor_macros.h>\n")
     f.write("\n")
     f.write("\n")
 

diff --git a/src/executables/messagebus/src/messagebus.cc b/src/executables/messagebus/src/messagebus.cc
@@ -41,9 +41,9 @@
 
 //#include "config.h"
 #include <rtapi.h>
-#include <hal.h>
-#include <hal_priv.h>
-#include <hal_ring.h>
+#include <hal/hal.h>
+#include <hal/hal_priv.h>
+#include <hal/hal_ring.h>
 #include <setup_signals.h>
 #include <mk-zeroconf.hh>
 //#include <select_interface.h>

diff --git a/...cutables/messagebus/include/messagebus.hh → src/executables/messagebus/src/messagebus.hh b/...cutables/messagebus/include/messagebus.hh → src/executables/messagebus/src/messagebus.hh
diff --git a/src/executables/messagebus/src/rtproxy.cc b/src/executables/messagebus/src/rtproxy.cc
@@ -12,9 +12,9 @@
 
 #include <rtapi.h>
 #include <rtapi_hexdump.h>
-#include <hal.h>
-#include <hal_priv.h>
-#include <hal_ring.h>
+#include <hal/hal.h>
+#include <hal/hal_priv.h>
+#include <hal/hal_ring.h>
 
 #include <machinetalk/include/pb-hal.h>
 #include <machinetalk/nanopb/pb_decode.h>

diff --git a/...executables/messagebus/include/rtproxy.hh → src/executables/messagebus/src/rtproxy.hh b/...executables/messagebus/include/rtproxy.hh → src/executables/messagebus/src/rtproxy.hh
diff --git a/src/executables/msgd/CMakeLists.txt b/src/executables/msgd/CMakeLists.txt
@@ -36,8 +36,8 @@ if(BUILD_MSGD_EXECUTABLE)
   pkg_check_modules(UUID "uuid" REQUIRED IMPORTED_TARGET)
   pkg_check_modules(LIBZMQ "libzmq" REQUIRED IMPORTED_TARGET)
 
-  find_library(LIBATOMIC NAMES "atomic" "libatomic" "libatomic.so" "libatomic.so.1" REQUIRED)
-  find_library(LIBRT NAMES "rt" "librt" "librt.so" REQUIRED)
+  find_library(ATOMIC NAMES "atomic" "libatomic" "libatomic.so" "libatomic.so.1" REQUIRED)
+  find_library(RT NAMES "rt" "librt" "librt.so" REQUIRED)
 
   target_link_libraries(
     msgd
@@ -50,8 +50,8 @@ if(BUILD_MSGD_EXECUTABLE)
             PkgConfig::UUID
             PkgConfig::LIBZMQ
             ${CMAKE_DL_LIBS}
-            ${LIBATOMIC}
-            ${LIBRT})
+            ${ATOMIC}
+            ${RT})
 
   set_target_properties(
     msgd

diff --git a/src/executables/mutexwatch/src/mutexwatch.c b/src/executables/mutexwatch/src/mutexwatch.c
@@ -31,8 +31,8 @@
 #include "rtapi_common.h"
 #include "rtapi_global.h"
 #include "shmdrv.h"
-#include "hal.h"
-#include "hal_priv.h"
+#include "hal/hal.h"
+#include "hal/hal_priv.h"
 
 hal_data_t *hal_data;
 

diff --git a/src/executables/rtapi_app/CMakeLists.txt b/src/executables/rtapi_app/CMakeLists.txt
@@ -30,10 +30,12 @@ if(BUILD_RTAPI_APP_EXECUTABLE)
   add_executable(rtapi_app)
 
   set(SOURCE_FILES src/rtapi_app.cc)
+  set(PRIVATE_HEADER_FILES src/rtapi_app_module.hh)
 
   target_sources(
     rtapi_app
-    PRIVATE ${SOURCE_FILES} $<TARGET_PROPERTY:rtapi_support,INTERFACE_SOURCES>
+    PRIVATE ${SOURCE_FILES} ${PRIVATE_HEADER_FILES}
+            $<TARGET_PROPERTY:rtapi_support,INTERFACE_SOURCES>
             $<TARGET_PROPERTY:rtapi_compat,INTERFACE_SOURCES>)
 
   target_include_directories(

diff --git a/src/executables/rtapi_app/src/rtapi_app.cc b/src/executables/rtapi_app/src/rtapi_app.cc
@@ -66,8 +66,8 @@
 
 using namespace google::protobuf;
 
-#include "hal.h"
-#include "hal_priv.h"
+#include "hal/hal.h"
+#include "hal/hal_priv.h"
 #include "rtapi.h"
 #include "rtapi_export.h"
 #include "rtapi_flavor.h" // flavor_*

diff --git a/...les/rtapi_app/include/rtapi_app_module.hh → ...utables/rtapi_app/src/rtapi_app_module.hh b/...les/rtapi_app/include/rtapi_app_module.hh → ...utables/rtapi_app/src/rtapi_app_module.hh
diff --git a/src/executables/test_rtapi_vsnprinf/CMakeLists.txt b/src/executables/test_rtapi_vsnprinf/CMakeLists.txt
@@ -33,8 +33,10 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^x86.*")
     add_executable(test_rtapi_vsnprintf)
 
     set(SOURCE_FILES src/test_rtapi_vsnprintf.c)
+    set(PRIVATE_HEADER_FILES src/vsnprintf.h)
 
-    target_sources(test_rtapi_vsnprintf PRIVATE ${SOURCE_FILES})
+    target_sources(test_rtapi_vsnprintf PRIVATE ${SOURCE_FILES}
+                                                ${PRIVATE_HEADER_FILES})
 
     target_include_directories(
       test_rtapi_vsnprintf

diff --git a/...s/test_rtapi_vsnprinf/include/vsnprintf.h → ...ables/test_rtapi_vsnprinf/src/vsnprintf.h b/...s/test_rtapi_vsnprinf/include/vsnprintf.h → ...ables/test_rtapi_vsnprinf/src/vsnprintf.h
diff --git a/src/executables/webtalk/include/cdecode.h → src/executables/webtalk/src/cdecode.h b/src/executables/webtalk/include/cdecode.h → src/executables/webtalk/src/cdecode.h
diff --git a/src/executables/webtalk/include/cencode.h → src/executables/webtalk/src/cencode.h b/src/executables/webtalk/include/cencode.h → src/executables/webtalk/src/cencode.h
diff --git a/src/executables/webtalk/include/webtalk.hh → src/executables/webtalk/src/webtalk.hh b/src/executables/webtalk/include/webtalk.hh → src/executables/webtalk/src/webtalk.hh
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,3 @@
		#include "hal_iter.h"
		#include "hal/hal_iter.h"