From 15213cbbad275f8128040d328c00f47167f8594e Mon Sep 17 00:00:00 2001 From: Tobias Jahnke Date: Wed, 8 Aug 2018 12:52:32 +0200 Subject: [PATCH] agl-service-unicens: move definition of api v2 Moves definition of AFB_BINDING_VERSION into config.cmake. Fixes an issue that different api versions seems to be defined for different code parts. Change-Id: If7325afe583ad6a8aa37cbd18dda473fbcba673b Signed-off-by: Tobias Jahnke --- conf.d/project/config.cmake | 1 + ucs2-afb/ucs_binding.h | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf.d/project/config.cmake b/conf.d/project/config.cmake index 58f568f..cceb079 100644 --- a/conf.d/project/config.cmake +++ b/conf.d/project/config.cmake @@ -94,6 +94,7 @@ add_compile_options() add_compile_options(-DCONTROL_CDEV_TX="/dev/inic-usb-ctx") add_compile_options(-DCONTROL_CDEV_RX="/dev/inic-usb-crx") add_compile_options(-DUCS2_CFG_PATH="/etc/default/ucs:../data:./data") +add_compile_options(-DAFB_BINDING_VERSION=2) # Compilation options definition # Use CMake generator expressions to specify only for a specific language diff --git a/ucs2-afb/ucs_binding.h b/ucs2-afb/ucs_binding.h index 9874ff4..e7b1a3c 100644 --- a/ucs2-afb/ucs_binding.h +++ b/ucs2-afb/ucs_binding.h @@ -18,17 +18,16 @@ #ifndef UCS2BINDING_H #define UCS2BINDING_H -// Use Version of AGL Application Framework API -#define AFB_BINDING_VERSION 2 - #ifndef PUBLIC #define PUBLIC #endif #define STATIC static -#include +/* binding is using the application framework API V2 + * the compile option "AFB_BINDING_VERSION=2" is located + * in conf.d/project/config.cmake */ #include - +#include #include "ucs_interface.h" #ifndef CONTROL_CDEV_TX -- 2.16.6