if (service->e_handle < value_handle) service->e_handle = value_handle;
service->characteristics.emplace_back(
- tBTA_GATTC_CHARACTERISTIC{.handle = value_handle,
+ tBTA_GATTC_CHARACTERISTIC{.value_handle = value_handle,
.properties = property,
.uuid = uuid,
.service = service});
if (!service) return NULL;
for (tBTA_GATTC_CHARACTERISTIC& charac : service->characteristics) {
- if (handle == charac.handle) return &charac;
+ if (handle == charac.value_handle) return &charac;
}
return NULL;
for (const tBTA_GATTC_CHARACTERISTIC& charac : service.characteristics) {
bta_gattc_fill_gatt_db_el(curr_db_attr, BTGATT_DB_CHARACTERISTIC,
- charac.handle, 0 /* s_handle */,
- 0 /* e_handle */, charac.handle, charac.uuid,
- charac.properties);
+ charac.value_handle, 0 /* s_handle */,
+ 0 /* e_handle */, charac.value_handle,
+ charac.uuid, charac.properties);
curr_db_attr++;
for (const tBTA_GATTC_DESCRIPTOR& desc : charac.descriptors) {
for (const tBTA_GATTC_SERVICE& service : p_srvc_cb->srvc_cache) {
for (const tBTA_GATTC_CHARACTERISTIC& charac : service.characteristics) {
- bta_gattc_fill_nv_attr(&nv_attr[i++], BTA_GATTC_ATTR_TYPE_CHAR,
- charac.handle, 0, charac.uuid, charac.properties,
- 0 /* incl_srvc_handle */, false);
+ bta_gattc_fill_nv_attr(
+ &nv_attr[i++], BTA_GATTC_ATTR_TYPE_CHAR, charac.value_handle, 0,
+ charac.uuid, charac.properties, 0 /* incl_srvc_handle */, false);
for (const tBTA_GATTC_DESCRIPTOR& desc : charac.descriptors) {
bta_gattc_fill_nv_attr(&nv_attr[i++], BTA_GATTC_ATTR_TYPE_CHAR_DESCR,
tBTA_HH_LE_RPT* p_rpt;
p_rpt = bta_hh_le_find_report_entry(
p_dev_cb, p_desc->characteristic->service->handle, GATT_UUID_HID_REPORT,
- p_desc->characteristic->handle);
+ p_desc->characteristic->value_handle);
if (p_rpt) bta_hh_le_save_report_ref(p_dev_cb, p_rpt, status, value, len);
}
switch (uuid16) {
case GATT_UUID_HID_CONTROL_POINT:
- p_dev_cb->hid_srvc.control_point_handle = charac.handle;
+ p_dev_cb->hid_srvc.control_point_handle = charac.value_handle;
break;
case GATT_UUID_HID_INFORMATION:
/* only one instance per HID service */
- gatt_queue_read_op(GATT_READ_CHAR, p_dev_cb->conn_id, charac.handle,
- read_hid_info_cb, p_dev_cb);
+ gatt_queue_read_op(GATT_READ_CHAR, p_dev_cb->conn_id,
+ charac.value_handle, read_hid_info_cb, p_dev_cb);
break;
case GATT_UUID_HID_REPORT_MAP:
/* only one instance per HID service */
- gatt_queue_read_op(GATT_READ_CHAR, p_dev_cb->conn_id, charac.handle,
- read_hid_report_map_cb, p_dev_cb);
+ gatt_queue_read_op(GATT_READ_CHAR, p_dev_cb->conn_id,
+ charac.value_handle, read_hid_report_map_cb,
+ p_dev_cb);
/* descriptor is optional */
- bta_hh_le_read_char_descriptor(p_dev_cb, charac.handle,
+ bta_hh_le_read_char_descriptor(p_dev_cb, charac.value_handle,
GATT_UUID_EXT_RPT_REF_DESCR,
read_ext_rpt_ref_desc_cb, p_dev_cb);
break;
case GATT_UUID_HID_REPORT:
p_rpt = bta_hh_le_find_alloc_report_entry(
p_dev_cb, p_dev_cb->hid_srvc.srvc_inst_id, GATT_UUID_HID_REPORT,
- charac.handle);
+ charac.value_handle);
if (p_rpt == NULL) {
APPL_TRACE_ERROR("%s: Add report entry failed !!!", __func__);
break;
if (p_rpt->rpt_type != BTA_HH_RPTT_INPUT) break;
- bta_hh_le_read_char_descriptor(p_dev_cb, charac.handle,
+ bta_hh_le_read_char_descriptor(p_dev_cb, charac.value_handle,
GATT_UUID_RPT_REF_DESCR,
read_report_ref_desc_cb, p_dev_cb);
break;
case GATT_UUID_HID_BT_MOUSE_INPUT:
case GATT_UUID_HID_BT_KB_INPUT:
if (bta_hh_le_find_alloc_report_entry(p_dev_cb, service->handle, uuid16,
- charac.handle) == NULL)
+ charac.value_handle) == NULL)
APPL_TRACE_ERROR("%s: Add report entry failed !!!", __func__);
break;
/* Make sure PROTO_MODE is processed as last */
for (const tBTA_GATTC_CHARACTERISTIC& charac : service->characteristics) {
if (charac.uuid == Uuid::From16Bit(GATT_UUID_HID_PROTO_MODE)) {
- p_dev_cb->hid_srvc.proto_mode_handle = charac.handle;
+ p_dev_cb->hid_srvc.proto_mode_handle = charac.value_handle;
bta_hh_le_set_protocol_mode(p_dev_cb, p_dev_cb->mode);
break;
}
for (const tBTA_GATTC_CHARACTERISTIC& charac : service.characteristics) {
if (charac.uuid == Uuid::From16Bit(GATT_UUID_SCAN_REFRESH)) {
- p_dev_cb->scan_refresh_char_handle = charac.handle;
+ p_dev_cb->scan_refresh_char_handle = charac.value_handle;
if (charac.properties & GATT_CHAR_PROP_BIT_NOTIFY)
p_dev_cb->scps_notify |= BTA_HH_LE_SCPS_NOTIFY_SPT;
for (const tBTA_GATTC_CHARACTERISTIC& charac : service.characteristics) {
if (charac.uuid == Uuid::From16Bit(GATT_UUID_GAP_PREF_CONN_PARAM)) {
/* read the char value */
- gatt_queue_read_op(GATT_READ_CHAR, p_dev_cb->conn_id, charac.handle,
- read_pref_conn_params_cb, p_dev_cb);
+ gatt_queue_read_op(GATT_READ_CHAR, p_dev_cb->conn_id,
+ charac.value_handle, read_pref_conn_params_cb,
+ p_dev_cb);
break;
}
app_id = p_dev_cb->app_id;
- p_rpt = bta_hh_le_find_report_entry(p_dev_cb, p_dev_cb->hid_srvc.srvc_inst_id,
- p_char->uuid.As16Bit(), p_char->handle);
+ p_rpt =
+ bta_hh_le_find_report_entry(p_dev_cb, p_dev_cb->hid_srvc.srvc_inst_id,
+ p_char->uuid.As16Bit(), p_char->value_handle);
if (p_rpt == NULL) {
APPL_TRACE_ERROR(
"%s: notification received for Unknown Report, uuid: %s, handle: "
"0x%04x",
- __func__, p_char->uuid.ToString().c_str(), p_char->handle);
+ __func__, p_char->uuid.ToString().c_str(), p_char->value_handle);
return;
}
if (status == GATT_SUCCESS) {
p_rpt = bta_hh_le_find_report_entry(p_dev_cb, p_char->service->handle,
- char_uuid, p_char->handle);
+ char_uuid, p_char->value_handle);
if (p_rpt != NULL && len) {
p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + len + 1);