commit 9e1a02cc5e3dbb5d34ecdf1e5bece1daf9fabd2f
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 13 08:30:26 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 13 08:30:27 2016 +0000
tree 35b54f7a2393726dbcb4928f0754fb06ee60cf10
parent e7a66b9abcdaddb2066c0ab03ffd93fd1885d5c9
parent bb84c86f5a7e600f2fa70330d6dfc6f0a8197985

Merge "Bluetooth: split setting params and enabling  advertising (2/3)"

include/hardware/ble_advertiser.h

diff --git a/include/hardware/ble_advertiser.h b/include/hardware/ble_advertiser.h
index e7c169c..389bdbb 100644
--- a/include/hardware/ble_advertiser.h
+++ b/include/hardware/ble_advertiser.h
@@ -31,24 +31,20 @@
 typedef void (*register_advertiser_callback)(int status, int advertiser_id,
                                              bt_uuid_t *uuid);
 
-/** Callback invoked when multi-adv enable operation has completed */
-typedef void (*multi_adv_enable_callback)(int advertiser_id, int status);
-
-/** Callback invoked when multi-adv param update operation has completed */
-typedef void (*multi_adv_update_callback)(int advertiser_id, int status);
+/** Callback invoked when multi-adv param set_params operation has completed */
+typedef void (*multi_adv_set_params_callback)(int advertiser_id, int status);
 
 /** Callback invoked when multi-adv instance data set operation has completed */
 typedef void (*multi_adv_data_callback)(int advertiser_id, int status);
 
-/** Callback invoked when multi-adv disable operation has completed */
-typedef void (*multi_adv_disable_callback)(int advertiser_id, int status);
+/** Callback invoked when multi-adv enable operation has completed */
+typedef void (*multi_adv_enable_callback)(int advertiser_id, int status, bool enable);
 
 typedef struct {
     register_advertiser_callback        register_advertiser_cb;
-    multi_adv_enable_callback           multi_adv_enable_cb;
-    multi_adv_update_callback           multi_adv_update_cb;
+    multi_adv_set_params_callback       multi_adv_set_params_cb;
     multi_adv_data_callback             multi_adv_data_cb;
-    multi_adv_disable_callback          multi_adv_disable_cb;
+    multi_adv_enable_callback           multi_adv_enable_cb;
 } ble_advertiser_callbacks_t;
 
 typedef struct {
@@ -65,21 +61,18 @@
                     vector<uint8_t> service_data,
                     vector<uint8_t> service_uuid);
 
-    /* Set up the parameters as per spec, user manual specified values and enable multi ADV */
-    bt_status_t (*multi_adv_enable)(int advertiser_id, int min_interval,int max_interval,int adv_type,
-                 int chnl_map, int tx_power, int timeout_s);
+    /* Set the parameters as per spec, user manual specified values */
+    bt_status_t (*multi_adv_set_params)(int advertiser_id, int min_interval,int max_interval,int adv_type,
+                 int chnl_map, int tx_power);
 
-    /* Update the parameters as per spec, user manual specified values and restart multi ADV */
-    bt_status_t (*multi_adv_update)(int advertiser_id, int min_interval,int max_interval,int adv_type,
-                 int chnl_map, int tx_power, int timeout_s);
 
     /* Setup the data for the specified instance */
     bt_status_t (*multi_adv_set_inst_data)(int advertiser_id, bool set_scan_rsp, bool include_name,
                     bool incl_txpower, int appearance, vector<uint8_t> manufacturer_data,
                     vector<uint8_t> service_data, vector<uint8_t> service_uuid);
 
-    /* Disable the multi adv instance */
-    bt_status_t (*multi_adv_disable)(int advertiser_id);
+    /* Enable the advertising instance as per spec */
+    bt_status_t (*multi_adv_enable)(int advertiser_id, bool enable, int timeout_s);
 
 } ble_advertiser_interface_t;