From 2e8c9c8cde82573a85a0de6157939de0b49a3637 Mon Sep 17 00:00:00 2001 From: Hyuk Lee Date: Fri, 28 Apr 2017 11:20:27 +0900 Subject: [PATCH] Modify the IPSP feature support check Change-Id: Ic25b75fee70e8df26247fa555276bacba20ec670 Signed-off-by: Hyuk Lee --- include/bluetooth_private.h | 1 + packaging/capi-network-bluetooth.spec | 6 +++--- src/bluetooth-ipsp.c | 12 ++++-------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/include/bluetooth_private.h b/include/bluetooth_private.h index 193e0f1..b45e848 100644 --- a/include/bluetooth_private.h +++ b/include/bluetooth_private.h @@ -499,6 +499,7 @@ typedef void (*bt_adapter_passkey_notification_cb)(const char *remote_address, c #define BT_FEATURE_COMMON "tizen.org/feature/network.bluetooth" #define BT_FEATURE_LE "tizen.org/feature/network.bluetooth.le" +#define BT_FEATURE_IPSP "tizen.org/feature/network.bluetooth.le.ipsp" #define BT_FEATURE_AUDIO_CALL "tizen.org/feature/network.bluetooth.audio.call" #define BT_FEATURE_AUDIO_MEDIA "tizen.org/feature/network.bluetooth.audio.media" #define BT_FEATURE_AUDIO_CONTROLLER "tizen.org/feature/network.bluetooth.audio.controller" diff --git a/packaging/capi-network-bluetooth.spec b/packaging/capi-network-bluetooth.spec index c119a5a..a7dbd3a 100644 --- a/packaging/capi-network-bluetooth.spec +++ b/packaging/capi-network-bluetooth.spec @@ -48,9 +48,9 @@ cp %{SOURCE1001} %{SOURCE1002} . %build -export CFLAGS="$CFLAGS -DTIZEN_FEATURE_AUDIO_HF_DISABLE -DTIZEN_FEATURE_IPSP_SUPPORT -DTIZEN_FEATURE_OTP_SUPPORT" -export CXXFLAGS="$CXXFLAGS -DTIZEN_FEATURE_AUDIO_HF_DISABLE -DTIZEN_FEATURE_IPSP_SUPPORT -DTIZEN_FEATURE_OTP_SUPPORT" -export FFLAGS="$FFLAGS -DTIZEN_FEATURE_AUDIO_HF_DISABLE -DTIZEN_FEATURE_IPSP_SUPPORT -DTIZEN_FEATURE_OTP_SUPPORT" +export CFLAGS="$CFLAGS -DTIZEN_FEATURE_AUDIO_HF_DISABLE -DTIZEN_FEATURE_OTP_SUPPORT" +export CXXFLAGS="$CXXFLAGS -DTIZEN_FEATURE_AUDIO_HF_DISABLE -DTIZEN_FEATURE_OTP_SUPPORT" +export FFLAGS="$FFLAGS -DTIZEN_FEATURE_AUDIO_HF_DISABLE -DTIZEN_FEATURE_OTP_SUPPORT" %ifarch aarch64 echo arch64 diff --git a/src/bluetooth-ipsp.c b/src/bluetooth-ipsp.c index bff3243..a1c9e6b 100644 --- a/src/bluetooth-ipsp.c +++ b/src/bluetooth-ipsp.c @@ -28,15 +28,11 @@ static bool is_ipsp_initialized = false; -#ifdef TIZEN_FEATURE_IPSP_SUPPORT -#define BT_CHECK_IPSP_SUPPORT() -#else #define BT_CHECK_IPSP_SUPPORT() \ - { \ - LOGE("[%s] NOT_SUPPORTED(0x%08x)", __FUNCTION__, BT_ERROR_NOT_SUPPORTED); \ - return BT_ERROR_NOT_SUPPORTED; \ - } -#endif +{ \ + BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \ + BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_IPSP); \ +} #define BT_CHECK_IPSP_INIT_STATUS() \ if (__bt_check_ipsp_init_status() == BT_ERROR_NOT_INITIALIZED) { \ -- 2.7.4