Skip to content

Commit dd87f60

Browse files
authored
Merge pull request #3846 from BsAtHome/fix_hal-private
hal: don't unnecessary include hal_priv.h header
2 parents da5a983 + a92a608 commit dd87f60

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/hal/hal.hh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,19 @@
55
#include <string>
66
#include <variant>
77
#include "hal.h"
8-
#include "hal_priv.h"
98

109
enum class hal_dir{
1110
IN = HAL_IN,
1211
OUT = HAL_OUT,
1312
};
1413

14+
#if 0
15+
// If this class is ever necessary, then it needs to be moved into a new
16+
// header 'hal_priv.hh' because it uses internal access methods from
17+
// 'hal_priv.h' that should not be available to the casual source file.
18+
19+
#include "hal_priv.h"
20+
1521
class hal{
1622
public:
1723
static bool component_exists(const std::string& name){
@@ -34,6 +40,7 @@ class hal{
3440
return thecomp && (thecomp->ready != 0);
3541
}
3642
};
43+
#endif
3744

3845
template<typename T>
3946
class hal_pin{

src/hal/utils/halcmd.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ FILE *halcmd_inifile = NULL;
6666

6767
#include <rtapi.h> /* RTAPI realtime OS API */
6868
#include <hal.h> /* HAL public API decls */
69-
#include "../hal_priv.h" /* private HAL decls */
7069
#include "halcmd_commands.h"
7170

7271
/***********************************************************************

0 commit comments

Comments
 (0)