Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
d6e19c36
Commit
d6e19c36
authored
Jul 21, 2004
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge
http://linux-mh.bkbits.net/bluetooth-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
parents
e8bc549d
f9d4e5b6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
18 deletions
+11
-18
drivers/bluetooth/hci_usb.c
drivers/bluetooth/hci_usb.c
+9
-17
include/net/bluetooth/hci.h
include/net/bluetooth/hci.h
+1
-1
net/bluetooth/Kconfig
net/bluetooth/Kconfig
+1
-0
No files found.
drivers/bluetooth/hci_usb.c
View file @
d6e19c36
...
...
@@ -76,14 +76,15 @@ static struct usb_device_id bluetooth_ids[] = {
/* AVM BlueFRITZ! USB v2.0 */
{
USB_DEVICE
(
0x057c
,
0x3800
)
},
/*
Ericsson with non-standard id
*/
{
USB_DEVICE
(
0x0
bdb
,
0x1002
)
},
/*
Bluetooth Ultraport Module from IBM
*/
{
USB_DEVICE
(
0x0
4bf
,
0x030a
)
},
/* ALPS Module with non-standard id */
/* ALPS Modules with non-standard id */
{
USB_DEVICE
(
0x044e
,
0x3001
)
},
{
USB_DEVICE
(
0x044e
,
0x3002
)
},
/*
Bluetooth Ultraport Module from IBM
*/
{
USB_DEVICE
(
0x0
4bf
,
0x030a
)
},
/*
Ericsson with non-standard id
*/
{
USB_DEVICE
(
0x0
bdb
,
0x1002
)
},
{
}
/* Terminating entry */
};
...
...
@@ -338,26 +339,18 @@ static int hci_usb_flush(struct hci_dev *hdev)
BT_DBG
(
"%s"
,
hdev
->
name
);
for
(
i
=
0
;
i
<
4
;
i
++
)
for
(
i
=
0
;
i
<
4
;
i
++
)
skb_queue_purge
(
&
husb
->
transmit_q
[
i
]);
return
0
;
}
static
inline
void
hci_usb_wait_for_urb
(
struct
urb
*
urb
)
{
while
(
atomic_read
(
&
urb
->
kref
.
refcount
)
>
1
)
{
current
->
state
=
TASK_UNINTERRUPTIBLE
;
schedule_timeout
((
5
*
HZ
+
999
)
/
1000
);
}
}
static
void
hci_usb_unlink_urbs
(
struct
hci_usb
*
husb
)
{
int
i
;
BT_DBG
(
"%s"
,
husb
->
hdev
->
name
);
for
(
i
=
0
;
i
<
4
;
i
++
)
{
for
(
i
=
0
;
i
<
4
;
i
++
)
{
struct
_urb
*
_urb
;
struct
urb
*
urb
;
...
...
@@ -366,8 +359,7 @@ static void hci_usb_unlink_urbs(struct hci_usb *husb)
urb
=
&
_urb
->
urb
;
BT_DBG
(
"%s unlinking _urb %p type %d urb %p"
,
husb
->
hdev
->
name
,
_urb
,
_urb
->
type
,
urb
);
usb_unlink_urb
(
urb
);
hci_usb_wait_for_urb
(
urb
);
usb_kill_urb
(
urb
);
_urb_queue_tail
(
__completed_q
(
husb
,
_urb
->
type
),
_urb
);
}
...
...
include/net/bluetooth/hci.h
View file @
d6e19c36
...
...
@@ -432,7 +432,7 @@ struct inquiry_info_with_rssi {
__u8
pscan_period_mode
;
__u8
dev_class
[
3
];
__u16
clock_offset
;
__
u
8
rssi
;
__
s
8
rssi
;
}
__attribute__
((
packed
));
#define HCI_EV_CONN_COMPLETE 0x03
...
...
net/bluetooth/Kconfig
View file @
d6e19c36
...
...
@@ -20,6 +20,7 @@ menuconfig BT
RFCOMM Module (RFCOMM Protocol)
BNEP Module (Bluetooth Network Encapsulation Protocol)
CMTP Module (CAPI Message Transport Protocol)
HIDP Module (Human Interface Device Protocol)
Say Y here to compile Bluetooth support into the kernel or say M to
compile it as module (bluetooth).
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment