From da32e9b3c51dcec055d4a61debf507218e0947bc Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Mon, 21 Nov 2016 15:04:11 +0900 Subject: [PATCH] Modify build feature names as Tizen 3.0 build option naming rule Change-Id: I30890bc8f6f8e401fddeb72d1c7d2838c4de8c70 Signed-off-by: DoHyun Pyun --- CMakeLists.txt | 10 +++++----- ag-agent/bluetooth-ag-agent.c | 40 ++++++++++++++++++++-------------------- ag-agent/bluetooth-ag-agent.h | 6 +++--- ag-agent/bluetooth-ag-manager.c | 8 ++++---- hf-agent/bluetooth-hf-agent.c | 6 +++--- packaging/bluetooth-agent.spec | 20 ++++++++++---------- pb-agent/bluetooth_pb_agent.c | 18 +++++++++--------- pb-agent/bluetooth_pb_agent.h | 2 +- 8 files changed, 55 insertions(+), 55 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d9391c..47d0d87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -IF (TIZEN_WEARABLE OR TIZEN_PROFILE_IVI) +IF (TIZEN_PROFILE_WEARABLE OR TIZEN_PROFILE_IVI) ADD_SUBDIRECTORY(hf-agent) -ELSE (TIZEN_WEARABLE OR TIZEN_PROFILE_IVI) +ELSE (TIZEN_PROFILE_WEARABLE OR TIZEN_PROFILE_IVI) ADD_SUBDIRECTORY(map-agent) ADD_SUBDIRECTORY(pb-agent) -IF (TIZEN_BT_HFP_AG_ENABLE) +IF (TIZEN_FEATURE_BT_HFP_AG) ADD_SUBDIRECTORY(ag-agent) -ENDIF (TIZEN_BT_HFP_AG_ENABLE) -ENDIF (TIZEN_WEARABLE OR TIZEN_PROFILE_IVI) +ENDIF (TIZEN_FEATURE_BT_HFP_AG) +ENDIF (TIZEN_PROFILE_WEARABLE OR TIZEN_PROFILE_IVI) diff --git a/ag-agent/bluetooth-ag-agent.c b/ag-agent/bluetooth-ag-agent.c index 36ec48e..d3745df 100755 --- a/ag-agent/bluetooth-ag-agent.c +++ b/ag-agent/bluetooth-ag-agent.c @@ -62,7 +62,7 @@ static gboolean sco_open_request = FALSE; static guint hf_bluez_id; static guint hs_bluez_id; static guint app_id; -#ifdef TIZEN_MEDIA_ENHANCE +#ifdef TIZEN_FEATURE_BT_MEDIA_ENHANCE static int media_sig_id = -1; static int media_state_sig_id = -1; static bt_ag_media_transport_state_t transport_state; @@ -70,16 +70,16 @@ static bt_ag_media_transport_state_t transport_state; #define HSP_AG_UUID "00001112-0000-1000-8000-00805f9b34fb" #define HFP_AG_UUID "0000111f-0000-1000-8000-00805f9b34fb" -#ifdef TIZEN_MEDIA_ENHANCE +#ifdef TIZEN_FEATURE_BT_MEDIA_ENHANCE #define A2DP_SINK_UUID "0000110b-0000-1000-8000-00805f9b34fb" #endif #define DEFAULT_ADAPTER_OBJECT_PATH "/org/bluez/hci0" -#ifdef TIZEN_SUPPORT_LUNAR_DEVICE +#ifdef TIZEN_FEATURE_BT_LUNAR_DEVICE #define VCONF_KEY_BT_LUNAR_ENABLED "db/wms/bt_loop_device_hfp_connected" #endif -#if defined(TIZEN_WEARABLE) && defined(TIZEN_BT_HFP_AG_ENABLE) +#if defined(TIZEN_PROFILE_WEARABLE) && defined(TIZEN_FEATURE_BT_HFP_AG) #define CALL_APP_ID "org.tizen.call-ui" #endif @@ -390,7 +390,7 @@ static void __bt_ag_agent_remove_watch(guint *watch_id) #if defined(TIZEN_SUPPORT_DUAL_HF) gboolean __bt_ag_agent_is_companion_device(const char *addr) { -#if defined(TIZEN_WEARABLE) +#if defined(TIZEN_PROFILE_WEARABLE) char *host_device_address = NULL; host_device_address = vconf_get_str(VCONF_KEY_BT_HOST_BT_MAC_ADDR); @@ -498,7 +498,7 @@ static gboolean __bt_get_outgoing_callapp_type(int *callapp_type) if (NULL == callapp_type) return FALSE; -#if defined(TIZEN_WEARABLE) && defined(TIZEN_BT_HFP_AG_ENABLE) +#if defined(TIZEN_PROFILE_WEARABLE) && defined(TIZEN_FEATURE_BT_HFP_AG) *callapp_type = BT_VOICE_CALL; FN_END; return TRUE; @@ -531,7 +531,7 @@ static gboolean __bt_get_outgoing_call_condition(int *condition) if (NULL == condition) return FALSE; -#if defined(TIZEN_WEARABLE) && defined(TIZEN_BT_HFP_AG_ENABLE) +#if defined(TIZEN_PROFILE_WEARABLE) && defined(TIZEN_FEATURE_BT_HFP_AG) *condition = BT_MO_ONLY_UNLOCKED; FN_END; return TRUE; @@ -554,7 +554,7 @@ static gboolean __bt_get_outgoing_call_condition(int *condition) #endif } -#if defined(TIZEN_WEARABLE) && defined(TIZEN_TELEPHONY_ENABLED) +#if defined(TIZEN_PROFILE_WEARABLE) && defined(TIZEN_TELEPHONY_ENABLED) static gboolean __bt_ag_agent_launch_call_app(const char *number) { FN_START; @@ -598,7 +598,7 @@ static gboolean __bt_ag_agent_make_call(const char *number) { FN_START; -#if defined(TIZEN_WEARABLE) && defined(TIZEN_BT_HFP_AG_ENABLE) +#if defined(TIZEN_PROFILE_WEARABLE) && defined(TIZEN_FEATURE_BT_HFP_AG) FN_END; return __bt_ag_agent_launch_call_app(number); #else @@ -921,7 +921,7 @@ gboolean _bt_ag_agent_threeway_call(unsigned int chld_value, DBG("Value = %d", chld_value); DBG("Sender = %s", sender); -#if defined(TIZEN_WEARABLE) && defined(TIZEN_BT_HFP_AG_ENABLE) +#if defined(TIZEN_PROFILE_WEARABLE) && defined(TIZEN_FEATURE_BT_HFP_AG) /* Check if AG supports (i.e. ag_chld_str = "0,1,2") the requested CHLD; if not return FALSE */ if (chld_value != 0 && chld_value != 1 && chld_value != 2) @@ -1437,7 +1437,7 @@ void _bt_ag_agent_get_revision_information(void *device) FN_END; } -#if defined(TIZEN_WEARABLE) && defined(TIZEN_BT_HFP_AG_ENABLE) +#if defined(TIZEN_PROFILE_WEARABLE) && defined(TIZEN_FEATURE_BT_HFP_AG) static gboolean __bt_ag_agent_launch_voice_dial(gboolean activate) { FN_START; @@ -1637,7 +1637,7 @@ static bt_hfp_agent_error_t __bt_hfp_send_bcs_command(bt_ag_info_t *hs, uint32_t codec; struct ag_codec *data = g_new0(struct ag_codec, 1); -#ifdef TIZEN_KIRAN +#ifdef TIZEN_FEATURE_BT_KIRAN_DEVICE codec = BT_CVSD_CODEC_ID; #else if (hs->codec_info.remote_codecs & BT_MSBC_CODEC_MASK) @@ -1889,7 +1889,7 @@ static int __bt_ag_sco_connect(bt_ag_info_t *hs) if (hs->state != HEADSET_STATE_CONNECTED) return BT_HFP_AGENT_ERROR_NOT_CONNECTED; -#ifdef TIZEN_MEDIA_ENHANCE +#ifdef TIZEN_FEATURE_BT_MEDIA_ENHANCE _bt_ag_agent_check_transport_state(); #endif @@ -3707,7 +3707,7 @@ static void __bt_ag_agent_network_signal_status_cb(keynode_t *node) _bt_hfp_set_property_value("SignalBarsChanged", signal_bar); } -#ifdef TIZEN_SUPPORT_LUNAR_DEVICE +#ifdef TIZEN_FEATURE_BT_LUNAR_DEVICE static void __bt_ag_agent_lunar_connection_status_cb(keynode_t *node) { gboolean status = vconf_keynode_get_bool(node); @@ -3782,7 +3782,7 @@ static void __bt_ag_agent_subscribe_vconf_updates(void) if (0 != ret) { ERR("Subsrciption to network failed err = [%d]\n", ret); } -#ifdef TIZEN_SUPPORT_LUNAR_DEVICE +#ifdef TIZEN_FEATURE_BT_LUNAR_DEVICE ret = vconf_notify_key_changed(VCONF_KEY_BT_LUNAR_ENABLED, (void *)__bt_ag_agent_lunar_connection_status_cb, NULL); if (0 != ret) { @@ -4055,7 +4055,7 @@ static void __bt_ag_agent_dbus_deinit(void) if (name_owner_sig_id != -1) g_dbus_connection_signal_unsubscribe(ag_dbus_conn, name_owner_sig_id); -#ifdef TIZEN_MEDIA_ENHANCE +#ifdef TIZEN_FEATURE_BT_MEDIA_ENHANCE if (media_sig_id != -1) g_dbus_connection_signal_unsubscribe(ag_dbus_conn, media_sig_id); @@ -4141,7 +4141,7 @@ fail: } -#ifdef TIZEN_MEDIA_ENHANCE +#ifdef TIZEN_FEATURE_BT_MEDIA_ENHANCE void _bt_ag_agent_check_transport_state(void) { FN_START; @@ -4279,7 +4279,7 @@ static void __bt_ag_agent_dbus_init(void) owner_sig_id = g_dbus_connection_signal_subscribe(ag_dbus_conn, NULL, BT_MANAGER_INTERFACE, NULL, NULL, NULL, 0, __bt_ag_agent_filter_cb, NULL, NULL); -#ifdef TIZEN_MEDIA_ENHANCE +#ifdef TIZEN_FEATURE_BT_MEDIA_ENHANCE media_sig_id = g_dbus_connection_signal_subscribe(ag_dbus_conn, NULL, BT_PROPERTIES_INTERFACE, NULL, NULL, NULL, 0, __bt_ag_agent_media_filter_cb, @@ -4303,13 +4303,13 @@ static uint32_t __bt_ag_agent_get_ag_features(void) BT_AG_FEATURE_REJECT_CALL | BT_AG_FEATURE_ENHANCED_CALL_STATUS | BT_AG_FEATURE_THREE_WAY_CALL | -#ifndef TIZEN_KIRAN +#ifndef TIZEN_FEATURE_BT_KIRAN_DEVICE BT_AG_FEATURE_VOICE_RECOGNITION | #endif BT_AG_FEATURE_EXTENDED_ERROR_RESULT_CODES; wbs_en = TRUE; -#if defined(TIZEN_BT_HFP_AG_ENABLE) +#if defined(TIZEN_FEATURE_BT_HFP_AG) hfp_ver = HFP_VERSION_1_6; #else hfp_ver = HFP_VERSION_1_5; diff --git a/ag-agent/bluetooth-ag-agent.h b/ag-agent/bluetooth-ag-agent.h index 4af63d4..7373db2 100644 --- a/ag-agent/bluetooth-ag-agent.h +++ b/ag-agent/bluetooth-ag-agent.h @@ -75,7 +75,7 @@ #define TELEPHONY_APP_INTERFACE "org.tizen.csd.Call.Instance" #define BT_HEADSET_INTERFACE "org.bluez.Headset" #define BT_ADAPTER_INTERFACE "org.bluez.Adapter1" -#ifdef TIZEN_MEDIA_ENHANCE +#ifdef TIZEN_FEATURE_BT_MEDIA_ENHANCE #define BT_PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties" #define BLUEZ_MEDIA_TRANSPORT_INTERFACE "org.bluez.MediaTransport1" #define BLUEZ_MEDIA_ENDPOINT_INTERFACE "org.bluez.MediaEndpoint1" @@ -336,7 +336,7 @@ typedef enum { BT_AGENT_NETWORK_REG_STATUS_REGISTERED_CSFB_ROAMING, } bt_hfp_agent_reg_status_t; -#ifdef TIZEN_MEDIA_ENHANCE +#ifdef TIZEN_FEATURE_BT_MEDIA_ENHANCE typedef enum media_transport_state { MEDIA_TRANSPORT_STATE_DISCONNECTED, MEDIA_TRANSPORT_STATE_IDLE, @@ -618,7 +618,7 @@ void _bt_ag_agent_get_creg_status(void *device); void _bt_ag_agent_get_revision_information(void *device); bt_hfp_agent_error_t _bt_ag_agent_vendor_cmd(const gchar *cmd, const gchar *path, const gchar *sender); -#ifdef TIZEN_MEDIA_ENHANCE +#ifdef TIZEN_FEATURE_BT_MEDIA_ENHANCE void _bt_ag_agent_check_transport_state(void); #endif diff --git a/ag-agent/bluetooth-ag-manager.c b/ag-agent/bluetooth-ag-manager.c index f4aced6..d40220d 100755 --- a/ag-agent/bluetooth-ag-manager.c +++ b/ag-agent/bluetooth-ag-manager.c @@ -124,7 +124,7 @@ static const char *agent_supported_character_set[] = { "\"UTF-8\"", "\"IRA\"" }; -#if defined(TIZEN_WEARABLE) && defined(TIZEN_BT_HFP_AG_ENABLE) +#if defined(TIZEN_PROFILE_WEARABLE) && defined(TIZEN_FEATURE_BT_HFP_AG) static const char *ag_chld_str = "0,1,2"; #else static const char *ag_chld_str = "0,1,2,3"; @@ -471,7 +471,7 @@ static bt_hfp_agent_error_t __bt_hfp_modify_indicator( { bt_ag_indicators_t *hf_ind = NULL; int i; -#ifdef TIZEN_MEDIA_ENHANCE +#ifdef TIZEN_FEATURE_BT_MEDIA_ENHANCE if (g_strcmp0(indicator_name, HFP_AGENT_CALLSETUP_INDICATOR) == 0) _bt_ag_agent_check_transport_state(); @@ -1612,7 +1612,7 @@ fail: static int __bt_hfp_get_phonebook_count(const char *path, uint32_t *max_size, uint32_t *used) { -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_PROFILE_WEARABLE GDBusConnection *g_conn; GDBusProxy *g_proxy; GError *err = NULL; @@ -1791,7 +1791,7 @@ void _bt_hfp_read_phonebook_entries_list(void *t_device) static int __bt_hfp_get_phonebook_entries(int start_index, int end_index) { -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE int count = 0; #else GDBusConnection *g_conn; diff --git a/hf-agent/bluetooth-hf-agent.c b/hf-agent/bluetooth-hf-agent.c index bf9b365..2ba0b56 100755 --- a/hf-agent/bluetooth-hf-agent.c +++ b/hf-agent/bluetooth-hf-agent.c @@ -2553,7 +2553,7 @@ static gboolean __bt_establish_service_level_conn(bt_hf_agent_info_t *bt_hf_info BT_HF_FEATURE_REMOTE_VOLUME_CONTROL | BT_HF_FEATURE_ENHANCED_CALL_STATUS; -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE feature = feature | BT_HF_FEATURE_CODEC_NEGOTIATION; #endif @@ -2571,7 +2571,7 @@ static gboolean __bt_establish_service_level_conn(bt_hf_agent_info_t *bt_hf_info return FALSE; INFO("Gateway supported features are 0x%X", bt_hf_info->ag_features); -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE if (bt_hf_info->ag_features & BT_AG_FEATURE_CODEC_NEGOTIATION) { ret = _hf_agent_codec_setup(bt_hf_info->remote_addr, BT_HF_CODEC_ID_MSBC); if (ret != BT_HF_AGENT_ERROR_NONE) @@ -3336,7 +3336,7 @@ static uint32_t __bt_hf_agent_get_hf_features(void) BT_HF_FEATURE_ENHANCED_CALL_STATUS | BT_HF_FEATURE_CODEC_NEGOTIATION; -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_PROFILE_WEARABLE hf_features = hf_features | BT_HF_FEATURE_CODEC_NEGOTIATION; #endif diff --git a/packaging/bluetooth-agent.spec b/packaging/bluetooth-agent.spec index 64ac68f..3b58e16 100644 --- a/packaging/bluetooth-agent.spec +++ b/packaging/bluetooth-agent.spec @@ -45,8 +45,8 @@ cp %{SOURCE1001} . export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" -#export CFLAGS="$CFLAGS -DTIZEN_MEDIA_ENHANCE" -export CFLAGS="$CFLAGS -DTIZEN_BT_HFP_AG_ENABLE" +#export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_MEDIA_ENHANCE" +export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_HFP_AG" %ifarch aarch64 echo arch64 @@ -63,31 +63,31 @@ export FFLAGS+=" -DARCH64" %endif %if "%{?profile}" == "wearable" -export CFLAGS="$CFLAGS -DTIZEN_WEARABLE" -export CFLAGS="$CFLAGS -DTIZEN_SUPPORT_LUNAR_DEVICE" +export CFLAGS="$CFLAGS -DTIZEN_PROFILE_WEARABLE" +export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_LUNAR_DEVICE" %else -export CFLAGS="$CFLAGS -DTIZEN_KIRAN" +export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_KIRAN_DEVICE" %endif %if "%{?profile}" == "ivi" export CFLAGS="$CFLAGS -DTIZEN_PROFILE_IVI" %endif -export CFLAGS+=" -fpie -DPBAP_SIM_ENABLE -fvisibility=hidden " -export CXXFLAGS+=" -fpie -DPBAP_SIM_ENABLE -fvisibility=hidden " +export CFLAGS+=" -fpie -DTIZEN_FEATURE_BT_PBAP_SIM -fvisibility=hidden " +export CXXFLAGS+=" -fpie -DTIZEN_FEATURE_BT_PBAP_SIM -fvisibility=hidden " export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie" cmake . -DCMAKE_INSTALL_PREFIX=/usr \ %if "%{?profile}" == "wearable" - -DTIZEN_WEARABLE=1 \ + -DTIZEN_PROFILE_WEARABLE=1 \ %else - -DTIZEN_WEARABLE=0 \ + -DTIZEN_PROFILE_WEARABLE=0 \ %endif %if "%{?profile}" == "ivi" -DTIZEN_PROFILE_IVI=1 \ %endif - -DTIZEN_BT_HFP_AG_ENABLE=1 + -DTIZEN_FEATURE_BT_HFP_AG=1 make VERBOSE=1 diff --git a/pb-agent/bluetooth_pb_agent.c b/pb-agent/bluetooth_pb_agent.c index 3ce6163..1a3b7c9 100644 --- a/pb-agent/bluetooth_pb_agent.c +++ b/pb-agent/bluetooth_pb_agent.c @@ -56,7 +56,7 @@ static gchar *bluetooth_pb_agent_folder_list[] = { "/telecom/och", "/telecom/mch", "/telecom/cch", -#ifdef PBAP_SIM_ENABLE +#ifdef TIZEN_FEATURE_BT_PBAP_SIM "/SIM1/telecom/pb", #endif NULL @@ -535,7 +535,7 @@ static GVariant *__bt_pb_get_phonebook_size(PbAgentData *agent, } /* for owner */ -#ifdef PBAP_SIM_ENABLE +#ifdef TIZEN_FEATURE_BT_PBAP_SIM if (pb_type == TELECOM_PB || pb_type == SIM_PB) count++; #else @@ -673,7 +673,7 @@ static GVariant *__bt_pb_get_phonebook_entry(PbAgentData *agent, contacts_record_destroy(record, TRUE); break; } -#ifdef PBAP_SIM_ENABLE +#ifdef TIZEN_FEATURE_BT_PBAP_SIM case SIM_PB: if (handle == 0) { str = _bluetooth_pb_vcard_contact_owner(agent->tel_number, @@ -1000,7 +1000,7 @@ static PhoneBookType __bluetooth_pb_get_storage_pb_type(const char *name) if (g_strcmp0(name, "\"MC\"") == 0) return TELECOM_MCH; -#ifdef PBAP_SIM_ENABLE +#ifdef TIZEN_FEATURE_BT_PBAP_SIM if (g_strcmp0(name, "\"SM\"") == 0) return SIM_PB; #endif @@ -1289,7 +1289,7 @@ static gboolean __bluetooth_pb_get_count(PhoneBookType pb_type, case TELECOM_CCH: query = __bluetooth_pb_query_phone_log_combined(); break; -#ifdef PBAP_SIM_ENABLE +#ifdef TIZEN_FEATURE_BT_PBAP_SIM case SIM_PB: query = __bluetooth_pb_query_person(PBAP_ADDRESSBOOK_SIM); break; @@ -1410,7 +1410,7 @@ static void __bluetooth_pb_get_vcards(PbAgentData *agent, PhoneBookType pb_type, switch (pb_type) { case TELECOM_PB: -#ifdef PBAP_SIM_ENABLE +#ifdef TIZEN_FEATURE_BT_PBAP_SIM case SIM_PB: #endif /* for owner */ @@ -1432,7 +1432,7 @@ static void __bluetooth_pb_get_vcards(PbAgentData *agent, PhoneBookType pb_type, if (pb_type == TELECOM_PB) query = __bluetooth_pb_query_person(PBAP_ADDRESSBOOK_PHONE); -#ifdef PBAP_SIM_ENABLE +#ifdef TIZEN_FEATURE_BT_PBAP_SIM else if (pb_type == SIM_PB) query = __bluetooth_pb_query_person(PBAP_ADDRESSBOOK_SIM); #endif @@ -1692,7 +1692,7 @@ static void __bluetooth_pb_get_list(PbAgentData *agent, PhoneBookType pb_type, query = __bluetooth_pb_query_phone_log_combined(); __bluetooth_pb_get_phone_log_list(agent, query, builder); break; -#ifdef PBAP_SIM_ENABLE +#ifdef TIZEN_FEATURE_BT_PBAP_SIM case SIM_PB: query = __bluetooth_pb_query_person(PBAP_ADDRESSBOOK_SIM); __bluetooth_pb_get_contact_list(agent, query, builder); @@ -1890,7 +1890,7 @@ static void __bluetooth_pb_get_list_number(PbAgentData *agent, __bluetooth_pb_get_phone_log_list_number(agent, query, start_index, end_index, builder); break; -#ifdef PBAP_SIM_ENABLE +#ifdef TIZEN_FEATURE_BT_PBAP_SIM case SIM_PB: query = __bluetooth_pb_query_person(PBAP_ADDRESSBOOK_SIM); __bluetooth_pb_get_contact_list_number(agent, query, diff --git a/pb-agent/bluetooth_pb_agent.h b/pb-agent/bluetooth_pb_agent.h index 0ee0c02..e7127a2 100644 --- a/pb-agent/bluetooth_pb_agent.h +++ b/pb-agent/bluetooth_pb_agent.h @@ -56,7 +56,7 @@ typedef enum { TELECOM_OCH, TELECOM_MCH, TELECOM_CCH, -#ifdef PBAP_SIM_ENABLE +#ifdef TIZEN_FEATURE_BT_PBAP_SIM SIM_PB, #endif TELECOM_NONE -- 2.7.4