Bluetooth: Remove deprecated hci_usb driver (12421b40) · Commits · 戴 / test

drivers/bluetooth/Kconfig

+0 −20

Original line number	Diff line number	Diff line
		@@ -2,26 +2,6 @@
		menu "Bluetooth device drivers"
		depends on BT

		config BT_HCIUSB
		tristate "HCI USB driver (old version)"
		depends on USB && BT_HCIBTUSB=n
		help
		Bluetooth HCI USB driver.
		This driver is required if you want to use Bluetooth devices with
		USB interface.

		Say Y here to compile support for Bluetooth USB devices into the
		kernel or say M to compile it as module (hci_usb).

		config BT_HCIUSB_SCO
		bool "SCO (voice) support"
		depends on BT_HCIUSB
		help
		This option enables the SCO support in the HCI USB driver. You need this
		to transmit voice data with your Bluetooth USB device.

		Say Y here to compile support for SCO over HCI USB.

		config BT_HCIBTUSB
		tristate "HCI USB driver"
		depends on USB

drivers/bluetooth/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		# Makefile for the Linux Bluetooth HCI device drivers.
		#

		obj-$(CONFIG_BT_HCIUSB) += hci_usb.o
		obj-$(CONFIG_BT_HCIVHCI) += hci_vhci.o
		obj-$(CONFIG_BT_HCIUART) += hci_uart.o
		obj-$(CONFIG_BT_HCIBCM203X) += bcm203x.o

drivers/bluetooth/hci_usb.c

deleted100644 → 0

+0 −1136

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/bluetooth/hci_usb.h

deleted100644 → 0

+0 −129

Original line number	Diff line number	Diff line
		/*
		HCI USB driver for Linux Bluetooth protocol stack (BlueZ)
		Copyright (C) 2000-2001 Qualcomm Incorporated
		Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>

		Copyright (C) 2003 Maxim Krasnyansky <maxk@qualcomm.com>

		This program is free software; you can redistribute it and/or modify
		it under the terms of the GNU General Public License version 2 as
		published by the Free Software Foundation;

		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
		OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
		IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
		CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
		WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
		ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
		OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

		ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
		COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
		SOFTWARE IS DISCLAIMED.
		*/

		/* Class, SubClass, and Protocol codes that describe a Bluetooth device */
		#define HCI_DEV_CLASS 0xe0 /* Wireless class */
		#define HCI_DEV_SUBCLASS 0x01 /* RF subclass */
		#define HCI_DEV_PROTOCOL 0x01 /* Bluetooth programming protocol */

		#define HCI_IGNORE 0x01
		#define HCI_RESET 0x02
		#define HCI_DIGIANSWER 0x04
		#define HCI_CSR 0x08
		#define HCI_SNIFFER 0x10
		#define HCI_BCM92035 0x20
		#define HCI_BROKEN_ISOC 0x40
		#define HCI_WRONG_SCO_MTU 0x80

		#define HCI_MAX_IFACE_NUM 3

		#define HCI_MAX_BULK_TX 4
		#define HCI_MAX_BULK_RX 1

		#define HCI_MAX_ISOC_RX 2
		#define HCI_MAX_ISOC_TX 2

		#define HCI_MAX_ISOC_FRAMES 10

		struct _urb_queue {
		struct list_head head;
		spinlock_t lock;
		};

		struct _urb {
		struct list_head list;
		struct _urb_queue *queue;
		int type;
		void *priv;
		struct urb urb;
		};

		static inline void _urb_queue_init(struct _urb_queue *q)
		{
		INIT_LIST_HEAD(&q->head);
		spin_lock_init(&q->lock);
		}

		static inline void _urb_queue_head(struct _urb_queue q, struct _urb _urb)
		{
		unsigned long flags;
		spin_lock_irqsave(&q->lock, flags);
		/* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */
		_urb->queue = q; smp_mb(); list_add(&_urb->list, &q->head);
		spin_unlock_irqrestore(&q->lock, flags);
		}

		static inline void _urb_queue_tail(struct _urb_queue q, struct _urb _urb)
		{
		unsigned long flags;
		spin_lock_irqsave(&q->lock, flags);
		/* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */
		_urb->queue = q; smp_mb(); list_add_tail(&_urb->list, &q->head);
		spin_unlock_irqrestore(&q->lock, flags);
		}

		static inline void _urb_unlink(struct _urb *_urb)
		{
		struct _urb_queue *q;
		unsigned long flags;

		smp_mb();
		q = _urb->queue;
		/* If q is NULL, it will die at easy-to-debug NULL pointer dereference.
		No need to BUG(). */
		spin_lock_irqsave(&q->lock, flags);
		list_del(&_urb->list); _urb->queue = NULL;
		spin_unlock_irqrestore(&q->lock, flags);
		}

		struct hci_usb {
		struct hci_dev *hdev;

		unsigned long state;

		struct usb_device *udev;

		struct usb_host_endpoint *bulk_in_ep;
		struct usb_host_endpoint *bulk_out_ep;
		struct usb_host_endpoint *intr_in_ep;

		struct usb_interface *isoc_iface;
		struct usb_host_endpoint *isoc_out_ep;
		struct usb_host_endpoint *isoc_in_ep;

		__u8 ctrl_req;

		struct sk_buff_head transmit_q[4];

		rwlock_t completion_lock;

		atomic_t pending_tx[4]; /* Number of pending requests */
		struct _urb_queue pending_q[4]; /* Pending requests */
		struct _urb_queue completed_q[4]; /* Completed requests */
		};

		/* States */
		#define HCI_USB_TX_PROCESS 1
		#define HCI_USB_TX_WAKEUP 2

Admin message