For Verifiying identify

Change-Id: I937bda63e374b4fb65b7b702f150f684b4aa6f7d
Signed-off-by: Taejin Woo <tt.woo@samsung.com>

diff --git a/bt-service-emul/include/bt-service-common.h b/bt-service-emul/include/bt-service-common.h
index adcd4d9..abfe757 100644 (file)
--- a/bt-service-emul/include/bt-service-common.h
+++ b/bt-service-emul/include/bt-service-common.h
@@ -198,29 +198,29 @@ extern "C" {
 /* UUID */
 #define GENERIC_AUDIO_UUID      "00001203-0000-1000-8000-00805f9b34fb"
 
-#define OBEX_OPP_UUID          "00001105-0000-1000-8000-00805f9b34fb"
-
-#define HSP_HS_UUID             "00001108-0000-1000-8000-00805f9b34fb"
-#define HSP_AG_UUID             "00001112-0000-1000-8000-00805f9b34fb"
+#define AVRCP_TARGET_UUID       "0000110c-0000-1000-8000-00805f9b34fb"
+#define AVRCP_REMOTE_UUID       "0000110e-0000-1000-8000-00805f9b34fb"
+#define ADVANCED_AUDIO_UUID     "0000110d-0000-1000-8000-00805f9b34fb"
+#define A2DP_SINK_UUID          "0000110b-0000-1000-8000-00805f9b34fb"
+#define A2DP_SOURCE_UUID        "0000110a-0000-1000-8000-00805f9b34fb"
 
 #define HFP_HS_UUID             "0000111e-0000-1000-8000-00805f9b34fb"
 #define HFP_AG_UUID             "0000111f-0000-1000-8000-00805f9b34fb"
 
-#define ADVANCED_AUDIO_UUID     "0000110d-0000-1000-8000-00805f9b34fb"
-
-#define A2DP_SOURCE_UUID        "0000110a-0000-1000-8000-00805f9b34fb"
-#define A2DP_SINK_UUID          "0000110b-0000-1000-8000-00805f9b34fb"
-
-#define AVRCP_REMOTE_UUID       "0000110e-0000-1000-8000-00805f9b34fb"
-#define AVRCP_TARGET_UUID       "0000110c-0000-1000-8000-00805f9b34fb"
+#define HSP_HS_UUID             "00001108-0000-1000-8000-00805f9b34fb"
+#define HSP_AG_UUID             "00001112-0000-1000-8000-00805f9b34fb"
 
+#define RFCOMM_UUID_STR                        "00000003-0000-1000-8000-00805f9b34fb"
+#define HID_DEVICE_UUID                        "00001124-0000-1000-8000-00805f9b43bf"
 #define HID_UUID                "00001124-0000-1000-8000-00805f9b34fb"
+#define PANU_UUID                              "00001115-0000-1000-8000-00805f9b34fb"
+#define NAP_UUID                               "00001116-0000-1000-8000-00805f9b34fb"
 #define PNP_UUID                "00001200-0000-1000-8000-00805f9b34fb"
-#define RFCOMM_UUID_STR                "00000003-0000-1000-8000-00805f9b34fb"
-#define PANU_UUID              "00001115-0000-1000-8000-00805f9b34fb"
-#define NAP_UUID               "00001116-0000-1000-8000-00805f9b34fb"
-#define OBEX_PSE_UUID          "0000112f-0000-1000-8000-00805f9b34fb"
-#define GATT_UUID              "00001801-0000-1000-8000-00805f9b34fb"
+
+#define OBEX_OPP_UUID                  "00001105-0000-1000-8000-00805f9b34fb"
+#define OBEX_PSE_UUID                  "0000112f-0000-1000-8000-00805f9b34fb"
+
+#define GATT_UUID                              "00001801-0000-1000-8000-00805f9b34fb"
 
 /* Privilege */
 #define BT_PRIVILEGE_PUBLIC "http://tizen.org/privilege/bluetooth"

diff --git a/bt-service/bt-service-gap-agent.c b/bt-service/bt-service-gap-agent.c
index a96d68f..8ceb7fa 100644 (file)
--- a/bt-service/bt-service-gap-agent.c
+++ b/bt-service/bt-service-gap-agent.c
@@ -510,54 +510,54 @@ static gboolean __gap_agent_unregister(GapAgentPrivate *agent)
 static const gchar gap_agent_bluez_introspection_xml[] =
 "<node name='/'>"
 "  <interface name='org.bluez.Agent1'>"
-"    <method name='RequestPinCode'>"
-"      <arg type='o' name='device' direction='in'/>"
-"      <arg type='s' name='pincode' direction='out'/>"
-"    </method>"
-"    <method name='RequestPasskey'>"
-"      <arg type='o' name='device' direction='in'/>"
-"      <arg type='u' name='passkey' direction='out'/>"
-"    </method>"
+"       <method name='RequestConfirmation'>"
+"         <arg type='o' name='target' direction='in'/>"
+"         <arg type='u' name='passkey' direction='in'/>"
+"       </method>"
+"       <method name='RequestPinCode'>"
+"         <arg type='o' name='target' direction='in'/>"
+"         <arg type='s' name='pincode' direction='out'/>"
+"       </method>"
+"       <method name='RequestAuthorization'>"
+"         <arg type='o' name='target' direction='in'/>"
+"       </method>"
+"       <method name='RequestPasskey'>"
+"         <arg type='o' name='target' direction='in'/>"
+"         <arg type='u' name='passkey' direction='out'/>"
+"       </method>"
+"       <method name='AuthorizeService'>"
+"         <arg type='o' name='target' direction='in'/>"
+"         <arg type='s' name='uuid' direction='in'/>"
+"       </method>"
 "    <method name='DisplayPasskey'>"
-"      <arg type='o' name='device' direction='in'/>"
+"      <arg type='o' name='target' direction='in'/>"
 "      <arg type='u' name='passkey' direction='in'/>"
 "      <arg type='q' name='entered' direction='in'/>"
 "    </method>"
-"    <method name='RequestConfirmation'>"
-"      <arg type='o' name='device' direction='in'/>"
-"      <arg type='u' name='passkey' direction='in'/>"
-"    </method>"
-"    <method name='RequestAuthorization'>"
-"      <arg type='o' name='device' direction='in'/>"
-"    </method>"
-"    <method name='AuthorizeService'>"
-"      <arg type='o' name='device' direction='in'/>"
-"      <arg type='s' name='uuid' direction='in'/>"
-"    </method>"
-"    <method name='Cancel'>"
-"    </method>"
-"    <method name='Release'>"
-"    </method>"
+"       <method name='ReplyConfirmation'>"
+"         <arg type='u' name='accept' direction='in'/>"
+"       </method>"
 "    <method name='ReplyPinCode'>"
 "      <arg type='u' name='accept' direction='in'/>"
 "      <arg type='s' name='pincode' direction='in'/>"
 "    </method>"
+"       <method name='ReplyAuthorize'>"
+"         <arg type='u' name='accept' direction='in'/>"
+"       </method>"
 "    <method name='ReplyPasskey'>"
 "      <arg type='u' name='accept' direction='in'/>"
 "      <arg type='s' name='passkey' direction='in'/>"
 "    </method>"
-"    <method name='ReplyConfirmation'>"
-"      <arg type='u' name='accept' direction='in'/>"
-"    </method>"
-"    <method name='ReplyAuthorize'>"
-"      <arg type='u' name='accept' direction='in'/>"
-"    </method>"
+"       <method name='GetDiscoverableTimeout'>"
+"         <arg type='u' name='timeout' direction='out'/>"
+"       </method>"
 "    <method name='ConfirmModeChange'>"
 "      <arg type='s' name='mode' direction='in'/>"
 "    </method>"
-"    <method name='GetDiscoverableTimeout'>"
-"      <arg type='u' name='timeout' direction='out'/>"
-"    </method>"
+"       <method name='Cancel'>"
+"       </method>"
+"       <method name='Release'>"
+"       </method>"
 "  </interface>"
 "</node>";
 

diff --git a/bt-service/bt-service-gap-agent.xml b/bt-service/bt-service-gap-agent.xml
index f3438cb..b019a20 100644 (file)
--- a/bt-service/bt-service-gap-agent.xml
+++ b/bt-service/bt-service-gap-agent.xml
@@ -4,31 +4,31 @@
   <interface name="org.bluez.Agent">
     <method name="RequestPinCode">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="device"/>
+      <arg type="o" name="target"/>
       <arg type="s" name="pincode" direction="out"/>
     </method>
 
     <method name="RequestPasskey">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="device"/>
+      <arg type="o" name="target"/>
       <arg type="u" name="passkey" direction="out"/>
     </method>
 
     <method name="DisplayPasskey">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="device"/>
+      <arg type="o" name="target"/>
       <arg type="u" name="passkey"/>
     </method>
 
     <method name="RequestConfirmation">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="device"/>
+      <arg type="o" name="target"/>
       <arg type="u" name="passkey"/>
     </method>
 
     <method name="Authorize">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg type="o" name="device"/>
+      <arg type="o" name="target"/>
       <arg type="s" name="uuid"/>
     </method>
 

diff --git a/bt-service/include/bt-service-common.h b/bt-service/include/bt-service-common.h
index 2651c77..46f77cd 100644 (file)
--- a/bt-service/include/bt-service-common.h
+++ b/bt-service/include/bt-service-common.h
@@ -220,30 +220,29 @@ extern "C" {
 /* UUID */
 #define GENERIC_AUDIO_UUID      "00001203-0000-1000-8000-00805f9b34fb"
 
-#define OBEX_OPP_UUID          "00001105-0000-1000-8000-00805f9b34fb"
-
-#define HSP_HS_UUID             "00001108-0000-1000-8000-00805f9b34fb"
-#define HSP_AG_UUID             "00001112-0000-1000-8000-00805f9b34fb"
+#define AVRCP_TARGET_UUID       "0000110c-0000-1000-8000-00805f9b34fb"
+#define AVRCP_REMOTE_UUID       "0000110e-0000-1000-8000-00805f9b34fb"
+#define ADVANCED_AUDIO_UUID     "0000110d-0000-1000-8000-00805f9b34fb"
+#define A2DP_SINK_UUID          "0000110b-0000-1000-8000-00805f9b34fb"
+#define A2DP_SOURCE_UUID        "0000110a-0000-1000-8000-00805f9b34fb"
 
 #define HFP_HS_UUID             "0000111e-0000-1000-8000-00805f9b34fb"
 #define HFP_AG_UUID             "0000111f-0000-1000-8000-00805f9b34fb"
 
-#define ADVANCED_AUDIO_UUID     "0000110d-0000-1000-8000-00805f9b34fb"
-
-#define A2DP_SOURCE_UUID        "0000110a-0000-1000-8000-00805f9b34fb"
-#define A2DP_SINK_UUID          "0000110b-0000-1000-8000-00805f9b34fb"
-
-#define AVRCP_REMOTE_UUID       "0000110e-0000-1000-8000-00805f9b34fb"
-#define AVRCP_TARGET_UUID       "0000110c-0000-1000-8000-00805f9b34fb"
+#define HSP_HS_UUID             "00001108-0000-1000-8000-00805f9b34fb"
+#define HSP_AG_UUID             "00001112-0000-1000-8000-00805f9b34fb"
 
+#define RFCOMM_UUID_STR                        "00000003-0000-1000-8000-00805f9b34fb"
+#define HID_DEVICE_UUID                        "00001124-0000-1000-8000-00805f9b43bf"
 #define HID_UUID                "00001124-0000-1000-8000-00805f9b34fb"
-#define HID_DEVICE_UUID                "00001124-0000-1000-8000-00805f9b43bf"
+#define PANU_UUID                              "00001115-0000-1000-8000-00805f9b34fb"
+#define NAP_UUID                               "00001116-0000-1000-8000-00805f9b34fb"
 #define PNP_UUID                "00001200-0000-1000-8000-00805f9b34fb"
-#define RFCOMM_UUID_STR                "00000003-0000-1000-8000-00805f9b34fb"
-#define PANU_UUID              "00001115-0000-1000-8000-00805f9b34fb"
-#define NAP_UUID               "00001116-0000-1000-8000-00805f9b34fb"
-#define OBEX_PSE_UUID          "0000112f-0000-1000-8000-00805f9b34fb"
-#define GATT_UUID              "00001801-0000-1000-8000-00805f9b34fb"
+
+#define OBEX_OPP_UUID                  "00001105-0000-1000-8000-00805f9b34fb"
+#define OBEX_PSE_UUID                  "0000112f-0000-1000-8000-00805f9b34fb"
+
+#define GATT_UUID                              "00001801-0000-1000-8000-00805f9b34fb"
 
 /* Privilege */
 #define BT_PRIVILEGE_PUBLIC "http://tizen.org/privilege/bluetooth"