Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 903e4541 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: AMP: Use HCI cmd to Read Loc AMP Assoc 



When receiving A2MP Get AMP Assoc Request execute Read Local AMP Assoc
HCI command to AMP controller. If the AMP Assoc data is larger than it
can fit to HCI event only fragment is read. When all fragments are read
send A2MP Get AMP Assoc Response.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 8e2a0d92

include/net/bluetooth/a2mp.h

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


enum amp_mgr_state {

	READ_LOC_AMP_INFO,

	READ_LOC_AMP_ASSOC,

};



struct amp_mgr {
@@ -134,5 +135,6 @@ struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn, 
struct amp_mgr *amp_mgr_lookup_by_state(u8 state);

void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len, void *data);

void a2mp_send_getinfo_rsp(struct hci_dev *hdev);

void a2mp_send_getampassoc_rsp(struct hci_dev *hdev, u8 status);



#endif /* __A2MP_H */

include/net/bluetooth/amp.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

   Copyright (c) 2011,2012 Intel Corp.



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License version 2 and

   only version 2 as published by the Free Software Foundation.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.

*/



#ifndef __AMP_H

#define __AMP_H



void amp_read_loc_info(struct hci_dev *hdev, struct amp_mgr *mgr);

void amp_read_loc_assoc_frag(struct hci_dev *hdev, u8 phy_handle);

void amp_read_loc_assoc(struct hci_dev *hdev, struct amp_mgr *mgr);



#endif /* __AMP_H */

include/net/bluetooth/hci.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#define HCI_LINK_KEY_SIZE	16

#define HCI_AMP_LINK_KEY_SIZE	(2 * HCI_LINK_KEY_SIZE)



#define HCI_MAX_AMP_ASSOC_SIZE	672



/* HCI dev events */

#define HCI_DEV_REG			1

#define HCI_DEV_UNREG			2

include/net/bluetooth/hci_core.h

+8 −0
Original line number Diff line number Diff line
@@ -124,6 +124,12 @@ struct le_scan_params { 


#define HCI_MAX_SHORT_NAME_LENGTH	10



struct amp_assoc {

	__u16	len;

	__u16	offset;

	__u8	data[HCI_MAX_AMP_ASSOC_SIZE];

};



#define NUM_REASSEMBLY 4

struct hci_dev {

	struct list_head list;
@@ -177,6 +183,8 @@ struct hci_dev { 
	__u32		amp_max_flush_to;

	__u32		amp_be_flush_to;



	struct amp_assoc	loc_assoc;



	__u8		flow_ctl_mode;



	unsigned int	auto_accept_delay;

net/bluetooth/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ obj-$(CONFIG_BT_HIDP) += hidp/ 


bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \

	hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \

	a2mp.o
 
	a2mp.o amp.o