Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Marcel Holtmann and committed by
David S. Miller
0ac53939 9c724357

+6 -3
+1 -1
drivers/bluetooth/hci_vhci.c
··· 276 276 277 277 data->hdev = hdev; 278 278 279 - hdev->type = HCI_VHCI; 279 + hdev->type = HCI_VIRTUAL; 280 280 hdev->driver_data = data; 281 281 282 282 hdev->open = vhci_open_dev;
+2 -1
include/net/bluetooth/hci.h
··· 44 44 #define HCI_NOTIFY_VOICE_SETTING 3 45 45 46 46 /* HCI device types */ 47 - #define HCI_VHCI 0 47 + #define HCI_VIRTUAL 0 48 48 #define HCI_USB 1 49 49 #define HCI_PCCARD 2 50 50 #define HCI_UART 3 51 51 #define HCI_RS232 4 52 52 #define HCI_PCI 5 53 + #define HCI_SDIO 6 53 54 54 55 /* HCI device quirks */ 55 56 enum {
+3 -1
net/bluetooth/hci_sysfs.c
··· 16 16 static inline char *typetostr(int type) 17 17 { 18 18 switch (type) { 19 - case HCI_VHCI: 19 + case HCI_VIRTUAL: 20 20 return "VIRTUAL"; 21 21 case HCI_USB: 22 22 return "USB"; ··· 28 28 return "RS232"; 29 29 case HCI_PCI: 30 30 return "PCI"; 31 + case HCI_SDIO: 32 + return "SDIO"; 31 33 default: 32 34 return "UNKNOWN"; 33 35 }