Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
f212bd95
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
160
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
f212bd95
编写于
9月 01, 2015
作者:
J
Jiri Kosina
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-4.3/microsoft' into for-linus
Conflicts: drivers/hid/usbhid/hid-quirks.c
上级
8c4de9bc
0439de75
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
8 deletion
+14
-8
drivers/hid/hid-core.c
drivers/hid/hid-core.c
+5
-3
drivers/hid/hid-ids.h
drivers/hid/hid-ids.h
+3
-2
drivers/hid/hid-microsoft.c
drivers/hid/hid-microsoft.c
+4
-2
drivers/hid/usbhid/hid-quirks.c
drivers/hid/usbhid/hid-quirks.c
+2
-1
未找到文件。
drivers/hid/hid-core.c
浏览文件 @
f212bd95
...
...
@@ -724,8 +724,9 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
hid
->
group
=
HID_GROUP_SENSOR_HUB
;
if
(
hid
->
vendor
==
USB_VENDOR_ID_MICROSOFT
&&
(
hid
->
product
==
USB_DEVICE_ID_MS_TYPE_COVER_3
||
hid
->
product
==
USB_DEVICE_ID_MS_TYPE_COVER_3_JP
||
(
hid
->
product
==
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3
||
hid
->
product
==
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP
||
hid
->
product
==
USB_DEVICE_ID_MS_TYPE_COVER_3
||
hid
->
product
==
USB_DEVICE_ID_MS_POWER_COVER
)
&&
hid
->
group
==
HID_GROUP_MULTITOUCH
)
hid
->
group
=
HID_GROUP_GENERIC
;
...
...
@@ -1926,8 +1927,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_OFFICE_KB
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_3
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_3_JP
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_POWER_COVER
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MONTEREY
,
USB_DEVICE_ID_GENIUS_KB29E
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MSI
,
USB_DEVICE_ID_MSI_GT683R_LED_PANEL
)
},
...
...
drivers/hid/hid-ids.h
浏览文件 @
f212bd95
...
...
@@ -678,8 +678,9 @@
#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
#define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07dc
#define USB_DEVICE_ID_MS_TYPE_COVER_3_JP 0x07dd
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd
#define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07de
#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
#define USB_VENDOR_ID_MOJO 0x8282
...
...
drivers/hid/hid-microsoft.c
浏览文件 @
f212bd95
...
...
@@ -276,9 +276,11 @@ static const struct hid_device_id ms_devices[] = {
.
driver_data
=
MS_NOGET
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_COMFORT_MOUSE_4500
),
.
driver_data
=
MS_DUPLICATE_USAGES
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_3
),
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3
),
.
driver_data
=
MS_HIDINPUT
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP
),
.
driver_data
=
MS_HIDINPUT
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_3
_JP
),
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_3
),
.
driver_data
=
MS_HIDINPUT
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_POWER_COVER
),
.
driver_data
=
MS_HIDINPUT
},
...
...
drivers/hid/usbhid/hid-quirks.c
浏览文件 @
f212bd95
...
...
@@ -90,8 +90,9 @@ static const struct hid_blacklist {
{
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_SURFACE_PRO_2
,
HID_QUIRK_NO_INIT_REPORTS
},
{
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_2
,
HID_QUIRK_NO_INIT_REPORTS
},
{
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TOUCH_COVER_2
,
HID_QUIRK_NO_INIT_REPORTS
},
{
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3
,
HID_QUIRK_NO_INIT_REPORTS
},
{
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP
,
HID_QUIRK_NO_INIT_REPORTS
},
{
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_3
,
HID_QUIRK_NO_INIT_REPORTS
},
{
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_TYPE_COVER_3_JP
,
HID_QUIRK_NO_INIT_REPORTS
},
{
USB_VENDOR_ID_MICROSOFT
,
USB_DEVICE_ID_MS_POWER_COVER
,
HID_QUIRK_NO_INIT_REPORTS
},
{
USB_VENDOR_ID_MSI
,
USB_DEVICE_ID_MSI_GT683R_LED_PANEL
,
HID_QUIRK_NO_INIT_REPORTS
},
{
USB_VENDOR_ID_NEXIO
,
USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750
,
HID_QUIRK_NO_INIT_REPORTS
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录