Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
5d59bbce
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5d59bbce
编写于
9月 19, 2011
作者:
J
John W. Linville
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-3.1' of
git://github.com/padovan/bluetooth-next
上级
2249b011
f78b6826
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
17 deletion
+22
-17
drivers/bluetooth/btusb.c
drivers/bluetooth/btusb.c
+6
-0
drivers/bluetooth/btwilink.c
drivers/bluetooth/btwilink.c
+8
-8
net/bluetooth/hci_event.c
net/bluetooth/hci_event.c
+8
-9
未找到文件。
drivers/bluetooth/btusb.c
浏览文件 @
5d59bbce
...
...
@@ -72,9 +72,15 @@ static struct usb_device_id btusb_table[] = {
/* Apple MacBookAir3,1, MacBookAir3,2 */
{
USB_DEVICE
(
0x05ac
,
0x821b
)
},
/* Apple MacBookAir4,1 */
{
USB_DEVICE
(
0x05ac
,
0x821f
)
},
/* Apple MacBookPro8,2 */
{
USB_DEVICE
(
0x05ac
,
0x821a
)
},
/* Apple MacMini5,1 */
{
USB_DEVICE
(
0x05ac
,
0x8281
)
},
/* AVM BlueFRITZ! USB v2.0 */
{
USB_DEVICE
(
0x057c
,
0x3800
)
},
...
...
drivers/bluetooth/btwilink.c
浏览文件 @
5d59bbce
...
...
@@ -124,6 +124,13 @@ static long st_receive(void *priv_data, struct sk_buff *skb)
/* ------- Interfaces to HCI layer ------ */
/* protocol structure registered with shared transport */
static
struct
st_proto_s
ti_st_proto
[
MAX_BT_CHNL_IDS
]
=
{
{
.
chnl_id
=
HCI_EVENT_PKT
,
/* HCI Events */
.
hdr_len
=
sizeof
(
struct
hci_event_hdr
),
.
offset_len_in_hdr
=
offsetof
(
struct
hci_event_hdr
,
plen
),
.
len_size
=
1
,
/* sizeof(plen) in struct hci_event_hdr */
.
reserve
=
8
,
},
{
.
chnl_id
=
HCI_ACLDATA_PKT
,
/* ACL */
.
hdr_len
=
sizeof
(
struct
hci_acl_hdr
),
...
...
@@ -138,13 +145,6 @@ static struct st_proto_s ti_st_proto[MAX_BT_CHNL_IDS] = {
.
len_size
=
1
,
/* sizeof(dlen) in struct hci_sco_hdr */
.
reserve
=
8
,
},
{
.
chnl_id
=
HCI_EVENT_PKT
,
/* HCI Events */
.
hdr_len
=
sizeof
(
struct
hci_event_hdr
),
.
offset_len_in_hdr
=
offsetof
(
struct
hci_event_hdr
,
plen
),
.
len_size
=
1
,
/* sizeof(plen) in struct hci_event_hdr */
.
reserve
=
8
,
},
};
/* Called from HCI core to initialize the device */
...
...
@@ -240,7 +240,7 @@ static int ti_st_close(struct hci_dev *hdev)
if
(
!
test_and_clear_bit
(
HCI_RUNNING
,
&
hdev
->
flags
))
return
0
;
for
(
i
=
0
;
i
<
MAX_BT_CHNL_IDS
;
i
++
)
{
for
(
i
=
MAX_BT_CHNL_IDS
-
1
;
i
>=
0
;
i
--
)
{
err
=
st_unregister
(
&
ti_st_proto
[
i
]);
if
(
err
)
BT_ERR
(
"st_unregister(%d) failed with error %d"
,
...
...
net/bluetooth/hci_event.c
浏览文件 @
5d59bbce
...
...
@@ -58,8 +58,8 @@ static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb)
if
(
status
)
return
;
if
(
test_
bit
(
HCI_MGMT
,
&
hdev
->
flags
)
&&
test_and_clear_bit
(
HCI_INQUIRY
,
&
hdev
->
flags
))
if
(
test_
and_clear_bit
(
HCI_INQUIRY
,
&
hdev
->
flags
)
&&
test_bit
(
HCI_MGMT
,
&
hdev
->
flags
))
mgmt_discovering
(
hdev
->
id
,
0
);
hci_req_complete
(
hdev
,
HCI_OP_INQUIRY_CANCEL
,
status
);
...
...
@@ -76,8 +76,8 @@ static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)
if
(
status
)
return
;
if
(
test_
bit
(
HCI_MGMT
,
&
hdev
->
flags
)
&&
test_
and_clear_bit
(
HCI_INQUIRY
,
&
hdev
->
flags
))
if
(
test_
and_clear_bit
(
HCI_INQUIRY
,
&
hdev
->
flags
)
&&
test_
bit
(
HCI_MGMT
,
&
hdev
->
flags
))
mgmt_discovering
(
hdev
->
id
,
0
);
hci_conn_check_pending
(
hdev
);
...
...
@@ -959,9 +959,8 @@ static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
return
;
}
if
(
test_bit
(
HCI_MGMT
,
&
hdev
->
flags
)
&&
!
test_and_set_bit
(
HCI_INQUIRY
,
&
hdev
->
flags
))
if
(
!
test_and_set_bit
(
HCI_INQUIRY
,
&
hdev
->
flags
)
&&
test_bit
(
HCI_MGMT
,
&
hdev
->
flags
))
mgmt_discovering
(
hdev
->
id
,
1
);
}
...
...
@@ -1340,8 +1339,8 @@ static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff
BT_DBG
(
"%s status %d"
,
hdev
->
name
,
status
);
if
(
test_
bit
(
HCI_MGMT
,
&
hdev
->
flags
)
&&
test_
and_clear_bit
(
HCI_INQUIRY
,
&
hdev
->
flags
))
if
(
test_
and_clear_bit
(
HCI_INQUIRY
,
&
hdev
->
flags
)
&&
test_
bit
(
HCI_MGMT
,
&
hdev
->
flags
))
mgmt_discovering
(
hdev
->
id
,
0
);
hci_req_complete
(
hdev
,
HCI_OP_INQUIRY
,
status
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录