From: DoHyun Pyun <dh79.pyun@samsung.com>
Date: Mon, 6 Mar 2017 04:04:59 +0000 (+0900)
Subject: Revert "Modify the dbus timeout value for TM1 GATT server"
X-Git-Tag: accepted/tizen/3.0/common/20170307.113220~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F117396%2F1;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

Revert "Modify the dbus timeout value for TM1 GATT server"

This reverts commit 750b7a063dc8d90b24f5cffdfb8a3651de6b3866.

Change-Id: Ia02ecfafbf3bdbedd2969ca797b4d5fa42ea2f4b
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
---

diff --git a/bt-service/include/bt-service-common.h b/bt-service/include/bt-service-common.h
index c2a030c..1138dcf 100755
--- a/bt-service/include/bt-service-common.h
+++ b/bt-service/include/bt-service-common.h
@@ -107,13 +107,7 @@ extern "C" {
 #define BT_AGENT_AUTO_PAIR_BLACKLIST_FILE (APP_SYSCONFDIR"/auto-pair-blacklist")
 #define BT_AGENT_NEW_LINE "\r\n"
 
-/* GATT server connecting case, TM1 target takes over 10 sec to connect */
-#ifdef TIZEN_FEATURE_SPRD_CHIP
-#define BT_MAX_DBUS_TIMEOUT 45000
-#else
 #define BT_MAX_DBUS_TIMEOUT 10000
-#endif
-
 #ifndef TIZEN_PROFILE_TV
 #define BT_ENABLE_TIMEOUT 20000 /* 20 seconds */
 #else
diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index 5c40773..1e6bcbe 100644
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -152,9 +152,9 @@ export FFLAGS="$FFLAGS -DTIZEN_TEST_EMUL"
 
 
 %if "%{?tizen_target_name}" == "TM1"
-export CFLAGS="${CFLAGS} -DTIZEN_FEATURE_RADIO -DTIZEN_FEATURE_SPRD_CHIP"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_FEATURE_RADIO -DTIZEN_FEATURE_SPRD_CHIP"
-export FFLAGS="$FFLAGS -DTIZEN_FEATURE_RADIO -DTIZEN_FEATURE_SPRD_CHIP"
+export CFLAGS="${CFLAGS} -DTIZEN_FEATURE_RADIO"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_FEATURE_RADIO"
+export FFLAGS="$FFLAGS -DTIZEN_FEATURE_RADIO"
 %endif
 
 %ifarch aarch64