Merge "Separate LE scanner from GATT client (3/4)"
am: 1f4fc31367

Change-Id: Ifcafcd480cbf5111dfa1575ca8127951bfd395df
diff --git a/include/hardware/bt_gatt_client.h b/include/hardware/bt_gatt_client.h
index 6cd8394..9387907 100644
--- a/include/hardware/bt_gatt_client.h
+++ b/include/hardware/bt_gatt_client.h
@@ -121,6 +121,10 @@
 typedef void (*register_client_callback)(int status, int client_if,
                 bt_uuid_t *app_uuid);
 
+/** Callback invoked in response to register_scanner */
+typedef void (*register_scanner_callback)(int status, int scanner_id,
+                bt_uuid_t *app_uuid);
+
 /** Callback for scan results */
 typedef void (*scan_result_callback)(bt_bdaddr_t* bda, int rssi, vector<uint8_t> adv_data);
 
@@ -224,6 +228,7 @@
 
 typedef struct {
     register_client_callback            register_client_cb;
+    register_scanner_callback           register_scanner_cb;
     scan_result_callback                scan_result_cb;
     connect_callback                    open_cb;
     disconnect_callback                 close_cb;
@@ -262,6 +267,12 @@
     /** Unregister a client application from the stack */
     bt_status_t (*unregister_client)(int client_if );
 
+    /** Registers a scanner with the stack */
+    bt_status_t (*register_scanner)( bt_uuid_t *uuid );
+
+    /** Unregister a scanner from the stack */
+    bt_status_t (*unregister_scanner)(int scanner_id );
+
     /** Start or stop LE device scanning */
     bt_status_t (*scan)( bool start );