summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2006-07-08 13:57:15 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 18:01:28 -0700
commit0ac53939a06c610b394aeb0211b985804f2d2da3 (patch)
tree40e4b80f70a7cd42705e49a817950857055f2d1b
parent9c724357f432df5ddc83a62c8168414a604cd420 (diff)
downloadlinux-0ac53939a06c610b394aeb0211b985804f2d2da3.tar.gz
linux-0ac53939a06c610b394aeb0211b985804f2d2da3.tar.bz2
linux-0ac53939a06c610b394aeb0211b985804f2d2da3.zip
[Bluetooth] Add HCI device identifier for SDIO cards
This patch assigns the next free HCI device identifier to Bluetooth devices based on the SDIO interface. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/bluetooth/hci_vhci.c2
-rw-r--r--include/net/bluetooth/hci.h3
-rw-r--r--net/bluetooth/hci_sysfs.c4
3 files changed, 6 insertions, 3 deletions
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index fc2130f1776a..a278d98a9151 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -276,7 +276,7 @@ static int vhci_open(struct inode *inode, struct file *file)
data->hdev = hdev;
- hdev->type = HCI_VHCI;
+ hdev->type = HCI_VIRTUAL;
hdev->driver_data = data;
hdev->open = vhci_open_dev;
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index b2bdb1aa0429..fde08f452b59 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -44,12 +44,13 @@
#define HCI_NOTIFY_VOICE_SETTING 3
/* HCI device types */
-#define HCI_VHCI 0
+#define HCI_VIRTUAL 0
#define HCI_USB 1
#define HCI_PCCARD 2
#define HCI_UART 3
#define HCI_RS232 4
#define HCI_PCI 5
+#define HCI_SDIO 6
/* HCI device quirks */
enum {
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 58df4360d242..09c61615e961 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -16,7 +16,7 @@
static inline char *typetostr(int type)
{
switch (type) {
- case HCI_VHCI:
+ case HCI_VIRTUAL:
return "VIRTUAL";
case HCI_USB:
return "USB";
@@ -28,6 +28,8 @@ static inline char *typetostr(int type)
return "RS232";
case HCI_PCI:
return "PCI";
+ case HCI_SDIO:
+ return "SDIO";
default:
return "UNKNOWN";
}