Move "config" variable as global.

Change-Id: I1760dce5ef5836c9392837f4a196382ee88dabd8
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Conflicts:
	src/configuration.hpp

diff --git a/src/configuration.hpp b/src/configuration.hpp
index 823d886..77f452f 100644 (file)
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -101,3 +101,7 @@ class configuration_t
                bool isBusActive(can_bus_dev_t* bus);
                */
 };
+
+// Make a global variable pointer
+extern configuration_t *config;
+

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index 759437b..46dcbf2 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -27,6 +27,7 @@
 #include <systemd/sd-event.h>
 
 #include "openxc.pb.h"
+#include "configuration.hpp"
 #include "can/can-bus.hpp"
 #include "can/can-signals.hpp"
 #include "can/can-message.hpp"

diff --git a/src/low-can-binding.hpp b/src/low-can-binding.hpp
index 1509c2a..04c7eac 100644 (file)
--- a/src/low-can-binding.hpp
+++ b/src/low-can-binding.hpp
@@ -20,8 +20,6 @@
 
 #include <cstddef>
 
-#include "configuration.hpp"
-
 extern "C"
 {
        #include <afb/afb-binding.h>
@@ -29,6 +27,4 @@ extern "C"
 
 extern "C" struct afb_binding_interface;
 
-extern const struct afb_binding_interface *binder_interface;
-
-extern configuration_t *config;
\ No newline at end of file
+extern const struct afb_binding_interface *binder_interface;
\ No newline at end of file