1 files changed, 0 insertions, 129 deletions
diff --git a/drivers/bluetooth/hci_usb.h b/drivers/bluetooth/hci_usb.h
deleted file mode 100644
index 8e659914523f..000000000000
--- a/drivers/bluetooth/hci_usb.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* 
-   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

diff --git a/drivers/bluetooth/hci_usb.h b/drivers/bluetooth/hci_usb.h deleted file mode 100644 index 8e659914523f..000000000000 --- a/drivers/bluetooth/hci_usb.h +++ /dev/null
@@ -1,129 +0,0 @@
1	/*
2	HCI USB driver for Linux Bluetooth protocol stack (BlueZ)
3	Copyright (C) 2000-2001 Qualcomm Incorporated
4	Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
5
6	Copyright (C) 2003 Maxim Krasnyansky <maxk@qualcomm.com>
7
8	This program is free software; you can redistribute it and/or modify
9	it under the terms of the GNU General Public License version 2 as
10	published by the Free Software Foundation;
11
12	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
13	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
15	IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
16	CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
17	WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
18	ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
19	OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
20
21	ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
22	COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
23	SOFTWARE IS DISCLAIMED.
24	*/
25
26	/* Class, SubClass, and Protocol codes that describe a Bluetooth device */
27	#define HCI_DEV_CLASS 0xe0 /* Wireless class */
28	#define HCI_DEV_SUBCLASS 0x01 /* RF subclass */
29	#define HCI_DEV_PROTOCOL 0x01 /* Bluetooth programming protocol */
30
31	#define HCI_IGNORE 0x01
32	#define HCI_RESET 0x02
33	#define HCI_DIGIANSWER 0x04
34	#define HCI_CSR 0x08
35	#define HCI_SNIFFER 0x10
36	#define HCI_BCM92035 0x20
37	#define HCI_BROKEN_ISOC 0x40
38	#define HCI_WRONG_SCO_MTU 0x80
39
40	#define HCI_MAX_IFACE_NUM 3
41
42	#define HCI_MAX_BULK_TX 4
43	#define HCI_MAX_BULK_RX 1
44
45	#define HCI_MAX_ISOC_RX 2
46	#define HCI_MAX_ISOC_TX 2
47
48	#define HCI_MAX_ISOC_FRAMES 10
49
50	struct _urb_queue {
51	struct list_head head;
52	spinlock_t lock;
53	};
54
55	struct _urb {
56	struct list_head list;
57	struct _urb_queue *queue;
58	int type;
59	void *priv;
60	struct urb urb;
61	};
62
63	static inline void _urb_queue_init(struct _urb_queue *q)
64	{
65	INIT_LIST_HEAD(&q->head);
66	spin_lock_init(&q->lock);
67	}
68
69	static inline void _urb_queue_head(struct _urb_queue q, struct _urb _urb)
70	{
71	unsigned long flags;
72	spin_lock_irqsave(&q->lock, flags);
73	/* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */
74	_urb->queue = q; smp_mb(); list_add(&_urb->list, &q->head);
75	spin_unlock_irqrestore(&q->lock, flags);
76	}
77
78	static inline void _urb_queue_tail(struct _urb_queue q, struct _urb _urb)
79	{
80	unsigned long flags;
81	spin_lock_irqsave(&q->lock, flags);
82	/* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */
83	_urb->queue = q; smp_mb(); list_add_tail(&_urb->list, &q->head);
84	spin_unlock_irqrestore(&q->lock, flags);
85	}
86
87	static inline void _urb_unlink(struct _urb *_urb)
88	{
89	struct _urb_queue *q;
90	unsigned long flags;
91
92	smp_mb();
93	q = _urb->queue;
94	/* If q is NULL, it will die at easy-to-debug NULL pointer dereference.
95	No need to BUG(). */
96	spin_lock_irqsave(&q->lock, flags);
97	list_del(&_urb->list); _urb->queue = NULL;
98	spin_unlock_irqrestore(&q->lock, flags);
99	}
100
101	struct hci_usb {
102	struct hci_dev *hdev;
103
104	unsigned long state;
105
106	struct usb_device *udev;
107
108	struct usb_host_endpoint *bulk_in_ep;
109	struct usb_host_endpoint *bulk_out_ep;
110	struct usb_host_endpoint *intr_in_ep;
111
112	struct usb_interface *isoc_iface;
113	struct usb_host_endpoint *isoc_out_ep;
114	struct usb_host_endpoint *isoc_in_ep;
115
116	__u8 ctrl_req;
117
118	struct sk_buff_head transmit_q[4];
119
120	rwlock_t completion_lock;
121
122	atomic_t pending_tx[4]; /* Number of pending requests */
123	struct _urb_queue pending_q[4]; /* Pending requests */
124	struct _urb_queue completed_q[4]; /* Completed requests */
125	};
126
127	/* States */
128	#define HCI_USB_TX_PROCESS 1
129	#define HCI_USB_TX_WAKEUP 2