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

Commit 943da25d authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Add controller types for BR/EDR and 802.11 AMP 



With the Bluetooth 3.0 specification and the introduction of alternate
MAC/PHY (AMP) support, it is required to differentiate between primary
BR/EDR controllers and 802.11 AMP controllers. So introduce a special
type inside HCI device for differentiation.

For now all AMP controllers will be treated as raw devices until an
AMP manager has been implemented.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b914a250

include/net/bluetooth/hci.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,10 @@ 
#define HCI_PCI		5

#define HCI_PCI		5

#define HCI_SDIO	6

#define HCI_SDIO	6





/* HCI controller types */

#define HCI_BREDR	0x00

#define HCI_80211	0x01



/* HCI device quirks */

/* HCI device quirks */

enum {

enum {

	HCI_QUIRK_NO_RESET,

	HCI_QUIRK_NO_RESET,

include/net/bluetooth/hci_core.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -71,6 +71,7 @@ struct hci_dev { 
	unsigned long	flags;

	unsigned long	flags;

	__u16		id;

	__u16		id;

	__u8		bus;

	__u8		bus;

	__u8		dev_type;

	bdaddr_t	bdaddr;

	bdaddr_t	bdaddr;

	__u8		dev_name[248];

	__u8		dev_name[248];

	__u8		dev_class[3];

	__u8		dev_class[3];

net/bluetooth/hci_core.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -491,6 +491,10 @@ int hci_dev_open(__u16 dev) 
	if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks))

	if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks))

		set_bit(HCI_RAW, &hdev->flags);

		set_bit(HCI_RAW, &hdev->flags);





	/* Treat all non BR/EDR controllers as raw devices for now */

	if (hdev->dev_type != HCI_BREDR)

		set_bit(HCI_RAW, &hdev->flags);



	if (hdev->open(hdev)) {

	if (hdev->open(hdev)) {

		ret = -EIO;

		ret = -EIO;

		goto done;

		goto done;
@@ -797,7 +801,7 @@ int hci_get_dev_info(void __user *arg) 




	strcpy(di.name, hdev->name);

	strcpy(di.name, hdev->name);

	di.bdaddr   = hdev->bdaddr;

	di.bdaddr   = hdev->bdaddr;

	di.type     = hdev->bus;

	di.type     = (hdev->bus & 0x0f) | (hdev->dev_type << 4);

	di.flags    = hdev->flags;

	di.flags    = hdev->flags;

	di.pkt_type = hdev->pkt_type;

	di.pkt_type = hdev->pkt_type;

	di.acl_mtu  = hdev->acl_mtu;

	di.acl_mtu  = hdev->acl_mtu;

net/bluetooth/hci_sysfs.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -192,12 +192,30 @@ static inline char *host_bustostr(int bus) 
	}

	}

}

}





static inline char *host_typetostr(int type)

{

	switch (type) {

	case HCI_BREDR:

		return "BR/EDR";

	case HCI_80211:

		return "802.11";

	default:

		return "UNKNOWN";

	}

}



static ssize_t show_bus(struct device *dev, struct device_attribute *attr, char *buf)

static ssize_t show_bus(struct device *dev, struct device_attribute *attr, char *buf)

{

{

	struct hci_dev *hdev = dev_get_drvdata(dev);

	struct hci_dev *hdev = dev_get_drvdata(dev);

	return sprintf(buf, "%s\n", host_bustostr(hdev->bus));

	return sprintf(buf, "%s\n", host_bustostr(hdev->bus));

}

}





static ssize_t show_type(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct hci_dev *hdev = dev_get_drvdata(dev);

	return sprintf(buf, "%s\n", host_typetostr(hdev->dev_type));

}



static ssize_t show_name(struct device *dev, struct device_attribute *attr, char *buf)

static ssize_t show_name(struct device *dev, struct device_attribute *attr, char *buf)

{

{

	struct hci_dev *hdev = dev_get_drvdata(dev);

	struct hci_dev *hdev = dev_get_drvdata(dev);
@@ -334,6 +352,7 @@ static ssize_t store_sniff_min_interval(struct device *dev, struct device_attrib 
}

}





static DEVICE_ATTR(bus, S_IRUGO, show_bus, NULL);

static DEVICE_ATTR(bus, S_IRUGO, show_bus, NULL);

static DEVICE_ATTR(type, S_IRUGO, show_type, NULL);

static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);

static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);

static DEVICE_ATTR(class, S_IRUGO, show_class, NULL);

static DEVICE_ATTR(class, S_IRUGO, show_class, NULL);

static DEVICE_ATTR(address, S_IRUGO, show_address, NULL);

static DEVICE_ATTR(address, S_IRUGO, show_address, NULL);
@@ -351,6 +370,7 @@ static DEVICE_ATTR(sniff_min_interval, S_IRUGO | S_IWUSR, 




static struct attribute *bt_host_attrs[] = {

static struct attribute *bt_host_attrs[] = {

	&dev_attr_bus.attr,

	&dev_attr_bus.attr,

	&dev_attr_type.attr,

	&dev_attr_name.attr,

	&dev_attr_name.attr,

	&dev_attr_class.attr,

	&dev_attr_class.attr,

	&dev_attr_address.attr,

	&dev_attr_address.attr,