X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Finclude%2Fbt-common.h;h=c77dbfe73873f2a731834a834e35def12afd2869;hb=d21d5daacc8684fd8bd3de0a023f6ab880c0c991;hp=485168766a88c5c204bf512114fb7d968a4e467e;hpb=2db600c3809082a563d2688477f3a4f3a3f5bacf;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-api/include/bt-common.h b/bt-api/include/bt-common.h
index 4851687..c77dbfe 100755
--- a/bt-api/include/bt-common.h
+++ b/bt-api/include/bt-common.h
@@ -21,8 +21,6 @@
 
 #include <sys/types.h>
 #include <libintl.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus.h>
 #include <dlog.h>
 #include <glib.h>
 #include <gio/gio.h>
@@ -211,6 +209,23 @@ extern "C" {
 
 #define BT_AGENT_INTERFACE "org.bluez.Agent1"
 
+#define BT_ERROR_INTERNAL "InternalError"
+#define BT_ERROR_NOT_AVAILABLE "NotAvailable"
+#define BT_ERROR_NOT_CONNECTED "NotConnected"
+#define BT_ERROR_NOT_CONNECTION_FAILED "ConnectionFailed"
+#define BT_ERROR_BUSY "InProgress"
+#define BT_ERROR_INVALID_PARAM "InvalidArguments"
+#define BT_ERROR_ALREADY_EXIST "AlreadyExists"
+#define BT_ERROR_ALREADY_CONNECTED "Already Connected"
+#define BT_ERROR_NO_MEMORY "No memory"
+#define BT_ERROR_NO_DATA "No data"
+#define BT_ERROR_I_O_ERROR "I/O error"
+#define BT_ERROR_OPERATION_NOT_AVAILABLE "Operation currently not available"
+#define BT_ERROR_OPERATION_NOT_ALLOWED "Operation not allowed"
+#define BT_ERROR_OPERATION_NOT_SUPPORTED "Operation not supported"
+#define BT_ERROR_INVALID_FILE_DESCRIPTOR "Invalid File Descriptor"
+#define BT_ERROR_ACCESS_DENIED "Rejected send message"
+
 #ifndef GATT_DIRECT
 #define BT_MAX_USER_INFO 6
 #else
@@ -282,6 +297,9 @@ void _bt_avrcp_event_cb(int event, int result, void *param,
 void _bt_opp_client_event_cb(int event, int result, void *param,
 					void *callback, void *user_data);
 
+void _bt_map_client_event_cb(int event, int result, void *param,
+					void *callback, void *user_data);
+
 #ifndef GATT_DIRECT
 void _bt_gatt_server_event_cb(int event, int result, void *param,
                                         void *callback, void *user_data);
@@ -290,14 +308,17 @@ void _bt_gatt_server_event_cb(int event, int result, void *param,
 void _bt_divide_device_class(bluetooth_device_class_t *device_class,
 				unsigned int cod);
 
-void _bt_convert_addr_string_to_type(unsigned char *addr,
-					const char *address);
+void _bt_convert_addr_string_to_type(unsigned char *addr, const char *address);
+
+void _bt_convert_addr_string_to_secure_string(char *addr, const char *address);
+
+void _bt_convert_addr_type_to_string(char *address, unsigned char *addr);
+
+void _bt_convert_addr_type_to_secure_string(char *address, unsigned char *addr);
 
-void _bt_convert_addr_string_to_secure_string(char *addr,
-					const char *address);
+const char *_bt_convert_error_to_string(int error);
 
-void _bt_convert_addr_type_to_string(char *address,
-				unsigned char *addr);
+const char *_bt_convert_service_function_to_string(int function);
 
 int _bt_copy_utf8_string(char *dest, const char *src, unsigned int length);
 
@@ -316,10 +337,11 @@ typedef struct {
 
 int _bt_get_adapter_path(GDBusConnection *conn, char *path);
 char *_bt_get_device_object_path(char *address);
-int _bt_connect_profile(char *address, const char *uuid, void *cb,
+int _bt_connect_profile(char *address, char *uuid, void *cb,
 							gpointer func_data);
-int _bt_disconnect_profile(char *address, const char *uuid, void *cb,
+int _bt_disconnect_profile(char *address, char *uuid, void *cb,
 							gpointer func_data);
+int _bt_disconnect_ext_profile(char *address, char *path);
 
 int _bt_cancel_discovers(char *address);
 int _bt_discover_services(char *address, char *uuid, void *cb,
@@ -349,9 +371,9 @@ GDBusConnection *_bt_init_system_gdbus_conn(void);
 
 GDBusConnection *g_bus_get_private_conn(void);
 
-DBusGConnection *_bt_get_system_gconn(void);
+//GDBusConnection *_bt_get_system_gconn(void);
 
-DBusConnection *_bt_get_system_conn(void);
+//GDBusConnection *_bt_get_system_conn(void);
 
 int _bt_register_osp_server_in_agent(int type, char *uuid, char *path, int fd);
 int _bt_unregister_osp_server_in_agent(int type, char *uuid);
@@ -369,27 +391,29 @@ gboolean _bt_check_enabled_internal(void);
 
 void _bt_set_adapter_internal_status(gboolean enabled);
 
-int _bt_get_uuid_specification_name(const char *uuid, char **name);
+void _bt_convert_device_path_to_addr_type(const char *device_path,
+					  unsigned char *addr);
 
 void _bt_convert_device_path_to_address(const char *device_path,
-				char *device_address);
+					char *device_address);
 
 #ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT
-void _bt_rfcomm_server_free_all();
+void _bt_rfcomm_server_free_all(void);
+
+void _bt_rfcomm_server_disconnect_all(void);
+
+void _bt_rfcomm_client_disconnect_all(void);
 
 gboolean _check_uuid_path(char *path, char *uuid);
-#else
-int _get_rfcomm_server_id(char *uuid, gboolean *auto_accept);
-void _bt_rfcomm_server_set_pending_conn(int server_id, char *address);
 #endif
 
 void _bluetooth_hid_free_hid_info(void);
 
+int _bt_get_error_value_from_message(const char *error_message);
+
 void _bt_hdp_app_remove_obj_info(unsigned int channe_id);
 int _bt_hdp_app_acquire_fd(bt_hdp_connected_t *conn_info);
 
-bluetooth_device_info_t *_bt_get_device_info_in_message(GVariant *parameters, int *ret);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */