X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fbluetooth-api.h;h=47aa397d512b449a96114992f11755d78a5e4e5c;hb=89402339a81775d534510fb74c539f10655ef6c2;hp=80988d13db3d0dd0872b87b060d81e00e9a6902a;hpb=4fb3c2ae989c0df21db2c03c37ec103658d3f97e;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/include/bluetooth-api.h b/include/bluetooth-api.h
index 80988d1..47aa397 100644
--- a/include/bluetooth-api.h
+++ b/include/bluetooth-api.h
@@ -62,9 +62,7 @@ extern "C" {
 
 #define BLUETOOTH_PIN_CODE_MAX_LENGTH 16
 
-#ifdef TIZEN_GATT_CLIENT
 #define BLUETOOTH_GATT_ATT_DATA_LENGTH_MAX      610 /**< GATT ATT value max len */
-#endif
 
 /**
  * This is Bluetooth Connected event role
@@ -837,15 +835,10 @@ typedef enum {
 	BLUETOOTH_EVENT_GATT_READ_DESC, /**<Gatt Read Characteristic Descriptor Value */
 	BLUETOOTH_EVENT_GATT_WRITE_DESC, /**<Gatt Write Characteristic Descriptor Value */
 	BLUETOOTH_EVENT_GATT_SVC_CHAR_DESC_DISCOVERED, /**<Gatt Char Descriptors Discovered Event*/
-#ifdef TIZEN_GATT_CLIENT
 	BLUETOOTH_EVENT_GATT_SERVER_CONNECTED,/**<Local Gatt Server connected event */
 	BLUETOOTH_EVENT_GATT_SERVER_DISCONNECTED, /**<Local Gatt Server Disconnected event */
 	BLUETOOTH_EVENT_GATT_CLIENT_CONNECTED,/**<Local Gatt Client connected event */
 	BLUETOOTH_EVENT_GATT_CLIENT_DISCONNECTED, /**<Local Gatt Client Disconnected event */
-#else
-	BLUETOOTH_EVENT_GATT_CONNECTED,/**<Gatt connected event */
-	BLUETOOTH_EVENT_GATT_DISCONNECTED, /**<Gatt Disconnected event */
-#endif
 	BLUETOOTH_EVENT_GATT_ATT_MTU_CHANGED, /**<Attribute protocol MTU changed event */
 	BLUETOOTH_EVENT_GATT_SERVER_ATT_MTU_CHANGED, /**<Attribute protocol Server MTU changed event */
 	BLUETOOTH_EVENT_GATT_SERVER_CHARACTERISTIC_VALUE_CHANGED, /**<Gatt Char write callback event */
@@ -1599,13 +1592,10 @@ typedef struct {
 typedef struct {
 	int count;
 	char **handle;
-#ifdef TIZEN_GATT_CLIENT
 	char uuids[BLUETOOTH_MAX_SERVICES_FOR_DEVICE][BLUETOOTH_UUID_STRING_MAX];
 	int inst_id[BLUETOOTH_MAX_SERVICES_FOR_DEVICE];
-#endif
 } bt_gatt_handle_info_t;
 
-#ifdef TIZEN_GATT_CLIENT
 /**
  * Structure to a most basic GATT attribute handle data
  */
@@ -1614,7 +1604,6 @@ typedef struct {
 	unsigned char uuid[16];
 	char address[BLUETOOTH_ADDRESS_STRING_LENGTH];
 } bt_gatt_handle_property_t;
-#endif
 
 /**
  * Structure to GATT Remote service data
@@ -1626,9 +1615,7 @@ typedef struct {
 	gboolean primary;
 	bt_gatt_handle_info_t include_handles;
 	bt_gatt_handle_info_t char_handle;
-#ifdef TIZEN_GATT_CLIENT
 	bt_gatt_handle_property_t prop; /* Added Service UUID, instance_id & associated remote device  */
-#endif
 } bt_gatt_service_property_t;
 
 /**
@@ -1667,12 +1654,10 @@ typedef struct {
 	unsigned int permission;
 	char *representation;
 	bt_gatt_handle_info_t char_desc_handle;
-#ifdef TIZEN_GATT_CLIENT
 	bt_gatt_handle_property_t prop;      /* Added Char UUID, instance_id */
 	bt_gatt_handle_property_t svc_prop;  /* Added Service UUID, instance_id */
 	char value[BLUETOOTH_GATT_ATT_DATA_LENGTH_MAX]; /* Added */
 	char address[BLUETOOTH_ADDRESS_STRING_LENGTH];         /* Added */
-#endif
 } bt_gatt_char_property_t;
 
 /**
@@ -1684,13 +1669,11 @@ typedef struct {
 	char *uuid;
 	unsigned char *val;
 	unsigned int val_len;
-#ifdef TIZEN_GATT_CLIENT
 	bt_gatt_handle_property_t prop;      /* Added Descriptor UUID, instance_id */
 	bt_gatt_handle_property_t char_prop; /* Added Char UUID, instance_id */
 	bt_gatt_handle_property_t svc_prop;  /* Added Service UUID, instance_id */
 	char value[BLUETOOTH_GATT_ATT_DATA_LENGTH_MAX];/* Added */
 	char address[BLUETOOTH_ADDRESS_STRING_LENGTH];          /* Added */
-#endif
 } bt_gatt_char_descriptor_property_t;
 
 /**
@@ -1739,10 +1722,8 @@ typedef struct {
 	bluetooth_device_address_t device_addr;
 	char *svc_path;
 	bluetooth_gatt_service_change_type_t change_type;
-#ifdef TIZEN_GATT_CLIENT
 	int inst_id;
 	char *uuid;
-#endif
 } bt_gatt_service_change_t;
 
 /**
@@ -5694,19 +5675,11 @@ int bluetooth_gatt_free_char_property(bt_gatt_char_property_t *char_pty);
  */
 int bluetooth_gatt_free_desc_property(bt_gatt_char_descriptor_property_t *desc_pty);
 
-#ifdef TIZEN_GATT_CLIENT
 int bluetooth_connect_le(const bluetooth_device_address_t *device_address,
 				gboolean auto_connect, int client_id);
-#else
-int bluetooth_connect_le(const bluetooth_device_address_t *device_address, gboolean auto_connect);
-#endif
 
-#ifdef TIZEN_GATT_CLIENT
 int bluetooth_disconnect_le(const bluetooth_device_address_t *device_address,
 		int client_id);
-#else
-int bluetooth_disconnect_le(const bluetooth_device_address_t *device_address);
-#endif
 
 int bluetooth_get_gatt_data_batching_available_packets(
 	int *available_packets);