Merge "system/stack/srvc: Migrate to libbluetooth_log" into main (f061fc25) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/srvc/srvc_dis.cc

+17 −18

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#define LOG_TAG "bt_srvc"

		#include <base/logging.h>
		#include <bluetooth/log.h>

		#include "gatt_api.h"
		#include "hardware/bt_gatt_types.h"
		@@ -33,6 +34,8 @@
		#include "types/raw_address.h"

		using base::StringPrintf;
		using namespace bluetooth;

		#define DIS_MAX_NUM_INC_SVR 0
		#define DIS_MAX_CHAR_NUM 9
		#define DIS_MAX_ATTR_NUM (DIS_MAX_CHAR_NUM * 2 + DIS_MAX_NUM_INC_SVR + 1)
		@@ -160,8 +163,7 @@ uint8_t dis_read_attr_value(UNUSED_ATTR uint8_t clcb_idx, uint16_t handle,
		p_value->len -= offset;
		pp += offset;
		ARRAY_TO_STREAM(p, pp, p_value->len);
		VLOG(1) << "GATT_UUID_MANU_NAME len=0x" << std::hex
		<< +p_value->len;
		log::verbose("GATT_UUID_MANU_NAME len=0x{:x}", p_value->len);
		}
		break;

		@@ -202,7 +204,7 @@ static void dis_gatt_c_read_dis_value_cmpl(uint16_t conn_id) {
		srvc_eng_release_channel(conn_id);

		if (dis_cb.p_read_dis_cback && p_clcb) {
		LOG_INFO("%s conn_id:%d attr_mask = 0x%04x", __func__, conn_id,
		log::info("conn_id:{} attr_mask = 0x{:04x}", conn_id,
		p_clcb->dis_value.attr_mask);

		(*dis_cb.p_read_dis_cback)(p_clcb->bda, &p_clcb->dis_value);
		@@ -237,8 +239,7 @@ bool dis_gatt_c_read_dis_req(uint16_t conn_id) {
		if (GATTC_Read(conn_id, GATT_READ_BY_TYPE, &param) == GATT_SUCCESS)
		return true;

		LOG(ERROR) << "Read DISInfo: " << param.service.uuid
		<< " GATT_Read Failed";
		log::error("Read DISInfo: {} GATT_Read Failed", param.service.uuid);
		}

		dis_cb.dis_read_uuid_idx++;
		@@ -264,9 +265,8 @@ void dis_c_cmpl_cback(tSRVC_CLCB* p_clcb, tGATTC_OPTYPE op, tGATT_STATUS status,
		uint8_t pp = NULL, p_str;
		uint16_t conn_id = p_clcb->conn_id;

		VLOG(1) << __func__
		<< StringPrintf("op_code: 0x%02x status: 0x%02x read_type: 0x%04x",
		op, status, read_type);
		log::verbose("op_code: 0x{:02x} status: 0x{:02x} read_type: 0x{:04x}", op,
		status, read_type);

		if (op != GATTC_OPTYPE_READ) return;

		@@ -275,7 +275,7 @@ void dis_c_cmpl_cback(tSRVC_CLCB* p_clcb, tGATTC_OPTYPE op, tGATT_STATUS status,

		switch (read_type) {
		case GATT_UUID_SYSTEM_ID:
		VLOG(1) << "DIS_ATTR_SYS_ID_BIT";
		log::verbose("DIS_ATTR_SYS_ID_BIT");
		if (p_data->att_value.len == DIS_SYSTEM_ID_SIZE) {
		p_clcb->dis_value.attr_mask \|= DIS_ATTR_SYS_ID_BIT;
		/* save system ID*/
		@@ -334,7 +334,7 @@ tDIS_STATUS DIS_SrInit(tDIS_ATTR_MASK dis_attr_mask) {
		tGATT_STATUS status;

		if (dis_cb.enabled) {
		LOG(ERROR) << "DIS already initalized";
		log::error("DIS already initalized");
		return DIS_SUCCESS;
		}

		@@ -365,7 +365,7 @@ tDIS_STATUS DIS_SrInit(tDIS_ATTR_MASK dis_attr_mask) {
		status = GATTS_AddService(srvc_eng_cb.gatt_if, service,
		sizeof(service) / sizeof(btgatt_db_element_t));
		if (status != GATT_SERVICE_STARTED) {
		LOG(ERROR) << "Can not create service, DIS_Init failed!";
		log::error("Can not create service, DIS_Init failed!");
		return GATT_ERROR;
		}

		@@ -375,9 +375,8 @@ tDIS_STATUS DIS_SrInit(tDIS_ATTR_MASK dis_attr_mask) {
		for (int i = 0; i < DIS_MAX_CHAR_NUM; i++) {
		dis_cb.dis_attr[i].handle = service[i + 1].attribute_handle;

		VLOG(1) << StringPrintf("%s: handle of new attribute 0x%04x = %d",
		__func__, dis_cb.dis_attr[i].uuid,
		dis_cb.dis_attr[i].handle);
		log::verbose("handle of new attribute 0x{:04x} = {}",
		dis_cb.dis_attr[i].uuid, dis_cb.dis_attr[i].handle);
		}

		dis_cb.enabled = true;
		@@ -449,8 +448,8 @@ bool DIS_ReadDISInfo(const RawAddress& peer_bda, tDIS_READ_CBACK* p_cback,

		dis_cb.request_mask = mask;

		VLOG(1) << __func__ << " BDA: " << ADDRESS_TO_LOGGABLE_STR(peer_bda)
		<< StringPrintf(" cl_read_uuid: 0x%04x",
		log::verbose("BDA: {} cl_read_uuid: 0x{:04x}",
		ADDRESS_TO_LOGGABLE_STR(peer_bda),
		dis_attr_uuid[dis_cb.dis_read_uuid_idx]);

		if (!GATT_GetConnIdIfConnected(srvc_eng_cb.gatt_if, peer_bda, &conn_id,

system/stack/srvc/srvc_eng.cc

+16 −15

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		******************************************************************************/

		#include <base/logging.h>
		#include <bluetooth/log.h>

		#include "gatt_api.h"
		#include "os/logging/log_adapter.h"
		@@ -29,6 +30,8 @@
		#include "types/raw_address.h"

		using base::StringPrintf;
		using namespace bluetooth;

		static void srvc_eng_s_request_cback(uint16_t conn_id, uint32_t trans_id,
		tGATTS_REQ_TYPE type, tGATTS_DATA* p_data);
		static void srvc_eng_connect_cback(UNUSED_ATTR tGATT_IF gatt_if,
		@@ -237,8 +240,7 @@ static void srvc_eng_s_request_cback(uint16_t conn_id, uint32_t trans_id,
		uint8_t act = SRVC_ACT_IGNORE;
		uint8_t clcb_idx = srvc_eng_find_clcb_idx_by_conn_id(conn_id);

		VLOG(1) << StringPrintf("srvc_eng_s_request_cback : recv type (0x%02x)",
		type);
		log::verbose("srvc_eng_s_request_cback : recv type (0x{:02x})", type);

		memset(&rsp_msg, 0, sizeof(tGATTS_RSP));

		@@ -259,16 +261,15 @@ static void srvc_eng_s_request_cback(uint16_t conn_id, uint32_t trans_id,
		break;

		case GATTS_REQ_TYPE_WRITE_EXEC:
		VLOG(1) << "Ignore GATT_REQ_EXEC_WRITE/WRITE_CMD";
		log::verbose("Ignore GATT_REQ_EXEC_WRITE/WRITE_CMD");
		break;

		case GATTS_REQ_TYPE_MTU:
		VLOG(1) << "Get MTU exchange new mtu size: " << p_data->mtu;
		log::verbose("Get MTU exchange new mtu size: {}", p_data->mtu);
		break;

		default:
		VLOG(1) << StringPrintf("Unknown/unexpected LE GAP ATT request: 0x%02x",
		type);
		log::verbose("Unknown/unexpected LE GAP ATT request: 0x{:02x}", type);
		break;
		}

		@@ -291,11 +292,11 @@ static void srvc_eng_c_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op,
		tGATT_CL_COMPLETE* p_data) {
		tSRVC_CLCB* p_clcb = srvc_eng_find_clcb_by_conn_id(conn_id);

		VLOG(1) << StringPrintf(
		"srvc_eng_c_cmpl_cback() - op_code: 0x%02x status: 0x%02x ", op, status);
		log::verbose("srvc_eng_c_cmpl_cback() - op_code: 0x{:02x} status: 0x{:02x}",
		op, status);

		if (p_clcb == NULL) {
		LOG(ERROR) << __func__ << " received for unknown connection";
		log::error("received for unknown connection");
		return;
		}

		@@ -316,12 +317,12 @@ static void srvc_eng_connect_cback(UNUSED_ATTR tGATT_IF gatt_if,
		const RawAddress& bda, uint16_t conn_id,
		bool connected, tGATT_DISCONN_REASON reason,
		UNUSED_ATTR tBT_TRANSPORT transport) {
		VLOG(1) << __func__ << ": from " << ADDRESS_TO_LOGGABLE_STR(bda)
		<< StringPrintf(" connected:%d conn_id=%d", connected, conn_id);
		log::verbose("from {} connected:{} conn_id={}", ADDRESS_TO_LOGGABLE_STR(bda),
		connected, conn_id);

		if (connected) {
		if (srvc_eng_clcb_alloc(conn_id, bda) == NULL) {
		LOG(ERROR) << __func__ << "srvc_eng_connect_cback: no_resource";
		log::error("srvc_eng_connect_cback: no_resource");
		return;
		}
		} else {
		@@ -363,7 +364,7 @@ void srvc_eng_release_channel(uint16_t conn_id) {
		tSRVC_CLCB* p_clcb = srvc_eng_find_clcb_by_conn_id(conn_id);

		if (p_clcb == NULL) {
		LOG(ERROR) << __func__ << ": invalid connection id " << conn_id;
		log::error("invalid connection id {}", conn_id);
		return;
		}

		@@ -382,7 +383,7 @@ void srvc_eng_release_channel(uint16_t conn_id) {
		tGATT_STATUS srvc_eng_init(void) {

		if (srvc_eng_cb.enabled) {
		LOG(ERROR) << "DIS already initalized";
		log::error("DIS already initalized");
		} else {
		memset(&srvc_eng_cb, 0, sizeof(tSRVC_ENG_CB));

		@@ -393,7 +394,7 @@ tGATT_STATUS srvc_eng_init(void) {
		GATT_Register(app_uuid, "GattServiceEngine", &srvc_gatt_cback, false);
		GATT_StartIf(srvc_eng_cb.gatt_if);

		VLOG(1) << "Srvc_Init: gatt_if=" << +srvc_eng_cb.gatt_if;
		log::verbose("Srvc_Init: gatt_if={}", srvc_eng_cb.gatt_if);

		srvc_eng_cb.enabled = true;
		dis_cb.dis_read_uuid_idx = 0xff;