SDP: Invoke complete callback when L2cap channel is closed am: c931712329 am:... (ced3b0f3) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/avct/avct_l2c.cc

+13 −6

Original line number	Original line	Diff line number	Diff line
	@@ -46,12 +46,19 @@ static void avct_on_l2cap_error(uint16_t lcid, uint16_t result);

	/* L2CAP callback function structure */		/* L2CAP callback function structure */
	const tL2CAP_APPL_INFO avct_l2c_appl = {		const tL2CAP_APPL_INFO avct_l2c_appl = {
	avct_l2c_connect_ind_cback, avct_l2c_connect_cfm_cback,		avct_l2c_connect_ind_cback,
	avct_l2c_config_ind_cback, avct_l2c_config_cfm_cback,		avct_l2c_connect_cfm_cback,
	avct_l2c_disconnect_ind_cback, avct_l2c_data_ind_cback,		avct_l2c_config_ind_cback,
	avct_l2c_congestion_ind_cback, NULL,		avct_l2c_config_cfm_cback,
	avct_on_l2cap_error, NULL,		avct_l2c_disconnect_ind_cback,
	NULL, NULL,		NULL,
			avct_l2c_data_ind_cback,
			avct_l2c_congestion_ind_cback,
			NULL,
			avct_on_l2cap_error,
			NULL,
			NULL,
			NULL,
	};		};

	/*******************************************************************************		/*******************************************************************************

+13 −8

Original line number	Original line	Diff line number	Diff line
	@@ -47,14 +47,19 @@ void avct_l2c_br_data_ind_cback(uint16_t lcid, BT_HDR* p_buf);
	void avct_br_on_l2cap_error(uint16_t lcid, uint16_t result);		void avct_br_on_l2cap_error(uint16_t lcid, uint16_t result);

	/* L2CAP callback function structure */		/* L2CAP callback function structure */
	const tL2CAP_APPL_INFO avct_l2c_br_appl = {		const tL2CAP_APPL_INFO avct_l2c_br_appl = {avct_l2c_br_connect_ind_cback,
	avct_l2c_br_connect_ind_cback, avct_l2c_br_connect_cfm_cback,		avct_l2c_br_connect_cfm_cback,
	avct_l2c_br_config_ind_cback, avct_l2c_br_config_cfm_cback,		avct_l2c_br_config_ind_cback,
	avct_l2c_br_disconnect_ind_cback, avct_l2c_br_data_ind_cback,		avct_l2c_br_config_cfm_cback,
	avct_l2c_br_congestion_ind_cback, NULL,		avct_l2c_br_disconnect_ind_cback,
	avct_br_on_l2cap_error, NULL,		NULL,
	NULL, NULL		avct_l2c_br_data_ind_cback,
	};		avct_l2c_br_congestion_ind_cback,
			NULL,
			avct_br_on_l2cap_error,
			NULL,
			NULL,
			NULL};

	/*******************************************************************************		/*******************************************************************************
	*		*

+13 −8

Original line number	Original line	Diff line number	Diff line
	@@ -48,14 +48,19 @@ void avdt_l2c_data_ind_cback(uint16_t lcid, BT_HDR* p_buf);
	static void avdt_on_l2cap_error(uint16_t lcid, uint16_t result);		static void avdt_on_l2cap_error(uint16_t lcid, uint16_t result);

	/* L2CAP callback function structure */		/* L2CAP callback function structure */
	const tL2CAP_APPL_INFO avdt_l2c_appl = {		const tL2CAP_APPL_INFO avdt_l2c_appl = {avdt_l2c_connect_ind_cback,
	avdt_l2c_connect_ind_cback, avdt_l2c_connect_cfm_cback,		avdt_l2c_connect_cfm_cback,
	avdt_l2c_config_ind_cback, avdt_l2c_config_cfm_cback,		avdt_l2c_config_ind_cback,
	avdt_l2c_disconnect_ind_cback, avdt_l2c_data_ind_cback,		avdt_l2c_config_cfm_cback,
	avdt_l2c_congestion_ind_cback, NULL,		avdt_l2c_disconnect_ind_cback,
	avdt_on_l2cap_error, NULL,		NULL,
	NULL, NULL		avdt_l2c_data_ind_cback,
	};		avdt_l2c_congestion_ind_cback,
			NULL,
			avdt_on_l2cap_error,
			NULL,
			NULL,
			NULL};

	/*******************************************************************************		/*******************************************************************************
	*		*

+13 −14

Original line number	Original line	Diff line number	Diff line
	@@ -68,20 +68,19 @@ static void gatt_send_conn_cback(tGATT_TCB* p_tcb);
	static void gatt_l2cif_congest_cback(uint16_t cid, bool congested);		static void gatt_l2cif_congest_cback(uint16_t cid, bool congested);
	static void gatt_on_l2cap_error(uint16_t lcid, uint16_t result);		static void gatt_on_l2cap_error(uint16_t lcid, uint16_t result);

	static const tL2CAP_APPL_INFO dyn_info = {		static const tL2CAP_APPL_INFO dyn_info = {gatt_l2cif_connect_ind_cback,
	gatt_l2cif_connect_ind_cback,
	gatt_l2cif_connect_cfm_cback,		gatt_l2cif_connect_cfm_cback,
	gatt_l2cif_config_ind_cback,		gatt_l2cif_config_ind_cback,
	gatt_l2cif_config_cfm_cback,		gatt_l2cif_config_cfm_cback,
	gatt_l2cif_disconnect_ind_cback,		gatt_l2cif_disconnect_ind_cback,
			NULL,
	gatt_l2cif_data_ind_cback,		gatt_l2cif_data_ind_cback,
	gatt_l2cif_congest_cback,		gatt_l2cif_congest_cback,
	NULL,		NULL,
	gatt_on_l2cap_error,		gatt_on_l2cap_error,
	NULL,		NULL,
	NULL,		NULL,
	NULL		NULL};
	};

	tGATT_CB gatt_cb;		tGATT_CB gatt_cb;

+13 −8

Original line number	Original line	Diff line number	Diff line
	@@ -44,14 +44,19 @@ static void hidd_l2cif_disconnect(uint16_t cid);
	static void hidd_l2cif_data_ind(uint16_t cid, BT_HDR* p_msg);		static void hidd_l2cif_data_ind(uint16_t cid, BT_HDR* p_msg);
	static void hidd_l2cif_cong_ind(uint16_t cid, bool congested);		static void hidd_l2cif_cong_ind(uint16_t cid, bool congested);
	static void hidd_on_l2cap_error(uint16_t lcid, uint16_t result);		static void hidd_on_l2cap_error(uint16_t lcid, uint16_t result);
	static const tL2CAP_APPL_INFO dev_reg_info = {		static const tL2CAP_APPL_INFO dev_reg_info = {hidd_l2cif_connect_ind,
	hidd_l2cif_connect_ind, hidd_l2cif_connect_cfm,		hidd_l2cif_connect_cfm,
	hidd_l2cif_config_ind, hidd_l2cif_config_cfm,		hidd_l2cif_config_ind,
	hidd_l2cif_disconnect_ind, hidd_l2cif_data_ind,		hidd_l2cif_config_cfm,
	hidd_l2cif_cong_ind, NULL,		hidd_l2cif_disconnect_ind,
	hidd_on_l2cap_error, NULL,		NULL,
	NULL, NULL		hidd_l2cif_data_ind,
	};		hidd_l2cif_cong_ind,
			NULL,
			hidd_on_l2cap_error,
			NULL,
			NULL,
			NULL};

	/*******************************************************************************		/*******************************************************************************
	*		*