diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2016-06-20 22:35:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-20 22:35:49 +0000 |
| commit | 8a86bd2c76864c639aa2a29f250dcf2bdaff0ccc (patch) | |
| tree | 2495b434a1ff1f7445991be7959d972e5bca0e8d | |
| parent | f21a41a8c63ed661a51caa5e422f3d5623f262cd (diff) | |
| parent | daaed0c79606163c77092aa5a97f58830bfa49dc (diff) | |
| download | libhardware-8a86bd2c76864c639aa2a29f250dcf2bdaff0ccc.tar.gz | |
Merge "Vectors as parameters to GATT (3/3)"
| -rw-r--r-- | include/hardware/bt_gatt_client.h | 19 | ||||
| -rw-r--r-- | include/hardware/bt_gatt_server.h | 4 |
2 files changed, 11 insertions, 12 deletions
diff --git a/include/hardware/bt_gatt_client.h b/include/hardware/bt_gatt_client.h index 86991b1d..68dc3c7a 100644 --- a/include/hardware/bt_gatt_client.h +++ b/include/hardware/bt_gatt_client.h @@ -122,7 +122,7 @@ typedef void (*register_client_callback)(int status, int client_if, bt_uuid_t *app_uuid); /** Callback for scan results */ -typedef void (*scan_result_callback)(bt_bdaddr_t* bda, int rssi, uint8_t* adv_data); +typedef void (*scan_result_callback)(bt_bdaddr_t* bda, int rssi, vector<uint8_t> adv_data); /** GATT open callback invoked in response to open */ typedef void (*connect_callback)(int conn_id, int status, int client_if, bt_bdaddr_t* bda); @@ -213,7 +213,7 @@ typedef void (*batchscan_enable_disable_callback)(int action, int client_if, int /** Callback invoked when batchscan reports are obtained */ typedef void (*batchscan_reports_callback)(int client_if, int status, int report_format, - int num_records, int data_len, uint8_t* rep_data); + int num_records, vector<uint8_t> data); /** Callback invoked when batchscan storage threshold limit is crossed */ typedef void (*batchscan_threshold_callback)(int client_if); @@ -344,8 +344,8 @@ typedef struct { 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, int data_len, char* p_data, int mask_len, - char* p_mask); + char addr_type, vector<uint8_t> data, + vector<uint8_t> p_mask); /** Clear all scan filter conditions for specific filter index*/ bt_status_t (*scan_filter_clear)(int client_if, int filt_index); @@ -359,9 +359,9 @@ typedef struct { /** Set the advertising data or scan response data */ bt_status_t (*set_adv_data)(int client_if, bool set_scan_rsp, bool include_name, bool include_txpower, int min_interval, int max_interval, int appearance, - uint16_t manufacturer_len, char* manufacturer_data, - uint16_t service_data_len, char* service_data, - uint16_t service_uuid_len, char* service_uuid); + vector<uint8_t> manufacturer_data, + vector<uint8_t> service_data, + vector<uint8_t> service_uuid); /** Configure the MTU for a given connection */ bt_status_t (*configure_mtu)(int conn_id, int mtu); @@ -383,9 +383,8 @@ typedef struct { /* Setup the data for the specified instance */ bt_status_t (*multi_adv_set_inst_data)(int client_if, bool set_scan_rsp, bool include_name, - bool incl_txpower, int appearance, int manufacturer_len, - char* manufacturer_data, int service_data_len, - char* service_data, int service_uuid_len, char* service_uuid); + 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 client_if); diff --git a/include/hardware/bt_gatt_server.h b/include/hardware/bt_gatt_server.h index d2fdda3f..f0eb1b27 100644 --- a/include/hardware/bt_gatt_server.h +++ b/include/hardware/bt_gatt_server.h @@ -94,8 +94,8 @@ typedef void (*request_read_callback)(int conn_id, int trans_id, bt_bdaddr_t *bd * characteristic or descriptor. */ typedef void (*request_write_callback)(int conn_id, int trans_id, bt_bdaddr_t *bda, - int attr_handle, int offset, int length, - bool need_rsp, bool is_prep, uint8_t* value); + int attr_handle, int offset, bool need_rsp, + bool is_prep, vector<uint8_t> value); /** Callback invoked when a previously prepared write is to be executed */ typedef void (*request_exec_write_callback)(int conn_id, int trans_id, |