X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow-can-binding.cpp;h=935749086b8afa79ec862c0ccfc96a8bfc542dc4;hb=94506d3985429d79f8521fca46ed7b9dc1eb4109;hp=ad73de13084d2dfeb43a81f79ef9591f8ab2d68e;hpb=c01da10d067038794eb845735e2a7959744ca2b3;p=apps%2Flow-level-can-service.git

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index ad73de1..9357490 100644
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -22,22 +22,27 @@
 #include <mutex>
 #include <vector>
 #include <thread>
-#include <fcntl.h>
 #include <linux/can.h>
 #include <json-c/json.h>
 #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"
 #include "utils/timer.hpp"
 #include "utils/signals.hpp"
 #include "utils/openxc-utils.hpp"
-#include "configuration.hpp"
+
+extern "C"
+{
+	#include <afb/afb-service-itf.h>
+};
 
 // Interface between the daemon and the binding
 const struct afb_binding_interface *binder_interface;
+configuration_t *config;
 
 /********************************************************************************
 *
@@ -104,12 +109,12 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
 }
 
 /**
- * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<CanSignal>& signals)
+ * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<can_signal_t>& signals)
  * @brief subscribe to all signals in the vector signals
  *
  * @param[in] afb_req request : contain original request use to subscribe or unsubscribe
  * @param[in] subscribe boolean value used to chose between a subscription operation or an unsubscription
- * @param[in] CanSignal  vector with CanSignal to subscribe
+ * @param[in] can_signal_t  vector with can_signal_t to subscribe
  *
  * @return Number of correctly subscribed signal
  */
@@ -216,9 +221,9 @@ extern "C"
 	*/
 	int afbBindingV1ServiceInit(struct afb_service service)
 	{
-		configuration_t config;
+		config = new configuration_t();
 
-		can_bus_manager = config.get_can_bus_manager();
+		can_bus_t& can_bus_manager = config->get_can_bus_manager();
 
 		/* Open CAN socket */
 		if(can_bus_manager.init_can_dev() == 0)
@@ -226,6 +231,7 @@ extern "C"
 			can_bus_manager.start_threads();
 			return 0;
 		}
+
 		ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe");
 		return 1;
 	}