Rollback changes to submit TIZEN:COMMON project

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / include / bt-common.h

diff --git a/bt-api/include/bt-common.h b/bt-api/include/bt-common.h
index 1183ca4..bc67026 100644 (file)
--- a/bt-api/include/bt-common.h
+++ b/bt-api/include/bt-common.h
@@ -132,11 +132,13 @@ extern "C" {
 #define BT_EVENT_FREEDESKTOP "org.freedesktop.DBus"
 #define BT_FREEDESKTOP_PATH "/org/freedesktop/DBus"
 
-#define BT_EVENT_MANAGER "org.bluez.Manager"
 #define BT_MANAGER_PATH "/"
-#define BT_MANAGER_INTERFACE "org.bluez.Manager"
-#define BT_ADAPTER_INTERFACE "org.bluez.Adapter"
-#define BT_DEVICE_INTERFACE "org.bluez.Device"
+#define BT_MANAGER_INTERFACE "org.freedesktop.DBus.ObjectManager"
+#define BT_ADAPTER_INTERFACE "org.bluez.Adapter1"
+#define BT_DEVICE_INTERFACE "org.bluez.Device1"
+
+#define BT_PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties"
+#define BT_BLUEZ_HCI_PATH "/org/bluez/hci0"
 
 #define BT_BLUEZ_NAME "org.bluez"
 #define BT_DBUS_NAME "org.projectx.bt"
@@ -144,7 +146,7 @@ extern "C" {
 
 #define BT_AGENT_NAME "org.bluez.frwk_agent"
 #define BT_AGENT_PATH "/org/bluez/agent/frwk_agent"
-#define BT_AGENT_INTERFACE "org.bluez.Agent"
+#define BT_AGENT_INTERFACE "org.bluez.Agent1"
 
 #define BT_MAX_USER_INFO 5
 #define RFKILL_EVENT_SIZE 8
@@ -214,7 +216,7 @@ void _bt_convert_addr_type_to_string(char *address,
 
 int _bt_copy_utf8_string(char *dest, const char *src, unsigned int length);
 
-int _bt_get_adapter_path(DBusGConnection *conn, char *path);
+int _bt_get_adapter_path(DBusGConnection *g_conn, char *path);
 
 DBusGProxy *_bt_get_adapter_proxy(DBusGConnection *conn);