From 861dad837cc93bd01fc967ead93eda73faa46408 Mon Sep 17 00:00:00 2001 From: "h.sandeep" Date: Fri, 2 Sep 2016 16:05:29 +0530 Subject: [PATCH] BT-Frwk: Fix Build Option Naming Rule. Change-Id: Ic66120ac74b830d65d27fb9ea4b85c38fbf737d1 Signed-off-by: h.sandeep --- CMakeLists.txt | 2 +- bt-api/bt-adapter-le.c | 10 +++++----- bt-api/bt-adapter.c | 4 ++-- bt-api/bt-telephony.c | 8 ++++---- bt-core/bt-core-adapter.c | 2 +- bt-core/bt-core-noti-handler.c | 14 +++++++------- bt-service-emul/CMakeLists.txt | 4 ++-- bt-service-emul/bt-service-adapter.c | 20 ++++++++++---------- bt-service/CMakeLists.txt | 6 +++--- bt-service/bt-service-adapter.c | 20 ++++++++++---------- bt-service/bt-service-agent.c | 8 ++++---- bt-service/bt-service-audio.c | 4 ++-- bt-service/bt-service-device.c | 4 ++-- bt-service/include/bt-service-agent.h | 2 +- include/bt-internal-types.h | 2 +- packaging/bluetooth-frwk.spec | 16 ++++++++-------- 16 files changed, 63 insertions(+), 63 deletions(-) mode change 100755 => 100644 bt-api/bt-telephony.c mode change 100755 => 100644 bt-core/bt-core-adapter.c mode change 100755 => 100644 bt-core/bt-core-noti-handler.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 52c75d6..6346ede 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ADD_SUBDIRECTORY(bt-api) -IF("$ENV{CFLAGS}" MATCHES "-DEMUL") +IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_TEST_EMUL") ADD_SUBDIRECTORY(bt-service-emul) ELSE() ADD_SUBDIRECTORY(bt-service) diff --git a/bt-api/bt-adapter-le.c b/bt-api/bt-adapter-le.c index c43ecc3..2a022b8 100644 --- a/bt-api/bt-adapter-le.c +++ b/bt-api/bt-adapter-le.c @@ -245,7 +245,7 @@ BT_EXPORT_API int bluetooth_unregister_all_scan_filters(void) return result; } -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE gboolean __bluetooth_is_privileged_process(void) { FILE *fp = NULL; @@ -276,7 +276,7 @@ BT_EXPORT_API int bluetooth_set_advertising(int handle, gboolean enable) BT_CHECK_ENABLED_ANY(return); -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE use_reserved_slot = __bluetooth_is_privileged_process(); #endif @@ -303,7 +303,7 @@ BT_EXPORT_API int bluetooth_set_custom_advertising(int handle, gboolean enable, BT_CHECK_ENABLED_ANY(return); -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE use_reserved_slot = __bluetooth_is_privileged_process(); #endif @@ -362,7 +362,7 @@ BT_EXPORT_API int bluetooth_set_advertising_data(int handle, const bluetooth_adv if (length > BLUETOOTH_ADVERTISING_DATA_LENGTH_MAX - 3) return BLUETOOTH_ERROR_INVALID_PARAM; -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE use_reserved_slot = __bluetooth_is_privileged_process(); #endif @@ -422,7 +422,7 @@ BT_EXPORT_API int bluetooth_set_scan_response_data(int handle, if (length > BLUETOOTH_SCAN_RESP_DATA_LENGTH_MAX) return BLUETOOTH_ERROR_INVALID_PARAM; -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE use_reserved_slot = __bluetooth_is_privileged_process(); #endif diff --git a/bt-api/bt-adapter.c b/bt-api/bt-adapter.c index eed8f53..11f9c92 100644 --- a/bt-api/bt-adapter.c +++ b/bt-api/bt-adapter.c @@ -62,7 +62,7 @@ BT_EXPORT_API int bluetooth_check_adapter(void) { int value = VCONFKEY_BT_STATUS_OFF; -#ifndef EMUL +#ifndef TIZEN_TEST_EMUL int ret; ret = _bt_get_adapter_path(_bt_gdbus_get_system_gconn(), NULL); @@ -281,7 +281,7 @@ BT_EXPORT_API int bluetooth_get_discoverable_mode(bluetooth_discoverable_mode_t BT_CHECK_PARAMETER(discoverable_mode_ptr, return); -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE int timeout = 0; /* Requirement in OSP */ if (bluetooth_check_adapter() == BLUETOOTH_ADAPTER_DISABLED) { diff --git a/bt-api/bt-telephony.c b/bt-api/bt-telephony.c old mode 100755 new mode 100644 index 246fc3d..fd5beb9 --- a/bt-api/bt-telephony.c +++ b/bt-api/bt-telephony.c @@ -308,7 +308,7 @@ static GVariant *__bluetooth_telephony_dbus_method_send(const char *path, const char *interface, const char *method, GError **err, GVariant *parameters) { -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE int timeout = 4000; #else int timeout = -1; @@ -800,7 +800,7 @@ static int __bluetooth_telephony_unregister(void) return BLUETOOTH_TELEPHONY_ERROR_NONE; } -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE static void __bluetooth_telephony_init_headset_state(void) { GVariant *reply; @@ -1406,7 +1406,7 @@ BT_EXPORT_API int bluetooth_telephony_init(bt_telephony_func_ptr cb, goto fail; } -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE __bluetooth_telephony_init_headset_state(); #endif @@ -1489,7 +1489,7 @@ BT_EXPORT_API gboolean bluetooth_telephony_is_sco_connected(void) g_variant_get(reply, "(b)", &status); g_variant_unref(reply); -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE if (status == TRUE && telephony_info.headset_state != BLUETOOTH_STATE_PLAYING) telephony_info.headset_state = BLUETOOTH_STATE_PLAYING; #endif diff --git a/bt-core/bt-core-adapter.c b/bt-core/bt-core-adapter.c old mode 100755 new mode 100644 index 490175c..b4aa62d --- a/bt-core/bt-core-adapter.c +++ b/bt-core/bt-core-adapter.c @@ -91,7 +91,7 @@ static gboolean __bt_core_idle_terminate(gpointer data) gboolean _bt_core_is_flight_mode_enabled(void) { -#ifdef TIZEN_BT_FLIGHTMODE_ENABLED +#ifdef TIZEN_FEATURE_FLIGHTMODE_ENABLED int isFlightMode = 0; int ret = -1; diff --git a/bt-core/bt-core-noti-handler.c b/bt-core/bt-core-noti-handler.c old mode 100755 new mode 100644 index fa94f49..153ef44 --- a/bt-core/bt-core-noti-handler.c +++ b/bt-core/bt-core-noti-handler.c @@ -218,7 +218,7 @@ static void __bt_core_handle_adapter_with_power_saving_mode(int power_saving_mod } } } -#ifdef TIZEN_BT_FLIGHTMODE_ENABLED +#ifdef TIZEN_FEATURE_FLIGHTMODE_ENABLED static void __bt_core_flight_mode_cb(keynode_t *node, void *data) { gboolean flight_mode = FALSE; @@ -238,7 +238,7 @@ static void __bt_core_flight_mode_cb(keynode_t *node, void *data) } #endif -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE #ifdef ENABLE_TIZEN_2_4 static void __bt_core_power_saving_mode_cb(keynode_t *node, void *data) { @@ -274,7 +274,7 @@ void _bt_core_init_vconf_value(void) flight_mode = _bt_core_is_flight_mode_enabled(); -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE #ifndef ENABLE_TIZEN_2_4 if (vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &power_saving_mode) != 0) BT_ERR("Fail to get the power_saving_mode status value"); @@ -303,7 +303,7 @@ void _bt_core_init_vconf_value(void) void _bt_core_handle_flight_mode_noti(void) { -#ifdef TIZEN_BT_FLIGHTMODE_ENABLED +#ifdef TIZEN_FEATURE_FLIGHTMODE_ENABLED int ret; BT_DBG("+"); @@ -319,7 +319,7 @@ void _bt_core_handle_flight_mode_noti(void) void _bt_core_handle_power_saving_mode_noti(void) { -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE int ret = 0; BT_DBG("+"); @@ -334,12 +334,12 @@ void _bt_core_handle_power_saving_mode_noti(void) void _bt_core_unregister_vconf_handler(void) { -#ifdef TIZEN_BT_FLIGHTMODE_ENABLED +#ifdef TIZEN_FEATURE_FLIGHTMODE_ENABLED vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, (vconf_callback_fn)__bt_core_flight_mode_cb); #endif -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE #ifdef ENABLE_TIZEN_2_4 vconf_ignore_key_changed(VCONFKEY_SETAPPL_PSMODE, (vconf_callback_fn)__bt_core_power_saving_mode_cb); diff --git a/bt-service-emul/CMakeLists.txt b/bt-service-emul/CMakeLists.txt index a0e1702..abb9180 100644 --- a/bt-service-emul/CMakeLists.txt +++ b/bt-service-emul/CMakeLists.txt @@ -90,11 +90,11 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/auto-pair-blacklist DESTINATION /opt/v # install booting script CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-frwk-service.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-frwk-service.conf) -IF (TIZEN_WEARABLE) +IF (TIZEN_PROFILE_WEARABLE) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wearable/stack_info DESTINATION /usr/etc/bluetooth/) ELSE () INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mobile/stack_info DESTINATION /usr/etc/bluetooth/) -ENDIF (TIZEN_WEARABLE) +ENDIF (TIZEN_PROFILE_WEARABLE) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-frwk-service.conf DESTINATION /etc/dbus-1/system.d) diff --git a/bt-service-emul/bt-service-adapter.c b/bt-service-emul/bt-service-adapter.c index 01a85fb..4f6e965 100644 --- a/bt-service-emul/bt-service-adapter.c +++ b/bt-service-emul/bt-service-adapter.c @@ -79,7 +79,7 @@ static gboolean __bt_timeout_handler(gpointer user_data) visible_timer.event_id = 0; visible_timer.timeout = 0; -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE if (vconf_set_int(BT_FILE_VISIBLE_TIME, 0) != 0) BT_ERR("Set vconf failed\n"); #endif @@ -107,7 +107,7 @@ static int __bt_visibility_alarm_cb(alarm_id_t alarm_id, void* user_param) visible_timer.event_id = 0; visible_timer.timeout = 0; -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE if (vconf_set_int(BT_FILE_VISIBLE_TIME, 0) != 0) BT_ERR("Set vconf failed\n"); #endif @@ -154,7 +154,7 @@ int __bt_set_visible_time(int timeout) visible_timer.timeout = timeout; -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE if (vconf_set_int(BT_FILE_VISIBLE_TIME, timeout) != 0) BT_ERR("Set vconf failed"); #endif @@ -243,7 +243,7 @@ static void __bt_phone_name_changed_cb(keynode_t *node, void *data) } } -#ifdef TIZEN_MOBILE +#ifdef TIZEN_PROFILE_MOBILE static void __bt_set_visible_mode(void) { int timeout = 0; @@ -292,7 +292,7 @@ static int __bt_set_enabled(void) BT_DBG("+"); int result = BLUETOOTH_ERROR_NONE; -#ifdef TIZEN_MOBILE +#ifdef TIZEN_PROFILE_MOBILE __bt_set_visible_mode(); #else #ifdef TIZEN_TV @@ -428,7 +428,7 @@ void _bt_set_le_disabled(int result) g_variant_new_int32(result)); } -#if defined(TIZEN_BT_FLIGHTMODE_ENABLED) || (!defined(TIZEN_WEARABLE) && defined(ENABLE_TIZEN_2_4)) +#if defined(TIZEN_FEATURE_FLIGHTMODE_ENABLED) || (!defined(TIZEN_PROFILE_WEARABLE) && defined(ENABLE_TIZEN_2_4)) static void __bt_service_flight_ps_mode_cb(keynode_t *node, void *data) { gboolean flight_mode = FALSE; @@ -460,7 +460,7 @@ void _bt_service_register_vconf_handler(void) { BT_DBG("+"); -#ifdef TIZEN_BT_FLIGHTMODE_ENABLED +#ifdef TIZEN_FEATURE_FLIGHTMODE_ENABLED if (vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, (vconf_callback_fn)__bt_service_flight_ps_mode_cb, NULL) < 0) BT_ERR("Unable to register key handler"); @@ -468,7 +468,7 @@ void _bt_service_register_vconf_handler(void) BT_DBG("Telephony is disabled"); #endif -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE #ifdef ENABLE_TIZEN_2_4 if (vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE, (vconf_callback_fn)__bt_service_flight_ps_mode_cb, NULL) < 0) @@ -481,12 +481,12 @@ void _bt_service_unregister_vconf_handler(void) { BT_DBG("+"); -#ifdef TIZEN_BT_FLIGHTMODE_ENABLED +#ifdef TIZEN_FEATURE_FLIGHTMODE_ENABLED vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, (vconf_callback_fn)__bt_service_flight_ps_mode_cb); #endif -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE #ifdef ENABLE_TIZEN_2_4 vconf_ignore_key_changed(VCONFKEY_SETAPPL_PSMODE, (vconf_callback_fn)__bt_service_flight_ps_mode_cb); diff --git a/bt-service/CMakeLists.txt b/bt-service/CMakeLists.txt index d93d9d3..ef4b69d 100644 --- a/bt-service/CMakeLists.txt +++ b/bt-service/CMakeLists.txt @@ -68,7 +68,7 @@ SET(PKG_MODULES storage ) -IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_NETWORK_TETHERING_ENABLE") +IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_FEATURE_NETWORK_TETHERING_ENABLE") SET(PKG_MODULES ${PKG_MODULES} capi-network-tethering ) @@ -127,11 +127,11 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/auto-pair-blacklist DESTINATION /opt/v # install booting script CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-frwk-service.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-frwk-service.conf) -IF (TIZEN_WEARABLE) +IF (TIZEN_PROFILE_WEARABLE) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wearable/stack_info DESTINATION /usr/etc/bluetooth/) ELSE () INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mobile/stack_info DESTINATION /usr/etc/bluetooth/) -ENDIF (TIZEN_WEARABLE) +ENDIF (TIZEN_PROFILE_WEARABLE) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-frwk-service.conf DESTINATION /etc/dbus-1/system.d) diff --git a/bt-service/bt-service-adapter.c b/bt-service/bt-service-adapter.c index 6033fb0..ee04807 100644 --- a/bt-service/bt-service-adapter.c +++ b/bt-service/bt-service-adapter.c @@ -156,7 +156,7 @@ static gboolean __bt_timeout_handler(gpointer user_data) visible_timer.event_id = 0; visible_timer.timeout = 0; -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE if (vconf_set_int(BT_FILE_VISIBLE_TIME, 0) != 0) BT_ERR("Set vconf failed\n"); #endif @@ -183,7 +183,7 @@ static int __bt_visibility_alarm_cb(alarm_id_t alarm_id, void* user_param) visible_timer.event_id = 0; visible_timer.timeout = 0; -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE if (vconf_set_int(BT_FILE_VISIBLE_TIME, 0) != 0) BT_ERR("Set vconf failed\n"); #endif @@ -216,7 +216,7 @@ int __bt_set_visible_time(int timeout) visible_timer.timeout = timeout; -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE #ifdef TIZEN_DPM_ENABLE if (_bt_dpm_get_bluetooth_limited_discoverable_state() != DPM_RESTRICTED) { #endif @@ -470,7 +470,7 @@ static void __bt_phone_name_changed_cb(keynode_t *node, void *data) } } -#ifdef TIZEN_MOBILE +#ifdef TIZEN_PROFILE_MOBILE static void __bt_set_visible_mode(void) { int timeout = 0; @@ -555,7 +555,7 @@ static int __bt_set_enabled(void) return BLUETOOTH_ERROR_INTERNAL; } -#ifdef TIZEN_MOBILE +#ifdef TIZEN_PROFILE_MOBILE __bt_set_visible_mode(); #else #ifdef TIZEN_TV @@ -734,7 +734,7 @@ int _bt_enable_core(void) return BLUETOOTH_ERROR_NONE; } -#if defined(TIZEN_BT_FLIGHTMODE_ENABLED) || (!defined(TIZEN_WEARABLE)) +#if defined(TIZEN_FEATURE_FLIGHTMODE_ENABLED) || (!defined(TIZEN_PROFILE_WEARABLE)) static void __bt_service_flight_ps_mode_cb(keynode_t *node, void *data) { gboolean flight_mode = FALSE; @@ -768,7 +768,7 @@ void _bt_service_register_vconf_handler(void) { BT_DBG("+"); -#ifdef TIZEN_BT_FLIGHTMODE_ENABLED +#ifdef TIZEN_FEATURE_FLIGHTMODE_ENABLED if (vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, (vconf_callback_fn)__bt_service_flight_ps_mode_cb, NULL) < 0) BT_ERR("Unable to register key handler"); @@ -776,7 +776,7 @@ void _bt_service_register_vconf_handler(void) BT_DBG("Telephony is disabled"); #endif -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE if (vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE, (vconf_callback_fn)__bt_service_flight_ps_mode_cb, NULL) < 0) BT_ERR("Unable to register key handler"); @@ -787,12 +787,12 @@ void _bt_service_unregister_vconf_handler(void) { BT_DBG("+"); -#ifdef TIZEN_BT_FLIGHTMODE_ENABLED +#ifdef TIZEN_FEATURE_FLIGHTMODE_ENABLED vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, (vconf_callback_fn)__bt_service_flight_ps_mode_cb); #endif -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE vconf_ignore_key_changed(VCONFKEY_SETAPPL_PSMODE, (vconf_callback_fn)__bt_service_flight_ps_mode_cb); #endif diff --git a/bt-service/bt-service-agent.c b/bt-service/bt-service-agent.c index 607c08a..92e2c03 100644 --- a/bt-service/bt-service-agent.c +++ b/bt-service/bt-service-agent.c @@ -24,7 +24,7 @@ #include #include -#ifdef TIZEN_NETWORK_TETHERING_ENABLE +#ifdef TIZEN_FEATURE_NETWORK_TETHERING_ENABLE #include #endif @@ -578,7 +578,7 @@ static gboolean __authorize_request(GapAgentPrivate *agent, GDBusProxy *device, GVariant *reply = NULL; GVariant *reply_temp = NULL; GVariant *tmp_value; -#ifdef TIZEN_NETWORK_TETHERING_ENABLE +#ifdef TIZEN_FEATURE_NETWORK_TETHERING_ENABLE bool enabled; tethering_h tethering = NULL; #endif @@ -625,7 +625,7 @@ static gboolean __authorize_request(GapAgentPrivate *agent, GDBusProxy *device, !strcasecmp(uuid, BNEP_UUID)) { BT_DBG("Network connection request: %s", uuid); -#ifdef TIZEN_NETWORK_TETHERING_ENABLE +#ifdef TIZEN_FEATURE_NETWORK_TETHERING_ENABLE if (nap_connected_device_count >= BT_PAN_MAX_CONNECTION) { BT_ERR("Max connection exceeded"); @@ -656,7 +656,7 @@ static gboolean __authorize_request(GapAgentPrivate *agent, GDBusProxy *device, gap_agent_reply_authorize(agent, GAP_AGENT_ACCEPT, NULL); goto done; -#ifdef TIZEN_NETWORK_TETHERING_ENABLE +#ifdef TIZEN_FEATURE_NETWORK_TETHERING_ENABLE fail: gap_agent_reply_authorize(agent, GAP_AGENT_REJECT, NULL); diff --git a/bt-service/bt-service-audio.c b/bt-service/bt-service-audio.c index 7de22bf..03bd39b 100644 --- a/bt-service/bt-service-audio.c +++ b/bt-service/bt-service-audio.c @@ -37,7 +37,7 @@ #include "bt-service-headset-connection.h" #ifdef TIZEN_SUPPORT_DUAL_HF -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE #define VCONF_KEY_BT_HOST_BT_MAC_ADDR "db/wms/host_bt_mac" #endif #endif @@ -339,7 +339,7 @@ gboolean _bt_is_headset_type_connected(int type, char *address) #ifdef TIZEN_SUPPORT_DUAL_HF gboolean __bt_is_companion_device(const char *addr) { -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE char *host_device_address = NULL; host_device_address = vconf_get_str(VCONF_KEY_BT_HOST_BT_MAC_ADDR); diff --git a/bt-service/bt-service-device.c b/bt-service/bt-service-device.c index 792fd5f..42af25f 100644 --- a/bt-service/bt-service-device.c +++ b/bt-service/bt-service-device.c @@ -183,7 +183,7 @@ done: BT_DBG("-"); } */ -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE static gboolean __bt_syspopup_timer_cb(gpointer user_data) { int ret; @@ -788,7 +788,7 @@ static void __bt_bond_device_cb(GDBusProxy *proxy, GAsyncResult *res, result == BLUETOOTH_ERROR_AUTHENTICATION_FAILED || result == BLUETOOTH_ERROR_TIMEOUT || result == BLUETOOTH_ERROR_HOST_DOWN) { -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE int is_sw_running = 0; if (vconf_get_int(VCONFKEY_SETUP_WIZARD_STATE, &is_sw_running)) diff --git a/bt-service/include/bt-service-agent.h b/bt-service/include/bt-service-agent.h index c9180d2..54716d2 100644 --- a/bt-service/include/bt-service-agent.h +++ b/bt-service/include/bt-service-agent.h @@ -30,7 +30,7 @@ #define BT_MAX_EVENT_STR_LENGTH 50 -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE #define BT_FILE_VISIBLE_TIME "file/private/libug-setting-bluetooth-efl/visibility_time" #endif diff --git a/include/bt-internal-types.h b/include/bt-internal-types.h index c5f2b0d..247245e 100644 --- a/include/bt-internal-types.h +++ b/include/bt-internal-types.h @@ -371,7 +371,7 @@ typedef struct { #define BT_DPM_SYSPOPUP "dpm-syspopup" #endif -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE #define BT_FILE_VISIBLE_TIME "file/private/libug-setting-bluetooth-efl/visibility_time" #endif diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec index 1c24731..1bc6303 100644 --- a/packaging/bluetooth-frwk.spec +++ b/packaging/bluetooth-frwk.spec @@ -108,7 +108,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" %define _servicedir starter.target.wants %if "%{?profile}" == "mobile" -export CFLAGS="$CFLAGS -DTIZEN_NETWORK_TETHERING_ENABLE -DTIZEN_BT_FLIGHTMODE_ENABLED -DTIZEN_MOBILE -DTIZEN_TELEPHONY_ENABLED" +export CFLAGS="$CFLAGS -DTIZEN_FEATURE_NETWORK_TETHERING_ENABLE -DTIZEN_FEATURE_FLIGHTMODE_ENABLED -DTIZEN_PROFILE_MOBILE -DTIZEN_FEATURE_TELEPHONY_ENABLED" %if "%{?tizen_target_name}" == "TM1" %define _servicefile packaging/bluetooth-frwk-mobile-sprd.service %else @@ -118,7 +118,7 @@ export CFLAGS="$CFLAGS -DTIZEN_NETWORK_TETHERING_ENABLE -DTIZEN_BT_FLIGHTMODE_EN %endif %if "%{?profile}" == "wearable" -export CFLAGS="$CFLAGS -DTIZEN_WEARABLE -DTIZEN_BT_FLIGHTMODE_ENABLED" +export CFLAGS="$CFLAGS -DTIZEN_PROFILE_WEARABLE -DTIZEN_FEATURE_FLIGHTMODE_ENABLED" %define _servicefile packaging/bluetooth-frwk-wearable.service %define _servicedir multi-user.target.wants %endif @@ -140,9 +140,9 @@ export CFLAGS="$CFLAGS -DRFCOMM_DIRECT" export LDFLAGS="$CFLAGS -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs" %if "%{?_with_emulator}" == "1" -export CFLAGS="$CFLAGS -DEMUL" -export CXXFLAGS="$CXXFLAGS -DEMUL" -export FFLAGS="$FFLAGS -DEMUL" +export CFLAGS="$CFLAGS -DTIZEN_TEST_EMUL" +export CXXFLAGS="$CXXFLAGS -DTIZEN_TEST_EMUL" +export FFLAGS="$FFLAGS -DTIZEN_TEST_EMUL" %endif cmake . -DCMAKE_INSTALL_PREFIX=/usr \ @@ -155,12 +155,12 @@ make %cmake \ %if "%{?profile}" == "wearable" - -DTIZEN_WEARABLE=YES \ + -DTIZEN_PROFILE_WEARABLE=YES \ %else - -DTIZEN_WEARABLE=NO \ + -DTIZEN_PROFILE_WEARABLE=NO \ %endif %if "%{?profile}" == "common" - -DTIZEN_WEARABLE=NO \ + -DTIZEN_PROFILE_WEARABLE=NO \ %endif %install -- 2.7.4