X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fbluetooth-api.h;h=774a4b85316cd1be96b14adadc954ec82ea8d91d;hb=8a4d6b041afca0b8e0bdc8c3336a3d7d563988fa;hp=f7ee242806c03950aeea0e92e31b90c424b4efea;hpb=f08a5a6442836e23f4bce74cc188444e60438407;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/include/bluetooth-api.h b/include/bluetooth-api.h
index f7ee242..774a4b8 100644
--- a/include/bluetooth-api.h
+++ b/include/bluetooth-api.h
@@ -22,6 +22,8 @@
 #include <stdbool.h>
 #include <unistd.h>
 #include <glib.h>
+#include <stdint.h>
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,6 +58,8 @@ extern "C" {
 
 #define BLUETOOTH_OOB_DATA_LENGTH 16
 
+#define BLUETOOTH_LE_OOB_DATA_LENGTH 100
+
 #define BLUETOOTH_PIN_CODE_MAX_LENGTH 16
 
 #ifdef TIZEN_GATT_CLIENT
@@ -245,6 +249,7 @@ extern "C" {
 #define BLUETOOTH_ERROR_AUTH_FAILURE	0x05
 #define BLUETOOTH_ERROR_PIN_OR_KEY_MISSING	0x06
 #define BLUETOOTH_ERROR_CONNECTION_TIMEOUT	0x08
+#define BLUETOOTH_ERROR_CONNECTION_REJECTED_DUE_TO_SECURITY_REASONS 0x0e
 #define BLUETOOTH_ERROR_REMOTE_USER_TERM	0x13
 #define BLUETOOTH_ERROR_REMOTE_LOW_RESOURCES	0x14
 #define BLUETOOTH_ERROR_REMOTE_POWER_OFF	0x15
@@ -318,6 +323,26 @@ typedef struct {
 } bluetooth_device_pin_code_t;
 
 /**
+ * This is data for battery usage monitoring
+ */
+
+typedef struct {
+	time_t session_start_time;
+	time_t session_end_time;
+	uint16_t session_connected_time;
+	uint16_t session_scan_time;
+	GSList *atm_list;
+} bt_battery_data;
+
+typedef struct {
+	uid_t uid;
+	pid_t pid;
+	uint16_t rx_bytes;
+	uint16_t tx_bytes;
+	uint time;
+} bt_battery_app_data;
+
+/**
  * Adapter state
  */
 typedef enum {
@@ -584,6 +609,7 @@ typedef struct {
 	float interval_max;
 	guint8 filter_policy;
 	guint8 type;
+	int tx_power_level;
 } bluetooth_advertising_params_t;
 
 /**
@@ -595,6 +621,14 @@ typedef struct {
 	float window;  /**< LE scan window */
 } bluetooth_le_scan_params_t;
 
+/**
+* LE Scan type
+*/
+typedef enum {
+	BLUETOOTH_LE_PASSIVE_SCAN = 0x00,
+	BLUETOOTH_LE_ACTIVE_SCAN
+} bluetooth_le_scan_type_t;
+
 /*
 	LE Connection Update
  */
@@ -685,6 +719,7 @@ typedef enum {
 
 	BLUETOOTH_EVENT_ENABLED,		    /**< Bluetooth event adpater enabled */
 	BLUETOOTH_EVENT_DISABLED,		    /**< Bluetooth event adpater disabled */
+	BLUETOOTH_EVENT_DISABLED_BATTERY_DATA,      /**< Bluetooth event adapter disabled battery data*/
 	BLUETOOTH_EVENT_LE_ENABLED,		    /**< Bluetooth event adpater enabled */
 	BLUETOOTH_EVENT_LE_DISABLED,		    /**< Bluetooth event adpater disabled */
 	BLUETOOTH_EVENT_LOCAL_NAME_CHANGED,	    /**< Bluetooth event local name changed*/
@@ -807,6 +842,7 @@ typedef enum {
 	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 */
 	BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED, /** <GATT Characteristic/Descriptor Read Request event */
 	BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED, /** <GATT Characteristic/Descriptor Value change event */
@@ -1280,6 +1316,7 @@ typedef struct {
 	bluetooth_device_address_t device_address;  /**< remote device address */
 	bluetooth_device_name_t device_name;        /**< device name */
 	char str_passkey[BLUETOOTH_DEVICE_PASSKEY_LENGTH_MAX]; /**< pass-key string */
+	bool incoming; /**< stores if bonding request is incoming */
 } bluetooth_authentication_request_info_t;
 
 /**
@@ -1316,6 +1353,7 @@ typedef struct {
 	bluetooth_device_address_t device_addr;
 	unsigned char addr_type;
 	int disc_reason;
+	int rssi;
 } bt_connection_info_t;
 
 /**
@@ -1525,6 +1563,9 @@ typedef struct {
 	unsigned char randomizer256[BLUETOOTH_OOB_DATA_LENGTH];
 	unsigned int hash256_len;
 	unsigned int randomizer256_len;
+
+	unsigned char eir[BLUETOOTH_LE_OOB_DATA_LENGTH];
+	unsigned int eir_len;
 } bt_oob_data_t;
 
 /**
@@ -2370,6 +2411,9 @@ ret = bluetooth_disable_adapter();
 @endcode
  */
 int bluetooth_disable_adapter(void);
+int bluetooth_read_battery_data(bt_battery_data *latest);
+int bluetooth_set_battery_monitor_state(bool state);
+int bluetooth_get_battery_monitor_state(void);
 int bluetooth_recover_adapter(void);
 int bluetooth_check_adapter_le(void);
 int bluetooth_enable_adapter_le(void);
@@ -3221,7 +3265,7 @@ is_le_scanning = bluetooth_is_le_scanning ();
  */
 gboolean bluetooth_is_le_scanning(void);
 
-gboolean bluetooth_is_scan_filter_supported(void);
+int  bluetooth_is_scan_filter_supported(gboolean *is_supported);
 
 /**
  * @fn int bluetooth_force_hcidump(int timeout)
@@ -3243,7 +3287,7 @@ gboolean bluetooth_is_scan_filter_supported(void);
 int bluetooth_force_hcidump(int timeout);
 
 /**
- * @fn int bluetooth_register_scan_filter(bluetooth_le_scan_filter_t *filter, int *slot_id)
+ * @fn int bluetooth_register_scan_filter(bluetooth_le_scan_filter_t *filter)
  * @brief Register scan filter.
  *
  * This function registers the scan filter.
@@ -3253,41 +3297,10 @@ int bluetooth_force_hcidump(int timeout);
  * @return	BLUETOOTH_ERROR_NONE - Success \n
  *
  * @param[in]   filter   scan filter to register
- * @param[out]  slot_id  the slot ID of scan filter
  *
  * @remark      None
  */
-int bluetooth_register_scan_filter(bluetooth_le_scan_filter_t *filter, int *slot_id);
-
-/**
- * @fn int bluetooth_unregister_scan_filter(int slot_id)
- * @brief Register scan filter.
- *
- * This function unregisters the scan filter.
- *
- * This function is a synchronous call.
- *
- * @return	BLUETOOTH_ERROR_NONE - Success \n
- *
- * @param[in]   slot_id  the slot ID of scan filter
- *
- * @remark      None
- */
-int bluetooth_unregister_scan_filter(int slot_id);
-
-/**
- * @fn int bluetooth_unregister_all_scan_filters(void)
- * @brief Register scan filter.
- *
- * This function usregisters all scan filters.
- *
- * This function is a synchronous call.
- *
- * @return	BLUETOOTH_ERROR_NONE - Success \n
- *
- * @remark      None
- */
-int bluetooth_unregister_all_scan_filters(void);
+int bluetooth_register_scan_filter(bluetooth_le_scan_filter_t *filter);
 
 /**
  * @fn int bluetooth_enable_rssi(const bluetooth_device_address_t *remote_address,
@@ -5222,6 +5235,51 @@ int bluetooth_oob_add_remote_data(
 int bluetooth_oob_remove_remote_data(
 			const bluetooth_device_address_t *remote_device_address);
 
+
+/**
+ * @fn int bluetooth_le_oob_read_local_data(bt_oob_data_t *local_oob_data)
+ * @brief Read the local Hash and Randmizer.
+ *
+ * This function is a synchronous call.
+ *
+ * @return   BLUETOOTH_ERROR_NONE  - Success \n
+ *           BLUETOOTH_ERROR_INTERNAL - Internal Error \n
+ *
+ * @exception  None
+ * @param[in]  None.
+ * @param[out] local_oob_data - Pointer to the local OOB data
+ *
+ * @remark       None
+ * @see	None
+ */
+int bluetooth_le_oob_read_local_data(bt_oob_data_t *local_oob_data);
+
+/**
+ * @fn int bluetooth_le_oob_add_remote_data(
+ *			const bluetooth_device_address_t *remote_device_address,
+ *			bluetooth_bdaddr_type_e address_type,
+ *			bt_oob_data_t *oob_data)
+ * @brief Add/updated the remote device  Hash and Randmizer.
+ *
+ * This function is a synchronous call.
+ * No event for this api..
+ *
+ * @return   BLUETOOTH_ERROR_NONE  - Success \n
+ *           BLUETOOTH_ERROR_INTERNAL - Internal Error \n
+ *
+ * @exception	None
+ * @param[in] remote_device_address - Remote device address
+  *	      address_type - bdaddr type
+ *	      remote_oob_data - Ponter to Hash and Randomizer oob data structure
+ *
+ * @remark	None
+ * @see		None
+ */
+int bluetooth_le_oob_add_remote_data(
+			const bluetooth_device_address_t *remote_device_address,
+			bluetooth_bdaddr_type_e address_type,
+			bt_oob_data_t *remote_oob_data);
+
 /**
  * @fn int bluetooth_gatt_get_primary_services(const bluetooth_device_address_t *address,
  *						bt_gatt_handle_info_t *prim_svc);
@@ -6231,6 +6289,26 @@ int bluetooth_set_scan_response_data(int handle, const bluetooth_scan_resp_data_
 int bluetooth_set_scan_parameters(bluetooth_le_scan_params_t *params);
 
 /**
+ * @fn intbluetooth_set_scan_type(bluetooth_le_scan_type_t scan_type);
+ *ss
+ * @brief Set scan type
+ *
+ * This function is used to set LE scan type
+ *
+ * This function is a synchronous call.
+ *
+ * @return	BLUETOOTH_ERROR_NONE - Success \n
+ *		BLUETOOTH_ERROR_DEVICE_NOT_ENABLED - Adapter is not enabled \n
+ *		BLUETOOTH_ERROR_INTERNAL - Internal IPC error \n
+ *
+ * @exception	None
+ * @param[in]	scan_type - LE scan type
+ *
+ * @remark	None
+ */
+int bluetooth_set_scan_type(bluetooth_le_scan_type_t scan_type);
+
+/**
  * @fn int bluetooth_is_advertising(void)
  * @brief Check for the advertising is in-progress or not.
  *