aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-06-07 23:38:19 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-06-07 23:38:19 +0200
commit5206b26e1a6811d142ffbaf12daaea0731345490 (patch)
tree4c47afb9d10c91eff69808c92ce4e1530b53e880
parent995fc3b8b8e51f0adfa2dac06286ede84f05a43a (diff)
Cleanup include and prepare to switch binding v2
Change-Id: I032e8ec32c3ff5b2464f2802dd93683752316049 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--CAN-binder/low-can-binding/binding/low-can-cb.cpp5
-rw-r--r--CAN-binder/low-can-binding/binding/low-can-hat.cpp5
-rw-r--r--CAN-binder/low-can-binding/binding/low-can-hat.hpp1
-rw-r--r--CAN-binder/low-can-binding/can/can-bus.cpp5
-rw-r--r--CAN-binder/low-can-binding/can/can-signals.hpp6
5 files changed, 1 insertions, 21 deletions
diff --git a/CAN-binder/low-can-binding/binding/low-can-cb.cpp b/CAN-binder/low-can-binding/binding/low-can-cb.cpp
index bc94eedf..e3521018 100644
--- a/CAN-binder/low-can-binding/binding/low-can-cb.cpp
+++ b/CAN-binder/low-can-binding/binding/low-can-cb.cpp
@@ -35,11 +35,6 @@
#include "../diagnostic/diagnostic-message.hpp"
#include "../utils/openxc-utils.hpp"
-extern "C"
-{
- #include <afb/afb-service-itf.h>
-};
-
///******************************************************************************
///
diff --git a/CAN-binder/low-can-binding/binding/low-can-hat.cpp b/CAN-binder/low-can-binding/binding/low-can-hat.cpp
index ddaa5a24..e8e56297 100644
--- a/CAN-binder/low-can-binding/binding/low-can-hat.cpp
+++ b/CAN-binder/low-can-binding/binding/low-can-hat.cpp
@@ -28,11 +28,6 @@
#include "application.hpp"
#include "../can/can-bus.hpp"
-extern "C"
-{
- #include <afb/afb-service-itf.h>
-};
-
// Interface between the daemon and the binding
const struct afb_binding_interface *binder_interface;
diff --git a/CAN-binder/low-can-binding/binding/low-can-hat.hpp b/CAN-binder/low-can-binding/binding/low-can-hat.hpp
index 233d7987..34dd80b4 100644
--- a/CAN-binder/low-can-binding/binding/low-can-hat.hpp
+++ b/CAN-binder/low-can-binding/binding/low-can-hat.hpp
@@ -26,6 +26,7 @@
extern "C"
{
+ #define AFB_BINDING_VERSION 1
#include <afb/afb-binding.h>
};
diff --git a/CAN-binder/low-can-binding/can/can-bus.cpp b/CAN-binder/low-can-binding/can/can-bus.cpp
index 64b02465..d06eb77c 100644
--- a/CAN-binder/low-can-binding/can/can-bus.cpp
+++ b/CAN-binder/low-can-binding/can/can-bus.cpp
@@ -33,11 +33,6 @@
#include "../utils/signals.hpp"
#include "../utils/openxc-utils.hpp"
-extern "C"
-{
- #include <afb/afb-binding.h>
-}
-
/// @brief Class constructor
///
/// @param[in] conf_file - handle to the json configuration file.
diff --git a/CAN-binder/low-can-binding/can/can-signals.hpp b/CAN-binder/low-can-binding/can/can-signals.hpp
index d528f6a5..a56fc8cd 100644
--- a/CAN-binder/low-can-binding/can/can-signals.hpp
+++ b/CAN-binder/low-can-binding/can/can-signals.hpp
@@ -30,12 +30,6 @@
#include "can-message.hpp"
#include "../diagnostic/diagnostic-message.hpp"
-extern "C"
-{
- #include <afb/afb-binding.h>
- #include <afb/afb-event-itf.h>
-}
-
#define MESSAGE_SET_ID 0
class can_signal_t;