Remove btla-specific comments (c08aa0c6) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/gatt/bta_gattc_int.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -257,9 +257,7 @@ typedef struct
	if included service, flag primary,		if included service, flag primary,
	if descriptor, not used */		if descriptor, not used */
	tBTA_GATTC_ATTR_TYPE attr_type;		tBTA_GATTC_ATTR_TYPE attr_type;
	// btla-specific ++
	} __attribute__((packed)) tBTA_GATTC_CACHE_ATTR;		} __attribute__((packed)) tBTA_GATTC_CACHE_ATTR;
	// btla-specific --

	typedef struct		typedef struct
	{		{
	@@ -268,9 +266,7 @@ typedef struct
	UINT16 s_handle;		UINT16 s_handle;
	UINT16 e_handle;		UINT16 e_handle;
	list_node_t p_cur_char; / node pointing to p_attr */		list_node_t p_cur_char; / node pointing to p_attr */
	// btla-specific ++
	} __attribute__((packed)) tBTA_GATTC_CACHE;		} __attribute__((packed)) tBTA_GATTC_CACHE;
	// btla-specific --

	typedef struct		typedef struct
	{		{

system/bta/gatt/bta_gatts_act.c

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -216,9 +216,7 @@ void bta_gatts_register(tBTA_GATTS_CB p_cb, tBTA_GATTS_DATA p_msg)
	}		}

	cb_data.reg_oper.server_if = BTA_GATTS_INVALID_IF;		cb_data.reg_oper.server_if = BTA_GATTS_INVALID_IF;
	// btla-specific ++
	memcpy(&cb_data.reg_oper.uuid, &p_msg->api_reg.app_uuid, sizeof(tBT_UUID));		memcpy(&cb_data.reg_oper.uuid, &p_msg->api_reg.app_uuid, sizeof(tBT_UUID));
	// btla-specific --
	if (first_unuse != 0xff)		if (first_unuse != 0xff)
	{		{
	APPL_TRACE_ERROR("register application first_unuse rcb_idx = %d", first_unuse);		APPL_TRACE_ERROR("register application first_unuse rcb_idx = %d", first_unuse);
	@@ -361,9 +359,7 @@ void bta_gatts_create_srvc(tBTA_GATTS_CB p_cb, tBTA_GATTS_DATA p_msg)

	cb_data.create.status = BTA_GATT_OK;		cb_data.create.status = BTA_GATT_OK;
	cb_data.create.service_id = service_id;		cb_data.create.service_id = service_id;
	// btla-specific ++
	cb_data.create.is_primary = p_msg->api_create_svc.is_pri;		cb_data.create.is_primary = p_msg->api_create_svc.is_pri;
	// btla-specific --
	cb_data.create.server_if = p_cb->rcb[rcb_idx].gatt_if;		cb_data.create.server_if = p_cb->rcb[rcb_idx].gatt_if;
	}		}
	else		else
	@@ -372,10 +368,8 @@ void bta_gatts_create_srvc(tBTA_GATTS_CB p_cb, tBTA_GATTS_DATA p_msg)
	memset(&p_cb->srvc_cb[srvc_idx], 0, sizeof(tBTA_GATTS_SRVC_CB));		memset(&p_cb->srvc_cb[srvc_idx], 0, sizeof(tBTA_GATTS_SRVC_CB));
	APPL_TRACE_ERROR("service creation failed.");		APPL_TRACE_ERROR("service creation failed.");
	}		}
	// btla-specific ++
	memcpy(&cb_data.create.uuid, &p_msg->api_create_svc.service_uuid, sizeof(tBT_UUID));		memcpy(&cb_data.create.uuid, &p_msg->api_create_svc.service_uuid, sizeof(tBT_UUID));
	cb_data.create.svc_instance= p_msg->api_create_svc.inst;		cb_data.create.svc_instance= p_msg->api_create_svc.inst;
	// btla-specific --
	}		}
	if (p_cb->rcb[rcb_idx].p_cback)		if (p_cb->rcb[rcb_idx].p_cback)
	(* p_cb->rcb[rcb_idx].p_cback)(BTA_GATTS_CREATE_EVT, &cb_data);		(* p_cb->rcb[rcb_idx].p_cback)(BTA_GATTS_CREATE_EVT, &cb_data);
	@@ -441,9 +435,7 @@ void bta_gatts_add_char(tBTA_GATTS_SRVC_CB p_srvc_cb, tBTA_GATTS_DATA p_msg)
	cb_data.add_result.server_if = p_rcb->gatt_if;		cb_data.add_result.server_if = p_rcb->gatt_if;
	cb_data.add_result.service_id = p_msg->api_add_incl_srvc.hdr.layer_specific;		cb_data.add_result.service_id = p_msg->api_add_incl_srvc.hdr.layer_specific;
	cb_data.add_result.attr_id = attr_id;		cb_data.add_result.attr_id = attr_id;
	// btla-specific ++
	memcpy(&cb_data.add_result.char_uuid, &p_msg->api_add_char.char_uuid, sizeof(tBT_UUID));		memcpy(&cb_data.add_result.char_uuid, &p_msg->api_add_char.char_uuid, sizeof(tBT_UUID));
	// btla-specific --

	if (attr_id)		if (attr_id)
	{		{
	@@ -479,9 +471,7 @@ void bta_gatts_add_char_descr(tBTA_GATTS_SRVC_CB p_srvc_cb, tBTA_GATTS_DATA p
	cb_data.add_result.server_if = p_rcb->gatt_if;		cb_data.add_result.server_if = p_rcb->gatt_if;
	cb_data.add_result.service_id = p_msg->api_add_incl_srvc.hdr.layer_specific;		cb_data.add_result.service_id = p_msg->api_add_incl_srvc.hdr.layer_specific;
	cb_data.add_result.attr_id = attr_id;		cb_data.add_result.attr_id = attr_id;
	// btla-specific ++
	memcpy(&cb_data.add_result.char_uuid, &p_msg->api_add_char_descr.descr_uuid, sizeof(tBT_UUID));		memcpy(&cb_data.add_result.char_uuid, &p_msg->api_add_char_descr.descr_uuid, sizeof(tBT_UUID));
	// btla-specific --

	if (attr_id)		if (attr_id)
	{		{

system/bta/hh/bta_hh_main.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -450,7 +450,6 @@ BOOLEAN bta_hh_hdl_event(BT_HDR *p_msg)
	else /* else remove device by handle */		else /* else remove device by handle */
	{		{
	index = bta_hh_dev_handle_to_cb_idx((UINT8)p_msg->layer_specific);		index = bta_hh_dev_handle_to_cb_idx((UINT8)p_msg->layer_specific);
	// btla-specific ++
	/* If BT disable is done while the HID device is connected and Link_Key uses unauthenticated combination		/* If BT disable is done while the HID device is connected and Link_Key uses unauthenticated combination
	* then we can get into a situation where remove_bonding is called with the index set to 0 (without getting		* then we can get into a situation where remove_bonding is called with the index set to 0 (without getting
	* cleaned up). Only when VIRTUAL_UNPLUG is called do we cleanup the index and make it MAX_KNOWN.		* cleaned up). Only when VIRTUAL_UNPLUG is called do we cleanup the index and make it MAX_KNOWN.
	@@ -461,7 +460,6 @@ BOOLEAN bta_hh_hdl_event(BT_HDR *p_msg)
	(bta_hh_cb.kdev[index].in_use == FALSE)) {		(bta_hh_cb.kdev[index].in_use == FALSE)) {
	index = BTA_HH_IDX_INVALID;		index = BTA_HH_IDX_INVALID;
	}		}
	// btla-specific --
	}		}
	}		}
	else if (p_msg->event == BTA_HH_INT_OPEN_EVT)		else if (p_msg->event == BTA_HH_INT_OPEN_EVT)

system/bta/include/bta_ag_ci.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,6 @@ extern void bta_ag_ci_rx_write(UINT16 handle, char *p_data, UINT16 len);
	******************************************************************************/		******************************************************************************/
	extern void bta_ag_ci_slc_ready(UINT16 handle);		extern void bta_ag_ci_slc_ready(UINT16 handle);

	// btla-specific ++
	/******************************************************************************		/******************************************************************************
	**		**
	** Function bta_ag_ci_wbs_command		** Function bta_ag_ci_wbs_command
	@@ -72,7 +71,6 @@ extern void bta_ag_ci_slc_ready(UINT16 handle);
	**		**
	******************************************************************************/		******************************************************************************/
	extern void bta_ag_ci_wbs_command (UINT16 handle, char *p_data, UINT16 len);		extern void bta_ag_ci_wbs_command (UINT16 handle, char *p_data, UINT16 len);
	// btla-specific --

	#ifdef __cplusplus		#ifdef __cplusplus
	}		}

system/bta/include/bta_api.h

+0 −16

Original line number	Original line	Diff line number	Diff line
	@@ -89,11 +89,9 @@ typedef UINT8 tBTA_STATUS;
	/* BLE profile service ID */		/* BLE profile service ID */
	#define BTA_BLE_SERVICE_ID 30 /* GATT profile */		#define BTA_BLE_SERVICE_ID 30 /* GATT profile */

	// btla-specific ++
	#define BTA_USER_SERVICE_ID 31 /* User requested UUID */		#define BTA_USER_SERVICE_ID 31 /* User requested UUID */

	#define BTA_MAX_SERVICE_ID 32		#define BTA_MAX_SERVICE_ID 32
	// btla-specific --
	#else		#else
	#define BTA_USER_SERVICE_ID 30 /* User requested UUID */		#define BTA_USER_SERVICE_ID 30 /* User requested UUID */
	#define BTA_MAX_SERVICE_ID 31		#define BTA_MAX_SERVICE_ID 31
	@@ -138,13 +136,9 @@ typedef UINT8 tBTA_SERVICE_ID;

	#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE		#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE
	#define BTA_BLE_SERVICE_MASK 0x20000000 /* GATT based service */		#define BTA_BLE_SERVICE_MASK 0x20000000 /* GATT based service */
	// btla-specific ++
	#define BTA_USER_SERVICE_MASK 0x40000000 /* Message Notification Profile */		#define BTA_USER_SERVICE_MASK 0x40000000 /* Message Notification Profile */
	// btla-specific --
	#else		#else
	// btla-specific ++
	#define BTA_USER_SERVICE_MASK 0x20000000 /* Message Notification Profile */		#define BTA_USER_SERVICE_MASK 0x20000000 /* Message Notification Profile */
	// btla-specific --
	#endif		#endif

	#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE		#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE
	@@ -202,7 +196,6 @@ typedef UINT16 tBTA_DM_DISC; /* this discoverability mode is a bit mask a
	#define BTA_DM_BLE_CONNECTABLE BTM_BLE_CONNECTABLE /* Device is LE connectable. */		#define BTA_DM_BLE_CONNECTABLE BTM_BLE_CONNECTABLE /* Device is LE connectable. */
	#endif		#endif

	// btla-specific ++
	typedef UINT16 tBTA_DM_CONN;		typedef UINT16 tBTA_DM_CONN;

	#define BTA_TRANSPORT_UNKNOWN 0		#define BTA_TRANSPORT_UNKNOWN 0
	@@ -594,10 +587,8 @@ typedef UINT8 tBTA_SIG_STRENGTH_MASK;
	#define BTA_DM_BLE_LOCAL_IR_EVT 20 /* BLE local IR event */		#define BTA_DM_BLE_LOCAL_IR_EVT 20 /* BLE local IR event */
	#define BTA_DM_BLE_LOCAL_ER_EVT 21 /* BLE local ER event */		#define BTA_DM_BLE_LOCAL_ER_EVT 21 /* BLE local ER event */
	#define BTA_DM_BLE_NC_REQ_EVT 22 /* SMP Numeric Comparison request event */		#define BTA_DM_BLE_NC_REQ_EVT 22 /* SMP Numeric Comparison request event */
	// btla-specific ++
	#define BTA_DM_SP_RMT_OOB_EXT_EVT 23 /* Simple Pairing Remote OOB Extended Data request. */		#define BTA_DM_SP_RMT_OOB_EXT_EVT 23 /* Simple Pairing Remote OOB Extended Data request. */
	#define BTA_DM_BLE_AUTH_CMPL_EVT 24 /* BLE Auth complete */		#define BTA_DM_BLE_AUTH_CMPL_EVT 24 /* BLE Auth complete */
	// btla-specific --
	#define BTA_DM_DEV_UNPAIRED_EVT 25		#define BTA_DM_DEV_UNPAIRED_EVT 25
	#define BTA_DM_HW_ERROR_EVT 26 /* BT Chip H/W error */		#define BTA_DM_HW_ERROR_EVT 26 /* BT Chip H/W error */
	#define BTA_DM_LE_FEATURES_READ 27 /* Cotroller specific LE features are read */		#define BTA_DM_LE_FEATURES_READ 27 /* Cotroller specific LE features are read */
	@@ -739,9 +730,7 @@ typedef struct
	BD_ADDR bd_addr; /* BD address peer device. */		BD_ADDR bd_addr; /* BD address peer device. */
	BD_NAME bd_name; /* Name of peer device. */		BD_NAME bd_name; /* Name of peer device. */
	tBTA_SERVICE_ID service; /* Service ID to authorize. */		tBTA_SERVICE_ID service; /* Service ID to authorize. */
	// btla-specific ++
	DEV_CLASS dev_class;		DEV_CLASS dev_class;
	// btla-specific --
	} tBTA_DM_AUTHORIZE;		} tBTA_DM_AUTHORIZE;

	/* Structure associated with BTA_DM_LINK_UP_EVT */		/* Structure associated with BTA_DM_LINK_UP_EVT */
	@@ -1031,13 +1020,11 @@ typedef struct
	BD_ADDR bd_addr; /* BD address peer device. */		BD_ADDR bd_addr; /* BD address peer device. */
	BD_NAME bd_name; /* Name of peer device. */		BD_NAME bd_name; /* Name of peer device. */
	tBTA_SERVICE_MASK services; /* Services found on peer device. */		tBTA_SERVICE_MASK services; /* Services found on peer device. */
	// btla-specific ++
	UINT8 * p_raw_data; /* Raw data for discovery DB */		UINT8 * p_raw_data; /* Raw data for discovery DB */
	UINT32 raw_data_size; /* size of raw data */		UINT32 raw_data_size; /* size of raw data */
	tBT_DEVICE_TYPE device_type; /* device type in case it is BLE device */		tBT_DEVICE_TYPE device_type; /* device type in case it is BLE device */
	UINT32 num_uuids;		UINT32 num_uuids;
	UINT8 *p_uuid_list;		UINT8 *p_uuid_list;
	// btla-specific --
	tBTA_STATUS result;		tBTA_STATUS result;
	} tBTA_DM_DISC_RES;		} tBTA_DM_DISC_RES;

	@@ -1452,7 +1439,6 @@ extern void BTA_DmSearchCancel(void);
	extern void BTA_DmDiscover(BD_ADDR bd_addr, tBTA_SERVICE_MASK services,		extern void BTA_DmDiscover(BD_ADDR bd_addr, tBTA_SERVICE_MASK services,
	tBTA_DM_SEARCH_CBACK *p_cback, BOOLEAN sdp_search);		tBTA_DM_SEARCH_CBACK *p_cback, BOOLEAN sdp_search);

	// btla-specific ++
	/*******************************************************************************		/*******************************************************************************
	**		**
	** Function BTA_DmDiscoverUUID		** Function BTA_DmDiscoverUUID
	@@ -1478,7 +1464,6 @@ extern void BTA_DmDiscoverUUID(BD_ADDR bd_addr, tSDP_UUID *uuid,
	**		**
	*******************************************************************************/		*******************************************************************************/
	tBTA_STATUS BTA_DmGetCachedRemoteName(BD_ADDR remote_device, UINT8 **pp_cached_name);		tBTA_STATUS BTA_DmGetCachedRemoteName(BD_ADDR remote_device, UINT8 **pp_cached_name);
	// btla-specific --

	/*******************************************************************************		/*******************************************************************************
	**		**
	@@ -1984,7 +1969,6 @@ extern void BTA_DmBleObserve(BOOLEAN start, UINT8 duration,
	#endif		#endif

	#if BLE_INCLUDED == TRUE		#if BLE_INCLUDED == TRUE
	// btla-specific --
	/*******************************************************************************		/*******************************************************************************
	**		**
	** Function BTA_DmBleConfigLocalPrivacy		** Function BTA_DmBleConfigLocalPrivacy