From 62ddb5d520ed47c51fc6cecaf3c782e5f234519c Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Thu, 16 Feb 2017 11:57:11 -0800 Subject: Use base::Callbacks in BleScannerInterface (1/3) The remaining four native callbacks need more internal refactoring before they can be turned into a callbacks. Bug: 30622771 Test: sl4a FilteringTest Change-Id: I5aea0485c88605d34ccf8e0a27202469bb5c0ff4 --- include/hardware/ble_scanner.h | 73 +++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 43 deletions(-) diff --git a/include/hardware/ble_scanner.h b/include/hardware/ble_scanner.h index 273cbc5e..4ab0a77f 100644 --- a/include/hardware/ble_scanner.h +++ b/include/hardware/ble_scanner.h @@ -23,13 +23,6 @@ #include "bt_gatt_client.h" #include "bt_gatt_types.h" -/** Callback invoked when batchscan storage config operation has completed */ -typedef void (*batchscan_cfg_storage_callback)(int client_if, int status); - -/** Callback invoked when batchscan enable / disable operation has completed */ -typedef void (*batchscan_enable_disable_callback)(int action, int client_if, - int status); - /** Callback invoked when batchscan reports are obtained */ typedef void (*batchscan_reports_callback)(int client_if, int status, int report_format, int num_records, @@ -42,10 +35,6 @@ typedef void (*batchscan_threshold_callback)(int client_if); typedef void (*track_adv_event_callback)( btgatt_track_adv_info_t *p_track_adv_info); -/** Callback invoked when scan parameter setup has completed */ -typedef void (*scan_parameter_setup_completed_callback)(int client_if, - btgattc_error_t status); - /** Callback for scan results */ typedef void (*scan_result_callback)(uint16_t event_type, uint8_t addr_type, bt_bdaddr_t *bda, uint8_t primary_phy, @@ -54,29 +43,11 @@ typedef void (*scan_result_callback)(uint16_t event_type, uint8_t addr_type, int8_t rssi, uint16_t periodic_adv_int, std::vector adv_data); -/** Callback invoked when a scan filter configuration command has completed */ -typedef void (*scan_filter_cfg_callback)(int action, int client_if, int status, - int filt_type, int avbl_space); - -/** Callback invoked when scan param has been added, cleared, or deleted */ -typedef void (*scan_filter_param_callback)(int action, int client_if, - int status, int avbl_space); - -/** Callback invoked when a scan filter configuration command has completed */ -typedef void (*scan_filter_status_callback)(int enable, int client_if, - int status); - typedef struct { scan_result_callback scan_result_cb; - batchscan_cfg_storage_callback batchscan_cfg_storage_cb; - batchscan_enable_disable_callback batchscan_enb_disable_cb; batchscan_reports_callback batchscan_reports_cb; batchscan_threshold_callback batchscan_threshold_cb; track_adv_event_callback track_adv_event_cb; - scan_parameter_setup_completed_callback scan_parameter_setup_completed_cb; - scan_filter_cfg_callback scan_filter_cfg_cb; - scan_filter_param_callback scan_filter_param_cb; - scan_filter_status_callback scan_filter_status_cb; } btgatt_scanner_callbacks_t; class BleScannerInterface { @@ -86,6 +57,19 @@ class BleScannerInterface { using RegisterCallback = base::Callback; + using Callback = base::Callback; + + using EnableCallback = + base::Callback; + + using FilterParamSetupCallback = + base::Callback; + + using FilterConfigCallback = + base::Callback; + /** Registers a scanner with the stack */ virtual void RegisterScanner(RegisterCallback) = 0; @@ -98,39 +82,42 @@ class BleScannerInterface { /** Setup scan filter params */ virtual void ScanFilterParamSetup( uint8_t client_if, uint8_t action, uint8_t filt_index, - std::unique_ptr filt_param) = 0; + std::unique_ptr filt_param, + FilterParamSetupCallback cb) = 0; /** Configure a scan filter condition */ - virtual void ScanFilterAddRemove(int client_if, int action, int filt_type, - int filt_index, int company_id, - int company_id_mask, const bt_uuid_t *p_uuid, + virtual void ScanFilterAddRemove(int action, int filt_type, int filt_index, + int company_id, int company_id_mask, + const bt_uuid_t *p_uuid, const bt_uuid_t *p_uuid_mask, const bt_bdaddr_t *bd_addr, char addr_type, std::vector data, - std::vector p_mask) = 0; + std::vector p_mask, + FilterConfigCallback cb) = 0; /** Clear all scan filter conditions for specific filter index*/ - virtual void ScanFilterClear(int client_if, int filt_index) = 0; + virtual void ScanFilterClear(int filt_index, FilterConfigCallback cb) = 0; /** Enable / disable scan filter feature*/ - virtual void ScanFilterEnable(int client_if, bool enable) = 0; + virtual void ScanFilterEnable(bool enable, EnableCallback cb) = 0; /** Sets the LE scan interval and window in units of N*0.625 msec */ - virtual void SetScanParameters(int client_if, int scan_interval, - int scan_window) = 0; + virtual void SetScanParameters(int scan_interval, int scan_window, + Callback cb) = 0; /* Configure the batchscan storage */ virtual void BatchscanConfigStorage(int client_if, int batch_scan_full_max, int batch_scan_trunc_max, - int batch_scan_notify_threshold) = 0; + int batch_scan_notify_threshold, + Callback cb) = 0; /* Enable batchscan */ - virtual void BatchscanEnable(int client_if, int scan_mode, int scan_interval, - int scan_window, int addr_type, - int discard_rule) = 0; + virtual void BatchscanEnable(int scan_mode, int scan_interval, + int scan_window, int addr_type, int discard_rule, + Callback cb) = 0; /* Disable batchscan */ - virtual void BatchscanDisable(int client_if) = 0; + virtual void BatchscanDisable(Callback cb) = 0; /* Read out batchscan reports */ virtual void BatchscanReadReports(int client_if, int scan_mode) = 0; -- cgit v1.2.3