CAPI: Fix Build Option Naming Rule.

Change-Id: Id3e329d6c305fec326c8e9c5bf06d37c59f9d2b2
Signed-off-by: h.sandeep <h.sandeep@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43f49dec3eddc8141a940895a2cc93ade3ddd042..dc34512bce2e99ef61d2636f660fb9edbcae7aa1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,23 +7,23 @@ SET(CMAKE_INSTALL_PREFIX /usr)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 
 SET(INC_DIR include)
-IF (TIZEN_TV)
+IF (TIZEN_PROFILE_TV)
     INCLUDE_DIRECTORIES(${INC_DIR})
     INCLUDE_DIRECTORIES(${INC_DIR}/tv)
 ELSE ()
        INCLUDE_DIRECTORIES(${INC_DIR})
-       IF (TIZEN_WEARABLE)
+       IF (TIZEN_PROFILE_WEARABLE)
                INCLUDE_DIRECTORIES(${INC_DIR}/wearable)
        ELSE ()
                INCLUDE_DIRECTORIES(${INC_DIR}/mobile)
-       ENDIF (TIZEN_WEARABLE)
-ENDIF (TIZEN_TV)
+       ENDIF (TIZEN_PROFILE_WEARABLE)
+ENDIF (TIZEN_PROFILE_TV)
 
-IF (TIZEN_TV)
+IF (TIZEN_PROFILE_TV)
        SET(dependents "dlog glib-2.0 capi-base-common bluetooth-api db-util capi-system-info")
 ELSE ()
        SET(dependents "dlog glib-2.0 capi-base-common bluetooth-api capi-system-info")
-ENDIF (TIZEN_TV)
+ENDIF (TIZEN_PROFILE_TV)
 SET(pc_dependents "capi-base-common glib-2.0")
 
 INCLUDE(FindPkgConfig)
@@ -44,7 +44,7 @@ ADD_DEFINITIONS("-DTIZEN_DEBUG")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
-IF (TIZEN_TV)
+IF (TIZEN_PROFILE_TV)
 SET(SOURCES
 src/bluetooth-common.c
 src/bluetooth-adapter.c
@@ -78,10 +78,10 @@ src/bluetooth-gatt.c
 src/bluetooth-ipsp.c
 src/bluetooth-dpm.c
 )
-IF (TIZEN_WEARABLE)
+IF (TIZEN_PROFILE_WEARABLE)
 LIST(APPEND SOURCES src/bluetooth-pbap.c)
-ENDIF (TIZEN_WEARABLE)
-ENDIF (TIZEN_TV)
+ENDIF (TIZEN_PROFILE_WEARABLE)
+ENDIF (TIZEN_PROFILE_TV)
 
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
 
@@ -102,7 +102,7 @@ INSTALL(
         PATTERN "*_private.h" EXCLUDE
         PATTERN "${INC_DIR}/*.h"
         )
-IF (TIZEN_TV)
+IF (TIZEN_PROFILE_TV)
 INSTALL(
         DIRECTORY ${INC_DIR}/tv/ DESTINATION include/network
         FILES_MATCHING
@@ -110,7 +110,7 @@ INSTALL(
         )
 
 ELSE ()
-       IF (TIZEN_WEARABLE)
+       IF (TIZEN_PROFILE_WEARABLE)
        INSTALL(
                DIRECTORY ${INC_DIR}/wearable/ DESTINATION include/network
                FILES_MATCHING
@@ -122,8 +122,8 @@ ELSE ()
                FILES_MATCHING
                PATTERN "${INC_DIR}/mobile/*.h"
                )
-       ENDIF (TIZEN_WEARABLE)
-ENDIF (TIZEN_TV)
+       ENDIF (TIZEN_PROFILE_WEARABLE)
+ENDIF (TIZEN_PROFILE_TV)
 
 SET(PC_NAME ${fw_name})
 SET(PC_REQUIRED ${pc_dependents})
@@ -136,10 +136,10 @@ CONFIGURE_FILE(
 )
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
-IF (TIZEN_TV)
+IF (TIZEN_PROFILE_TV)
 ELSE ()
 ADD_SUBDIRECTORY(test)
-ENDIF (TIZEN_TV)
+ENDIF (TIZEN_PROFILE_TV)
 
 IF(UNIX)
 

diff --git a/include/bluetooth_private.h b/include/bluetooth_private.h
index 1ed5df5fa8c508cf900951d37a0f4e3d4e2e7a8e..9ba7fa39b3d686d2fd8c86cf81104356593d1612 100644 (file)
--- a/include/bluetooth_private.h
+++ b/include/bluetooth_private.h
@@ -108,7 +108,7 @@ typedef enum {
        BT_EVENT_GATT_CLIENT_READ_DESCRIPTOR, /**< GATT descriptor value read callback */
        BT_EVENT_GATT_CLIENT_WRITE_DESCRIPTOR, /**< GATT descriptor value write callback */
        BT_EVENT_GATT_SERVER_READ_REQUESTED, /**< GATT Characteristic/Descriptor Read Requested callback*/
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
        BT_EVENT_GATT_CLIENT_CHARACTERISTIC_DISCOVERED_LEGACY, /**< GATT characteristic discovered callback */
        BT_EVENT_GATT_CLIENT_CHARACTERISTIC_DESCRIPTOR_DISCOVERED_LEGACY, /**< GATT characteristic descriptor discovered callback */
        BT_EVENT_GATT_CLIENT_VALUE_CHANGED_LEGACY, /**< GATT characteristic value changed callback */
@@ -127,7 +127,7 @@ typedef enum {
        BT_EVENT_GET_RSSI_EVENT, /**< Get RSSI Strength callback */
        BT_EVENT_LE_READ_MAXIMUM_DATA_LENGTH, /**< Read maximun LE data length callback */
        BT_EVENT_SUPPORTED_TRUSTED_PROFILE_EVENT, /**< Trusted Profile callback */
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        BT_EVENT_PBAP_CONNECTION_STATUS, /**< PBAP connection status callback */
        BT_EVENT_PBAP_PHONEBOOK_SIZE, /**< PBAP Phonebook Size status callback */
        BT_EVENT_PBAP_PHONEBOOK_PULL, /**< PBAP Phonebook Pull status callback */
@@ -151,7 +151,7 @@ typedef enum {
        BT_GATT_ROLE_CLIENT = 0x02,
 } bt_gatt_role_e;
 
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
 /**
  * @internal
  */
@@ -762,7 +762,7 @@ bt_adapter_visibility_mode_e _bt_get_bt_visibility_mode_e(bluetooth_discoverable
  */
 void _bt_audio_event_proxy(int event, bt_audio_event_param_t *param, void *user_data);
 
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_AUDIO_HF_MODULE
  * @brief  Enumerations for the device state event from Audio-Gateway device
@@ -851,7 +851,7 @@ void _bt_hid_event_proxy(int event, hid_event_param_t *param, void *user_data);
 
 void _bt_adapter_le_invoke_advertising_state_cb(int handle, int result, bt_adapter_le_advertising_state_e adv_state);
 
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
 bool _bt_gatt_is_legacy_client_mode(void);
 #endif
 

diff --git a/packaging/capi-network-bluetooth.spec b/packaging/capi-network-bluetooth.spec
index 06287a8a0003b19f59a5f2f82f47db4f81d87f94..b31bfa1df29db8100274af480eb5c4b56673a1e6 100644 (file)
--- a/packaging/capi-network-bluetooth.spec
+++ b/packaging/capi-network-bluetooth.spec
@@ -52,20 +52,20 @@ cp %{SOURCE1001} %{SOURCE1002} .
 %build
 
 %if "%{?profile}" == "wearable"
-export CFLAGS="$CFLAGS -DTIZEN_WEARABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_WEARABLE"
-export FFLAGS="$FFLAGS -DTIZEN_WEARABLE"
+export CFLAGS="$CFLAGS -DTIZEN_PROFILE_WEARABLE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_PROFILE_WEARABLE"
+export FFLAGS="$FFLAGS -DTIZEN_PROFILE_WEARABLE"
 %endif
 
 %if "%{?profile}" == "mobile"
-export CFLAGS="$CFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT"
-export CXXFLAGS="$CXXFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT"
-export FFLAGS="$FFLAGS -DBT_ENABLE_LEGACY_GATT_CLIENT"
+export CFLAGS="$CFLAGS -DTIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT"
+export FFLAGS="$FFLAGS -DTIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT"
 %endif
 
-export CFLAGS="$CFLAGS -DTIZEN_AUDIO_HF_DISABLE -DTIZEN_IPSP_SUPPORT"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_AUDIO_HF_DISABLE -DTIZEN_IPSP_SUPPORT"
-export FFLAGS="$FFLAGS -DTIZEN_AUDIO_HF_DISABLE -DTIZEN_IPSP_SUPPORT"
+export CFLAGS="$CFLAGS -DTIZEN_FEATURE_AUDIO_HF_DISABLE -DTIZEN_FEATURE_IPSP_SUPPORT"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_FEATURE_AUDIO_HF_DISABLE -DTIZEN_FEATURE_IPSP_SUPPORT"
+export FFLAGS="$FFLAGS -DTIZEN_FEATURE_AUDIO_HF_DISABLE -DTIZEN_FEATURE_IPSP_SUPPORT"
 
 %ifarch aarch64
 echo arch64
@@ -83,14 +83,14 @@ export FFLAGS+=" -DARCH64"
 
 %cmake \
 %if "%{?profile}" == "wearable"
-       -DTIZEN_WEARABLE=YES \
+       -DTIZEN_PROFILE_WEARABLE=YES \
 %else
 %if "%{?profile}" == "tv"
-       -DTIZEN_TV=YES \
+       -DTIZEN_PROFILE_TV=YES \
 %else
 %if "%{?profile}" == "mobile"
-       -DTIZEN_WEARABLE=NO \
-       -DTIZEN_MOBILE=YES \
+       -DTIZEN_PROFILE_WEARABLE=NO \
+       -DTIZEN_PROFILE_MOBILE=YES \
 %endif
 %endif
 %endif

diff --git a/src/bluetooth-adapter.c b/src/bluetooth-adapter.c
index 1246f4f209443fdb23480be6a9ae8d4df0c3f890..3f7ba3591c282479fda253b2d4b963b88df0c06b 100644 (file)
--- a/src/bluetooth-adapter.c
+++ b/src/bluetooth-adapter.c
@@ -885,7 +885,7 @@ int bt_adapter_set_device_discovery_state_changed_cb(bt_adapter_device_discovery
        return ret;
 }
 
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
 int bt_adapter_le_set_device_discovery_state_changed_cb(bt_adapter_le_device_discovery_state_changed_cb callback,
                                                        void *user_data)
 {
@@ -970,7 +970,7 @@ int bt_adapter_unset_device_discovery_state_changed_cb(void)
        return BT_ERROR_NONE;
 }
 
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
 int bt_adapter_le_unset_device_discovery_state_changed_cb(void)
 {
        BT_INFO("DEPRECATION WARNING: bt_adapter_le_unset_device_discovery_state_changed_cb() is deprecated and will be removed from next release.");
@@ -1032,7 +1032,7 @@ int bt_adapter_is_discovering(bool *is_discovering)
        }
 }
 
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
 int bt_adapter_le_start_device_discovery(void)
 {
        int error_code = BT_ERROR_NONE;
@@ -2340,7 +2340,7 @@ int bt_adapter_le_clear_advertising_data(bt_advertiser_h advertiser,
        return ret;
 }
 
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
 int bt_adapter_le_start_advertising(bt_advertiser_h advertiser,
                bt_adapter_le_advertising_params_s *adv_params,
                bt_adapter_le_advertising_state_changed_cb cb,

diff --git a/src/bluetooth-audio.c b/src/bluetooth-audio.c
index a7a2850795b22f2f76a2b7b3f5cedad6b1951d93..4a58c980ea28afd02379345ed98278fc723c4e6f 100644 (file)
--- a/src/bluetooth-audio.c
+++ b/src/bluetooth-audio.c
@@ -31,7 +31,7 @@ typedef struct _call_list_s {
 } call_list_s;
 
 static bool is_audio_a2dp_initialized = false;
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
 static bool is_audio_hf_initialized = false;
 #endif
 static bool is_audio_ag_initialized = false;
@@ -54,7 +54,7 @@ static bool is_audio_ag_initialized = false;
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_AUDIO_MEDIA); \
 }
 
-#ifdef TIZEN_AUDIO_HF_DISABLE
+#ifdef TIZEN_FEATURE_AUDIO_HF_DISABLE
 #define BT_CHECK_HF_SUPPORT() \
                { \
                        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); \
@@ -140,7 +140,7 @@ int bt_audio_initialize(void)
        else
                is_audio_a2dp_initialized = true;
 
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        error = bluetooth_hf_init(_bt_hf_event_proxy, NULL);
        error = _bt_get_error_code(error);
        if (BT_ERROR_NONE != error)
@@ -149,7 +149,7 @@ int bt_audio_initialize(void)
                is_audio_hf_initialized = true;
 #endif
 
-#ifndef TIZEN_HFP_DISABLE /* B2_3G */
+#ifndef TIZEN_FEATURE_HFP_DISABLE /* B2_3G */
        error = bluetooth_telephony_init((void *)_bt_telephony_event_proxy, NULL);
        error = _bt_convert_telephony_error_code(error);
        if (BT_ERROR_NONE != error)
@@ -160,7 +160,7 @@ int bt_audio_initialize(void)
 
        /* There is no success case for 3 profiles */
        if (!is_audio_a2dp_initialized &&
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
                !is_audio_hf_initialized &&
 #endif
                 !is_audio_ag_initialized) {
@@ -184,7 +184,7 @@ int bt_audio_deinitialize(void)
 
        is_audio_a2dp_initialized = false;
 
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        error = bluetooth_hf_deinit();
        error = _bt_get_error_code(error);
        if (BT_ERROR_NONE != error)
@@ -193,7 +193,7 @@ int bt_audio_deinitialize(void)
        is_audio_hf_initialized = false;
 #endif
 
-#ifndef TIZEN_HFP_DISABLE /* B2_3G */
+#ifndef TIZEN_FEATURE_HFP_DISABLE /* B2_3G */
        error = bluetooth_telephony_deinit();
        error = _bt_convert_telephony_error_code(error);
        if (BT_ERROR_NONE != error)
@@ -220,7 +220,7 @@ int bt_audio_connect(const char *remote_address, bt_audio_profile_type_e type)
                BT_CHECK_A2DP_SUPPORT();
                BT_CHECK_A2DP_INIT_STATUS();
        } else if (type == BT_AUDIO_PROFILE_TYPE_ALL) {
-#if defined(TIZEN_HFP_DISABLE)
+#if defined(TIZEN_FEATURE_HFP_DISABLE)
                BT_CHECK_A2DP_INIT_STATUS();
                BT_ERR("HSP NOT SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED);
                type = BT_AUDIO_PROFILE_TYPE_A2DP;
@@ -240,7 +240,7 @@ int bt_audio_connect(const char *remote_address, bt_audio_profile_type_e type)
        BT_CHECK_INPUT_PARAMETER(remote_address);
        _bt_convert_address_to_hex(&addr_hex, remote_address);
        switch (type) {
-#ifndef TIZEN_HFP_DISABLE
+#ifndef TIZEN_FEATURE_HFP_DISABLE
        case BT_AUDIO_PROFILE_TYPE_HSP_HFP:
                error = bluetooth_ag_connect(&addr_hex);
                break;
@@ -248,7 +248,7 @@ int bt_audio_connect(const char *remote_address, bt_audio_profile_type_e type)
        case BT_AUDIO_PROFILE_TYPE_A2DP:
                error = bluetooth_av_connect(&addr_hex);
                break;
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        case BT_AUDIO_PROFILE_TYPE_AG:
                error = bluetooth_hf_connect(&addr_hex);
                break;
@@ -284,7 +284,7 @@ int bt_audio_disconnect(const char *remote_address, bt_audio_profile_type_e type
                BT_CHECK_A2DP_SUPPORT();
                BT_CHECK_A2DP_INIT_STATUS();
        } else if (type == BT_AUDIO_PROFILE_TYPE_ALL) {
-#if defined(TIZEN_HFP_DISABLE)
+#if defined(TIZEN_FEATURE_HFP_DISABLE)
                BT_CHECK_A2DP_INIT_STATUS();
                BT_ERR("HSP NOT SUPPORTED(0x%08x)", BT_ERROR_NOT_SUPPORTED);
                type = BT_AUDIO_PROFILE_TYPE_A2DP;
@@ -298,7 +298,7 @@ int bt_audio_disconnect(const char *remote_address, bt_audio_profile_type_e type
        BT_CHECK_INPUT_PARAMETER(remote_address);
        _bt_convert_address_to_hex(&addr_hex, remote_address);
        switch (type) {
-#ifndef TIZEN_HFP_DISABLE
+#ifndef TIZEN_FEATURE_HFP_DISABLE
        case BT_AUDIO_PROFILE_TYPE_HSP_HFP:
                error = bluetooth_ag_disconnect(&addr_hex);
                break;
@@ -306,7 +306,7 @@ int bt_audio_disconnect(const char *remote_address, bt_audio_profile_type_e type
        case BT_AUDIO_PROFILE_TYPE_A2DP:
                error = bluetooth_av_disconnect(&addr_hex);
                break;
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        case BT_AUDIO_PROFILE_TYPE_AG:
                error = bluetooth_hf_disconnect(&addr_hex);
                break;
@@ -837,7 +837,7 @@ int bt_a2dp_set_content_protection(bool status)
 }
 /* LCOV_EXCL_STOP */
 
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
 int bt_hf_initialize(void)
 {
        BT_CHECK_INIT_STATUS();

diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c
index 28deedc54ad207eaf92e9903aa8b0f22f34b3a5e..66669666bff3223e4de1213bc1a5dc4b0087e5c4 100644 (file)
--- a/src/bluetooth-common.c
+++ b/src/bluetooth-common.c
@@ -50,7 +50,7 @@ static int __bt_get_bt_adapter_device_discovery_info_s(bt_adapter_device_discove
 static void __bt_free_bt_adapter_device_discovery_info_s(bt_adapter_device_discovery_info_s *discovery_info);
 static int __bt_get_bt_adapter_le_device_scan_info_s(bt_adapter_le_device_scan_result_info_s **scan_info, bluetooth_le_device_info_t *source_info);
 static void __bt_free_bt_adapter_le_device_scan_info_s(bt_adapter_le_device_scan_result_info_s *scan_info);
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
 static int __bt_get_bt_adapter_le_device_discovery_info_s(bt_adapter_le_device_discovery_info_s **le_discovery_info, bluetooth_le_device_info_t *source_info);
 static void __bt_free_bt_adapter_le_device_discovery_info_s(bt_adapter_le_device_discovery_info_s *discovery_info);
 #endif
@@ -932,7 +932,7 @@ void _bt_audio_event_proxy(int event, bt_audio_event_param_t *param, void *user_
        __bt_event_proxy(event, &new_param, user_data);
 }
 
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
 void _bt_hf_event_proxy(int event, bt_hf_event_param_t *param, void *user_data)
 {
        bluetooth_event_param_t new_param;
@@ -1021,7 +1021,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
        bluetooth_device_address_t *bd_addr = NULL;
        telephony_event_callid_t *call_data = NULL;
        char *device_addr = NULL;
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        char *phone_number = NULL;
 #endif
        int error_code = BT_ERROR_NONE;
@@ -1796,7 +1796,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                device_addr = NULL;
                break;
        }
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
        case BLUETOOTH_EVENT_GATT_SVC_CHAR_DISCOVERED: {
                BT_INFO("BLUETOOTH_EVENT_GATT_SVC_CHAR_DISCOVERED");
                if (_bt_gatt_is_legacy_client_mode()) {
@@ -1819,7 +1819,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                BT_INFO("BLUETOOTH_EVENT_GATT_CHAR_VAL_CHANGED");
                char_val = (bt_gatt_char_value_t *)(param->param_data);
 
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
                if (_bt_gatt_is_legacy_client_mode()) {
                        bt_gatt_char_value_t *char_val = param->param_data;
 
@@ -1846,7 +1846,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
 
                BT_INFO("BLUETOOTH_EVENT_GATT_READ_CHAR");
 
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
                if (_bt_gatt_is_legacy_client_mode()) {
                        bt_gatt_char_value_t *char_val = param->param_data;
 
@@ -1876,7 +1876,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
 
                BT_INFO("BLUETOOTH_EVENT_GATT_WRITE_CHAR");
 
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
                if (_bt_gatt_is_legacy_client_mode()) {
                        ((bt_gatt_characteristic_write_cb)bt_event_slot_container[event_index].callback)
                                (bt_event_slot_container[event_index].user_data);
@@ -2012,7 +2012,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
 
                break;
        }
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
        case BLUETOOTH_EVENT_GATT_SVC_CHAR_DESC_DISCOVERED: {
                BT_INFO("BLUETOOTH_EVENT_GATT_SVC_CHAR_DESC_DISCOVERED");
                if (_bt_gatt_is_legacy_client_mode()) {
@@ -2230,7 +2230,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                if (device_addr != NULL)
                        free(device_addr); /* LCOV_EXCL_STOP */
                break;
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        case BLUETOOTH_PBAP_CONNECTED: {
                bt_pbap_connection_state_changed_cb cb = bt_event_slot_container[event_index].callback;
                void *user_data = bt_event_slot_container[event_index].user_data;
@@ -2545,7 +2545,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
 static void __bt_le_event_proxy(int event, bluetooth_event_param_t *param, void *user_data)
 {
        bt_adapter_le_device_scan_result_info_s *scan_info = NULL;
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        bt_adapter_le_device_discovery_info_s *discovery_info = NULL;
 #endif
        int event_index = -1;
@@ -2568,7 +2568,7 @@ static void __bt_le_event_proxy(int event, bluetooth_event_param_t *param, void
                    (_bt_get_error_code(param->result), BT_ADAPTER_LE_DISABLED, bt_event_slot_container[event_index].user_data);
                break;
 
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        case BLUETOOTH_EVENT_LE_DISCOVERY_STARTED:
                BT_INFO("BLUETOOTH_EVENT_LE_DISCOVERY_STARTED"); /* LCOV_EXCL_LINE */
                ((bt_adapter_le_device_discovery_state_changed_cb) bt_event_slot_container[event_index].callback) /* LCOV_EXCL_LINE */
@@ -2594,7 +2594,7 @@ static void __bt_le_event_proxy(int event, bluetooth_event_param_t *param, void
                                        (_bt_get_error_code(param->result), NULL, bt_event_slot_container[event_index].user_data);
                        }
                }
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
                event_index = BT_EVENT_LE_DEVICE_DISCOVERY_STATE_CHANGED;
                if (bt_event_slot_container[event_index].callback != NULL) {
                        if (__bt_get_bt_adapter_le_device_discovery_info_s(&discovery_info, (bluetooth_le_device_info_t *)(param->param_data)) == BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
@@ -2749,7 +2749,7 @@ static void __bt_free_bt_adapter_le_device_scan_info_s(bt_adapter_le_device_scan
        scan_info = NULL;
 }
 /* LCOV_EXCL_START */
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
 static int __bt_get_bt_adapter_le_device_discovery_info_s(
                        bt_adapter_le_device_discovery_info_s **le_discovery_info,
                        bluetooth_le_device_info_t *source_info)
@@ -2803,7 +2803,7 @@ static void __bt_free_bt_adapter_le_device_discovery_info_s(bt_adapter_le_device
 
 #endif
 
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
 static int __bt_get_gatt_client_cb_index(int event)
 {
        switch (event) {
@@ -2979,7 +2979,7 @@ static int __bt_get_cb_index(int event)
                return BT_EVENT_HID_DEVICE_CONNECTION_STATUS;
        case BLUETOOTH_HID_DEVICE_DATA_RECEIVED:
                return BT_EVENT_HID_DEVICE_DATA_RECEIVED;
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
        case BLUETOOTH_EVENT_GATT_SVC_CHAR_DISCOVERED:
                return BT_EVENT_GATT_CLIENT_CHARACTERISTIC_DISCOVERED_LEGACY;
        case BLUETOOTH_EVENT_GATT_SVC_CHAR_DESC_DISCOVERED:
@@ -3019,7 +3019,7 @@ static int __bt_get_cb_index(int event)
                return BT_EVENT_SUPPORTED_TRUSTED_PROFILE_EVENT;
        case BLUETOOTH_EVENT_LE_DATA_LENGTH_CHANGED:
                return BT_EVENT_LE_DATA_LENGTH_CHANGED; /* LCOV_EXCL_LINE */
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        case BLUETOOTH_PBAP_CONNECTED:
        case BLUETOOTH_PBAP_DISCONNECTED:
                return BT_EVENT_PBAP_CONNECTION_STATUS;

diff --git a/src/bluetooth-gatt.c b/src/bluetooth-gatt.c
index 75696b9ea10bb8d553aaac4c2d4d97aaf013508e..b9eee1fb519b88254e0b2585d966d00d2af0908b 100644 (file)
--- a/src/bluetooth-gatt.c
+++ b/src/bluetooth-gatt.c
@@ -387,7 +387,7 @@ next:
        return BT_ERROR_NONE;
 }
 
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
 bool _bt_gatt_is_legacy_client_mode(void)
 {
        if (gatt_client_list) {

diff --git a/src/bluetooth-ipsp.c b/src/bluetooth-ipsp.c
index d7225a511fa3533b71afd91a89057b73714fcf21..02b357796fef50d793807820460952e2ef9b980a 100644 (file)
--- a/src/bluetooth-ipsp.c
+++ b/src/bluetooth-ipsp.c
@@ -28,7 +28,7 @@
 
 static bool is_ipsp_initialized = false;
 
-#ifdef TIZEN_IPSP_SUPPORT
+#ifdef TIZEN_FEATURE_IPSP_SUPPORT
 #define BT_CHECK_IPSP_SUPPORT()
 #else
 #define BT_CHECK_IPSP_SUPPORT() \

diff --git a/test/bt_unit_test.c b/test/bt_unit_test.c
index 9d25c916411da255daf2e3e6dbf784f2af6db9e1..ea8119c1c2857c9701132a1d0fed9892180967be 100644 (file)
--- a/test/bt_unit_test.c
+++ b/test/bt_unit_test.c
@@ -93,7 +93,7 @@ static int total_time = 0;
 static struct timeval check_time = {0,};
 
 static gboolean is_sub_index = FALSE;
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
 int service_index;
 int char_service_index;
 static int selected_service_index = -1;
@@ -119,7 +119,7 @@ gatt_handle_t thermometer_h;
 gatt_handle_t custom_h;
 gatt_handle_t ipsp_h;
 
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
 bt_gatt_attribute_h service_clone[MAX_SERVICES];
 bt_gatt_attribute_h characteristics[MAX_SERVICES];
 bt_gatt_attribute_h characteristics_services[MAX_SERVICES];
@@ -169,7 +169,7 @@ tc_table_t tc_main[] = {
                , BT_UNIT_TEST_TABLE_HDP},
        {"DPM"
                , BT_UNIT_TEST_TABLE_DPM},
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        {"HF Role"
                , BT_UNIT_TEST_TABLE_HF},
        {"PBAP Client"
@@ -279,7 +279,7 @@ tc_table_t tc_adapter_le[] = {
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_SCAN},
        {"bt_adapter_le_stop_scan"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_SCAN},
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        {"bt_adapter_le_start_device_discovery"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_DEVICE_DISCOVERY},
        {"bt_adapter_le_stop_device_discovery"
@@ -295,7 +295,7 @@ tc_table_t tc_adapter_le[] = {
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_ADVERTISING_CONNECTABLE},
        {"bt_adapter_le_start_advertising_new"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_ADVERTISING_NEW},
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        {"bt_adapter_le_start_advertising"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_ADVERTISING},
 #endif
@@ -305,7 +305,7 @@ tc_table_t tc_adapter_le[] = {
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_WHITE_LIST},
        {"bt_adapter_le_remove_white_list"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REMOVE_WHITE_LIST},
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        {"bt_adapter_le_clear_white_list"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_CLEAR_WHITE_LIST},
 #endif
@@ -319,7 +319,7 @@ tc_table_t tc_adapter_le[] = {
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REGISTER_SCAN_FILTER_SERVICE_SOLICITATION_UUID},
        {"Unregister all scan filters"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_UNREGISTER_ALL_SCAN_FILTERS},
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        {"bt_adapter_le_set_device_discovery_state_changed_cb"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_DEVICE_DISCOVERY_STATE_CHANGED_CB},
        {"bt_adapter_le_unset_device_discovery_state_changed_cb"
@@ -605,7 +605,7 @@ tc_table_t tc_gatt[] = {
                , BT_UNIT_TEST_FUNCTION_ANCS_NEGATIVE_ACTION},
        {"ANCS (Get Noti. Attr.)"
                , BT_UNIT_TEST_FUNCTION_ANCS_GET_NOTI_ATTR},
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
        {"bt_gatt_foreach_primary_services"
                , BT_UNIT_TEST_FUNCTION_GATT_FOREACH_PRIMARY_SERVICES},
        {"bt_gatt_discover_characteristics"
@@ -935,7 +935,7 @@ tc_table_t tc_DPM[] = {
        {NULL                                   , 0x0000},
 };
 
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
 tc_table_t tc_hf[] = {
        /* Handsfree role functions */
        {"BACK"
@@ -1088,7 +1088,7 @@ void tc_usage_print(void)
        case BT_UNIT_TEST_TABLE_DPM:
                tc_table = tc_DPM;
                break;
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        case BT_UNIT_TEST_TABLE_HF:
                tc_table = tc_hf;
                break;
@@ -1212,7 +1212,7 @@ static const char *__bt_get_error_message(bt_error_e err)
        return err_str;
 }
 
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
 static gboolean __select_index_cb(GIOChannel *chan,
                                GIOCondition cond,
                                gpointer data)
@@ -1553,7 +1553,7 @@ void __bt_gatt_server_notification_state_change_cb(bool notify,
 }
 
 
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
 static void __bt_adapter_le_device_discovery_state_changed_cb(int result,
                bt_adapter_le_device_discovery_state_e discovery_state,
                bt_adapter_le_device_discovery_info_s *discovery_info,
@@ -2435,7 +2435,7 @@ bool __bt_gatt_server_foreach_svc_cb(int total,
        return true;
 }
 
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
 bool __bt_gatt_primary_service_cb(bt_gatt_attribute_h service,
        void *user_data)
 {
@@ -2707,7 +2707,7 @@ void __bt_ipsp_connection_state_changed_cb(int result,
        memcpy(ipsp_iface_name, iface_name, strlen(iface_name));
 }
 
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
 void __bt_hf_sco_state_changed_cb(int result,
        bool opened, void *user_data)
 {
@@ -2898,7 +2898,7 @@ static void __bt_initialize_all(void)
                        __bt_adapter_device_discovery_state_changed_cb, NULL);
        if (ret != BT_ERROR_NONE)
                TC_PRT("returns %s\n", __bt_get_error_message(ret));
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        ret = bt_adapter_le_set_device_discovery_state_changed_cb(
                __bt_adapter_le_device_discovery_state_changed_cb, NULL);
        if (ret != BT_ERROR_NONE)
@@ -4134,7 +4134,7 @@ int test_set_params(int test_id, char *param)
                break;
        }
 
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        case BT_UNIT_TEST_TABLE_HF: {
                switch (test_id) {
                default:
@@ -4567,7 +4567,7 @@ int test_input_callback(void *data)
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
                        break;
 
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_DEVICE_DISCOVERY:
                        ret = bt_adapter_le_start_device_discovery();
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
@@ -4824,7 +4824,7 @@ int test_input_callback(void *data)
                                TC_PRT("failed with [0x%04x]", ret);
                        break;
                }
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_ADVERTISING: {
                        bt_adapter_le_advertising_state_changed_cb cb;
                        bt_adapter_le_advertising_params_s adv_params = { 0, };
@@ -4892,7 +4892,7 @@ int test_input_callback(void *data)
                        break;
                }
 
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_CLEAR_WHITE_LIST: {
                        ret = bt_adapter_le_clear_white_list();
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
@@ -4996,7 +4996,7 @@ int test_input_callback(void *data)
                        break;
                }
 
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_DEVICE_DISCOVERY_STATE_CHANGED_CB:
                        ret = bt_adapter_le_set_device_discovery_state_changed_cb(
                                __bt_adapter_le_device_discovery_state_changed_cb, NULL);
@@ -6598,7 +6598,7 @@ int test_input_callback(void *data)
 
                        break;
                }
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
                case BT_UNIT_TEST_FUNCTION_GATT_FOREACH_PRIMARY_SERVICES: {
                        __bt_free_gatt_services();
 
@@ -8503,7 +8503,7 @@ int test_input_callback(void *data)
                }
                break;
        }
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        case BT_UNIT_TEST_TABLE_HF: {
                switch (test_id) {
                case BT_UNIT_TEST_FUNCTION_HF_INITIALIZE:

diff --git a/test/bt_unit_test.h b/test/bt_unit_test.h
index 1fea06dfc62f15a6f0490e96f47abf9fa72d25c7..70a60e33145d677c77660feca62d2dea40acf1ff 100644 (file)
--- a/test/bt_unit_test.h
+++ b/test/bt_unit_test.h
@@ -46,7 +46,7 @@ typedef enum {
        BT_UNIT_TEST_TABLE_IPSP,
        BT_UNIT_TEST_TABLE_HDP,
        BT_UNIT_TEST_TABLE_DPM,
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        BT_UNIT_TEST_TABLE_HF,
        BT_UNIT_TEST_TABLE_PBAP_CLIENT,
 #endif
@@ -101,7 +101,7 @@ typedef enum {
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_SCAN_MODE,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_SCAN,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_SCAN,
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_DEVICE_DISCOVERY,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_DEVICE_DISCOVERY,
 #endif
@@ -110,13 +110,13 @@ typedef enum {
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_ADVERTISING_FILTER_POLICY,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_ADVERTISING_CONNECTABLE,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_ADVERTISING_NEW,
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_ADVERTISING,
 #endif
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_ADVERTISING,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_WHITE_LIST,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REMOVE_WHITE_LIST,
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_CLEAR_WHITE_LIST,
 #endif
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ENABLE_PRIVACY,
@@ -124,7 +124,7 @@ typedef enum {
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REGISTER_SCAN_FILTER_SERVICE_UUID,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REGISTER_SCAN_FILTER_SERVICE_SOLICITATION_UUID,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_UNREGISTER_ALL_SCAN_FILTERS,
-#ifndef TIZEN_WEARABLE
+#ifndef TIZEN_PROFILE_WEARABLE
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_DEVICE_DISCOVERY_STATE_CHANGED_CB,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_UNSET_DEVICE_DISCOVERY_STATE_CHANGED_CB,
 #endif
@@ -250,7 +250,7 @@ typedef enum {
        BT_UNIT_TEST_FUNCTION_ANCS_POSITIVE_ACTION,
        BT_UNIT_TEST_FUNCTION_ANCS_NEGATIVE_ACTION,
        BT_UNIT_TEST_FUNCTION_ANCS_GET_NOTI_ATTR,
-#ifdef BT_ENABLE_LEGACY_GATT_CLIENT
+#ifdef TIZEN_FEATURE_ENABLE_LEGACY_GATT_CLIENT
        BT_UNIT_TEST_FUNCTION_GATT_FOREACH_PRIMARY_SERVICES,
        BT_UNIT_TEST_FUNCTION_GATT_DISCOVER_CHARACTERISTICS,
        BT_UNIT_TEST_FUNCTION_GATT_DISCOVER_CHARACTERISTIC_DESCRIPTORS,
@@ -386,7 +386,7 @@ typedef enum {
        BT_UNIT_TEST_FUNCTION_DPM_GET_LIMITED_DISCOVERABLE_STATE,
        BT_UNIT_TEST_FUNCTION_DPM_SET_DATA_TRANSFER_STATE,
        BT_UNIT_TEST_FUNCTION_DPM_GET_DATA_TRANSFER_STATE,
-#ifdef TIZEN_WEARABLE
+#ifdef TIZEN_PROFILE_WEARABLE
        BT_UNIT_TEST_FUNCTION_HF_INITIALIZE = 1,
        BT_UNIT_TEST_FUNCTION_HF_DEINITIALIZE,
        BT_UNIT_TEST_FUNCTION_HF_NOTIFY_CALL_ANSWER,