Commit ff50e8af authored by Arron Wang's avatar Arron Wang Committed by Marcel Holtmann
Browse files

Bluetooth: Move SCO support under BT_BREDR config option 



SCO/eSCO link is supported by BR/EDR controller, it is
suitable to move them under BT_BREDR config option

Signed-off-by: default avatarArron Wang <arron.wang@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 9b4c3336

include/net/bluetooth/bluetooth.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -365,8 +365,19 @@ extern struct dentry *bt_debugfs; 
int l2cap_init(void);

int l2cap_init(void);

void l2cap_exit(void);

void l2cap_exit(void);





#if IS_ENABLED(CONFIG_BT_BREDR)

int sco_init(void);

int sco_init(void);

void sco_exit(void);

void sco_exit(void);

#else

static inline int sco_init(void)

{

	return 0;

}



static inline void sco_exit(void)

{

}

#endif





int mgmt_init(void);

int mgmt_init(void);

void mgmt_exit(void);

void mgmt_exit(void);

include/net/bluetooth/hci_core.h

+12 −0
Original line number Original line Diff line number Diff line
@@ -532,8 +532,20 @@ int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr); 
int l2cap_disconn_ind(struct hci_conn *hcon);

int l2cap_disconn_ind(struct hci_conn *hcon);

void l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags);

void l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags);





#if IS_ENABLED(CONFIG_BT_BREDR)

int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags);

int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags);

void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb);

void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb);

#else

static inline int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr,

				  __u8 *flags)

{

	return 0;

}



static inline void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb)

{

}

#endif





/* ----- Inquiry cache ----- */

/* ----- Inquiry cache ----- */

#define INQUIRY_CACHE_AGE_MAX   (HZ*30)   /* 30 seconds */

#define INQUIRY_CACHE_AGE_MAX   (HZ*30)   /* 30 seconds */

net/bluetooth/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -12,9 +12,10 @@ obj-$(CONFIG_BT_6LOWPAN) += bluetooth_6lowpan.o 
bluetooth_6lowpan-y := 6lowpan.o

bluetooth_6lowpan-y := 6lowpan.o





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

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 \

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

	a2mp.o amp.o ecc.o hci_request.o mgmt_util.o

	a2mp.o amp.o ecc.o hci_request.o mgmt_util.o





bluetooth-$(CONFIG_BT_BREDR) += sco.o

bluetooth-$(CONFIG_BT_DEBUGFS) += hci_debugfs.o

bluetooth-$(CONFIG_BT_DEBUGFS) += hci_debugfs.o

bluetooth-$(CONFIG_BT_SELFTEST) += selftest.o

bluetooth-$(CONFIG_BT_SELFTEST) += selftest.o