Revert "Fix the build fail for TV profile"

This reverts commit a8c42ecd75f8097cb0bbed9a3112a4d8a8efcca2.
Modify the CMakeList file to fix the build fail

Change-Id: I30cda9259873baa53e486ede36f340b3c039bd7a
Signed-off-by: Lee Hyuk <hyuk0512.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dbf1632a94201862cb5106ea7a002cbe23deba3..7c82603d46a27239694005ad9cb648326561c9ef 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,6 +62,7 @@ src/bluetooth-gatt.c
 src/bluetooth-ipsp.c
 src/bluetooth-dpm.c
 src/bluetooth-proximity.c
+src/bluetooth-tds.c
 )
 ELSE ()
 SET(SOURCES

diff --git a/packaging/capi-network-bluetooth.spec b/packaging/capi-network-bluetooth.spec
index ffa87817c5d4677a835346acbc5dd9d939a9429b..038b8503427d7fbc296f25aac3706aa176296cb5 100644 (file)
--- a/packaging/capi-network-bluetooth.spec
+++ b/packaging/capi-network-bluetooth.spec
@@ -68,12 +68,6 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_PROFILE_IVI"
 export FFLAGS="$FFLAGS -DTIZEN_PROFILE_IVI"
 %endif
 
-%if "%{?profile}" == "tv"
-export CFLAGS="$CFLAGS -DTIZEN_PROFILE_TV"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_PROFILE_TV"
-export FFLAGS="$FFLAGS -DTIZEN_PROFILE_TV"
-%endif
-
 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"

diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c
index 23f8941e60fdee00a9d910d00e87b2272b804ccb..f17bb6a28008e067840082bddf3c95f54acc9541 100644 (file)
--- a/src/bluetooth-common.c
+++ b/src/bluetooth-common.c
@@ -51,10 +51,8 @@ static void __bt_free_bt_adapter_device_discovery_info_s(bt_adapter_device_disco
 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);
 
-#if !defined(TIZEN_PROFILE_TV)
 /* TDS Forward declarations */
 static void __bt_free_tds_scan_result_info_s(bt_tds_transport_block_list_s *discovery_info);
-#endif
 
 #if !defined(TIZEN_PROFILE_WEARABLE) && !defined(TIZEN_PROFILE_IVI)
 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);
@@ -1109,9 +1107,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
        bt_le_data_length_params_t  *data_length_info = NULL;
        bt_ipsp_connection_info_t *bt_ipsp_iface_info = NULL;
        bt_pxp_property_changed_params_t *bt_pxp_property_info = NULL;
-#if !defined(TIZEN_PROFILE_TV)
        bluetooth_tds_activation_req_t *tds_act_req_info = NULL;
-#endif
 
        if (!__bt_need_to_handle(event))
                return;
@@ -1997,10 +1993,9 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                if (is_pxp_initialized)
                        _bt_proximity_connection_set_state_changed(param->result, device_addr, TRUE);
 
-#if !defined(TIZEN_PROFILE_TV)
                /* TDS Seeker */
                _bt_tds_update_seeker_connection_state_changed(param->result, device_addr, TRUE);
-#endif
+
                g_free(device_addr);
                device_addr = NULL;
                break;
@@ -2025,10 +2020,8 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                if (is_pxp_initialized)
                        _bt_proximity_connection_set_state_changed(param->result, device_addr, FALSE);
 
-#if !defined(TIZEN_PROFILE_TV)
                /* TDS Seeker */
                _bt_tds_update_seeker_connection_state_changed(param->result, device_addr, FALSE);
-#endif
 
                g_free(device_addr);
                device_addr = NULL;
@@ -2324,10 +2317,9 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                _bt_convert_address_to_string(&device_addr,
                                &service_change->device_addr);
 
-#if !defined(TIZEN_PROFILE_TV)
                /* Check if TDS Service removed */
                _bt_tds_check_service_changed(device_addr, service_change);
-#endif
+
                client = _bt_gatt_get_client(device_addr);
                g_free(device_addr);
                device_addr = NULL;
@@ -2806,7 +2798,6 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                        free(device_addr); /* LCOV_EXCL_STOP */
                break;
        }
-#if !defined(TIZEN_PROFILE_TV)
        case BLUETOOTH_EVENT_TDS_ACTIVATION_REQUESTED: {
                BT_DBG("BLUETOOTH_EVENT_TDS_ACTIVATION_REQUESTED"); /* LCOV_EXCL_LINE */
                tds_act_req_info = (bluetooth_tds_activation_req_t *)(param->param_data);
@@ -2877,7 +2868,6 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                        free(device_addr); /* LCOV_EXCL_STOP */
                break;
        }
-#endif
        default:
                BT_INFO("Unknown function");
                break;
@@ -2948,8 +2938,6 @@ static void __bt_le_event_proxy(int event, bluetooth_event_param_t *param, void
                        }
                }
 #endif
-
-#if !defined(TIZEN_PROFILE_TV)
                /* TDS Provider Search: Uses Scan Info */
                if (bt_event_slot_container[BT_EVENT_TDS_PROVIDER_FOUND_RESULT].callback != NULL) {
                        char *data = NULL;
@@ -2983,7 +2971,7 @@ static void __bt_le_event_proxy(int event, bluetooth_event_param_t *param, void
                                }
                        }
                }
-#endif
+
                if (scan_info)
                        __bt_free_bt_adapter_le_device_scan_info_s(scan_info);
                break;
@@ -3128,7 +3116,6 @@ static void __bt_free_bt_adapter_le_device_scan_info_s(bt_adapter_le_device_scan
        scan_info = NULL;
 } /* LCOV_EXCL_STOP */
 
-#if !defined(TIZEN_PROFILE_TV)
 static void __bt_free_tds_scan_result_info_s(bt_tds_transport_block_list_s *discovery_info)
 {
        int k;
@@ -3145,7 +3132,6 @@ static void __bt_free_tds_scan_result_info_s(bt_tds_transport_block_list_s *disc
        discovery_info = NULL;
 
 }
-#endif
 
 /* LCOV_EXCL_START */
 #if !defined(TIZEN_PROFILE_WEARABLE) && !defined(TIZEN_PROFILE_IVI)