From: Wu Zheng <wu.zheng@intel.com>
Date: Wed, 20 Mar 2013 02:58:56 +0000 (+0800)
Subject: Modify configure files to match IVI feature
X-Git-Tag: accepted/2.0/20130322.021714~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F3205%2F1;p=profile%2Fivi%2Fbluez.git

Modify configure files to match IVI feature
---

diff --git a/audio/audio.conf b/audio/audio.conf
index d955f79..7abc131 100644
--- a/audio/audio.conf
+++ b/audio/audio.conf
@@ -9,19 +9,12 @@
 
 # If we want to disable support for specific services
 # Defaults to supporting all implemented services
-#Disable=Gateway,Source,Socket
-
-#ifdef __TIZEN_PATCH__
-Disable=Socket
-#endif
+#Disable=Control,Source
+Enable=Gateway,Sink,Source
 
 # SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA)
-#ifdef __TIZEN_PATCH__
-SCORouting=PCM
-#else
 # Defaults to HCI
 #SCORouting=PCM
-#endif
 
 # Automatically connect both A2DP and HFP/HSP profiles for incoming
 # connections. Some headsets that support both profiles will only connect the
@@ -31,21 +24,21 @@ SCORouting=PCM
 
 # Headset interface specific options (i.e. options which affect how the audio
 # service interacts with remote headset devices)
-[Headset]
+#[Headset]
 
 # Set to true to support HFP, false means only HSP is supported
 # Defaults to true
-HFP=true
+#HFP=true
 
 # Maximum number of connected HSP/HFP devices per adapter. Defaults to 1
-MaxConnected=1
+#MaxConnected=1
 
 # Set to true to enable use of fast connectable mode (faster page scanning)
-# for HFP when incoming call starts. Default settings are restored after
+# for HFP when incomming call starts. Default settings are restored after
 # call is answered or rejected. Page scan interval is much shorter and page
 # scan type changed to interlaced. Such allows faster connection initiated
 # by a headset.
-FastConnectable=false
+#FastConnectable=false
 
 # Just an example of potential config options for the other interfaces
 #[A2DP]
diff --git a/audio/headset.c b/audio/headset.c
index 2bb1b4f..c0424d1 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -26,6 +26,8 @@
 #include <config.h>
 #endif
 
+#undef __TIZEN_PATCH__
+
 #include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/packaging/bluez.spec b/packaging/bluez.spec
index 537b8ed..76bbe02 100644
--- a/packaging/bluez.spec
+++ b/packaging/bluez.spec
@@ -89,7 +89,7 @@ export LDFLAGS=" -lncurses -Wl,--as-needed "
 			--enable-health \
 			--enable-dbusoob \
 			--enable-test \
-                        --with-telephony=tizen
+                        --with-telephony=ofono
 
 make %{?jobs:-j%jobs}
 
diff --git a/src/main.conf b/src/main.conf
index e5b7d39..7024f3e 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -11,9 +11,9 @@ Name = %h-%d
 # Default device class. Only the major and minor device class bits are
 # considered.
 #ifdef __TIZEN_PATCH__
-Class = 0x00020C        # Smart phone
+#Class = 0x00020C        # Smart phone
 #else
-#Class = 0x000100
+Class = 0x000100
 #endif
 
 # How long to stay in discoverable mode before going back to non-discoverable