New way to return canfd_frame with now number of read bytes.

[apps/agl-service-can-low-level.git] / src / low-can-binding.cpp

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index be2d373..24d1457 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -29,8 +29,9 @@
 
 #include "timer.hpp"
 #include "openxc.pb.h"
-#include "can-utils.hpp"
+#include "can-bus.hpp"
 #include "can-signals.hpp"
+#include "can-message.hpp"
 #include "openxc-utils.hpp"
 
 extern "C"
@@ -43,6 +44,8 @@ extern "C"
  */
 const struct afb_binding_interface *binder_interface;
 
+can_bus_t *can_bus_handler;
+
 /********************************************************************************
 *
 *              Subscription and unsubscription
@@ -77,7 +80,7 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
 {
        int ret;
 
-       std::lock_guard<std::mutex> subscribed_signals_lock(subscribed_signals_mutex);
+       std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
        auto ss_i = subscribed_signals.find(sig.genericName);
        if (ss_i != subscribed_signals.end() && !afb_event_is_valid(ss_i->second))
        {
@@ -208,8 +211,8 @@ extern "C"
        static const struct afb_binding binding_desc {
                AFB_BINDING_VERSION_1,
                {
-                       "CAN bus service",
-                       "can",
+                       "Low level CAN bus service",
+                       "low-can",
                        verbs
                }
        };
@@ -231,15 +234,15 @@ extern "C"
        int afbBindingV1ServiceInit(struct afb_service service)
        {
                int fd_conf;
-               fd_conf = afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_bus.json", O_RDONLY, NULL);
+               fd_conf = afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_buses.json", O_RDONLY, NULL);
 
                /* Initialize the CAN bus handler */
-               can_bus_t can_bus_handler(fd_conf);
+               can_bus_handler = new can_bus_t(fd_conf);
 
                /* Open CAN socket */
-               if(can_bus_handler.init_can_dev() == 0)
+               if(can_bus_handler->init_can_dev() == 0)
                {
-                       can_bus_handler.start_threads();
+                       can_bus_handler->start_threads();
                        return 0;
                }
                ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe");