diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2016-12-19 22:23:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-19 22:23:41 +0000 |
| commit | 452dc05ff0913d008f4bfd3b9204ee9385ed2947 (patch) | |
| tree | 596bdf5f41422b4df3352e875ebb89f945b180c7 | |
| parent | f43056dc4d06eecd46a2299e5ef8ef8891e2c414 (diff) | |
| parent | b4a82ba5564369f1f18fa233ea24d9cb73f43ce4 (diff) | |
| download | libhardware-452dc05ff0913d008f4bfd3b9204ee9385ed2947.tar.gz | |
Merge "BLE scan filter setup simplification (1/3)"
| -rw-r--r-- | include/hardware/ble_scanner.h | 5 | ||||
| -rw-r--r-- | include/hardware/bt_common_types.h | 15 | ||||
| -rw-r--r-- | include/hardware/bt_gatt_client.h | 17 |
3 files changed, 18 insertions, 19 deletions
diff --git a/include/hardware/ble_scanner.h b/include/hardware/ble_scanner.h index f2a93701..62b6399b 100644 --- a/include/hardware/ble_scanner.h +++ b/include/hardware/ble_scanner.h @@ -92,8 +92,9 @@ class BleScannerInterface { virtual void Scan(bool start) = 0; /** Setup scan filter params */ - virtual bt_status_t scan_filter_param_setup( - btgatt_filt_param_setup_t filt_param) = 0; + virtual void ScanFilterParamSetup(uint8_t client_if, uint8_t action, + uint8_t filt_index, + std::unique_ptr<btgatt_filt_param_setup_t> filt_param) = 0; /** Configure a scan filter condition */ virtual bt_status_t scan_filter_add_remove( diff --git a/include/hardware/bt_common_types.h b/include/hardware/bt_common_types.h index 1e6be6b2..cff30729 100644 --- a/include/hardware/bt_common_types.h +++ b/include/hardware/bt_common_types.h @@ -73,4 +73,19 @@ typedef struct uint16_t permissions; } btgatt_db_element_t; +typedef struct +{ + 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; + + #endif /* ANDROID_INCLUDE_BT_COMMON_TYPES_H */ diff --git a/include/hardware/bt_gatt_client.h b/include/hardware/bt_gatt_client.h index 43228523..76b52fd3 100644 --- a/include/hardware/bt_gatt_client.h +++ b/include/hardware/bt_gatt_client.h @@ -68,23 +68,6 @@ 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; |