diff options
author | Satya Calloji <satyac@broadcom.com> | 2015-02-10 09:20:07 -0800 |
---|---|---|
committer | Prerepa Viswanadham <dham@google.com> | 2015-03-27 09:40:52 -0700 |
commit | a8b49d3feed67d6bc03054d466e885140e52ff39 (patch) | |
tree | be5c8602336799385d2ddaef3da065adb9e0c34f | |
parent | 15a5a06e7ce0ad04ea49ad7bb5226d5e98560145 (diff) | |
download | hardware_libhardware-a8b49d3feed67d6bc03054d466e885140e52ff39.zip hardware_libhardware-a8b49d3feed67d6bc03054d466e885140e52ff39.tar.gz hardware_libhardware-a8b49d3feed67d6bc03054d466e885140e52ff39.tar.bz2 |
OnFound/OnLost feature API changes based on spec v0.90
Bug: 19609671
Change-Id: Id28e188159aa41c940723fb5b12cade0a48e506b
-rw-r--r-- | include/hardware/bluetooth.h | 5 | ||||
-rw-r--r-- | include/hardware/bt_common_types.h | 44 | ||||
-rw-r--r-- | include/hardware/bt_gatt_client.h | 26 |
3 files changed, 67 insertions, 8 deletions
diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h index 74cd1fc..75c9e9c 100644 --- a/include/hardware/bluetooth.h +++ b/include/hardware/bluetooth.h @@ -143,14 +143,15 @@ typedef struct typedef struct { + uint16_t version_supported; uint8_t local_privacy_enabled; uint8_t max_adv_instance; uint8_t rpa_offload_supported; uint8_t max_irk_list_size; uint8_t max_adv_filter_supported; - uint8_t scan_result_storage_size_lobyte; - uint8_t scan_result_storage_size_hibyte; uint8_t activity_energy_info_supported; + uint16_t scan_result_storage_size; + uint16_t total_trackable_advertisers; }bt_local_le_features_t; /* Bluetooth Adapter and Remote Device property types */ diff --git a/include/hardware/bt_common_types.h b/include/hardware/bt_common_types.h new file mode 100644 index 0000000..f1e0984 --- /dev/null +++ b/include/hardware/bt_common_types.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/****************************************************************************** + * + * This file contains constants and definitions that can be used commonly between JNI and stack layer + * + ******************************************************************************/ +#ifndef ANDROID_INCLUDE_BT_COMMON_TYPES_H +#define ANDROID_INCLUDE_BT_COMMON_TYPES_H + +#include "bluetooth.h" + +typedef struct +{ + uint8_t client_if; + uint8_t filt_index; + uint8_t advertiser_state; + uint8_t advertiser_info_present; + uint8_t addr_type; + uint8_t tx_power; + uint8_t rssi_value; + uint16_t time_stamp; + bt_bdaddr_t bd_addr; + uint8_t adv_pkt_len; + uint8_t *p_adv_pkt_data; + uint8_t scan_rsp_len; + uint8_t *p_scan_rsp_data; +} btgatt_track_adv_info_t; + +#endif /* ANDROID_INCLUDE_BT_COMMON_TYPES_H */ diff --git a/include/hardware/bt_gatt_client.h b/include/hardware/bt_gatt_client.h index 8073dd1..7881dc8 100644 --- a/include/hardware/bt_gatt_client.h +++ b/include/hardware/bt_gatt_client.h @@ -20,6 +20,7 @@ #include <stdint.h> #include "bt_gatt_types.h" +#include "bt_common_types.h" __BEGIN_DECLS @@ -69,6 +70,23 @@ typedef struct typedef struct { + uint8_t client_if; + uint8_t action; + uint8_t filt_index; + uint16_t feat_seln; + uint16_t list_logic_type; + uint8_t filt_logic_type; + uint8_t rssi_high_thres; + uint8_t rssi_low_thres; + uint8_t dely_mode; + uint16_t found_timeout; + uint16_t lost_timeout; + uint8_t found_timeout_cnt; + uint16_t num_of_tracking_entries; +} btgatt_filt_param_setup_t; + +typedef struct +{ bt_bdaddr_t *bda1; bt_uuid_t *uuid1; uint16_t u1; @@ -202,8 +220,7 @@ typedef void (*batchscan_reports_callback)(int client_if, int status, int report typedef void (*batchscan_threshold_callback)(int client_if); /** Track ADV VSE callback invoked when tracked device is found or lost */ -typedef void (*track_adv_event_callback)(int client_if, int filt_index, int addr_type, - bt_bdaddr_t* bda, int adv_state); +typedef void (*track_adv_event_callback)(btgatt_track_adv_info_t *p_track_adv_info); typedef struct { register_client_callback register_client_cb; @@ -336,10 +353,7 @@ typedef struct { bt_status_t (*read_remote_rssi)( int client_if, const bt_bdaddr_t *bd_addr); /** Setup scan filter params */ - bt_status_t (*scan_filter_param_setup)(int client_if, int action, int filt_index, int feat_seln, - int list_logic_type, int filt_logic_type, int rssi_high_thres, - int rssi_low_thres, int dely_mode, int found_timeout, - int lost_timeout, int found_timeout_cnt); + bt_status_t (*scan_filter_param_setup)(btgatt_filt_param_setup_t filt_param); /** Configure a scan filter condition */ |