Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
b4de123a
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
153
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b4de123a
编写于
3月 13, 2008
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge branches 'release', 'ejd', 'sony' and 'wmi' into release
上级
c523aef0
3b5fee59
d399d130
07d31ee5
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
40 addition
and
18 deletion
+40
-18
Documentation/laptops/acer-wmi.txt
Documentation/laptops/acer-wmi.txt
+2
-2
drivers/acpi/scan.c
drivers/acpi/scan.c
+2
-1
drivers/acpi/wmi.c
drivers/acpi/wmi.c
+6
-4
drivers/misc/Kconfig
drivers/misc/Kconfig
+1
-0
drivers/misc/acer-wmi.c
drivers/misc/acer-wmi.c
+28
-10
drivers/misc/sony-laptop.c
drivers/misc/sony-laptop.c
+1
-1
未找到文件。
Documentation/laptops/acer-wmi.txt
浏览文件 @
b4de123a
...
...
@@ -48,7 +48,7 @@ DSDT.
To send me the DSDT, as root/sudo:
cat /sys/firmware/acpi/DSDT > dsdt
cat /sys/firmware/acpi/
tables/
DSDT > dsdt
And send me the resulting 'dsdt' file.
...
...
@@ -169,7 +169,7 @@ can be added to acer-wmi.
The LED is exposed through the LED subsystem, and can be found in:
/sys/devices/platform/acer-wmi/leds/acer-
mail:green
/
/sys/devices/platform/acer-wmi/leds/acer-
wmi::mail
/
The mail LED is autodetected, so if you don't have one, the LED device won't
be registered.
...
...
drivers/acpi/scan.c
浏览文件 @
b4de123a
...
...
@@ -609,7 +609,8 @@ acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)
status
=
acpi_evaluate_object
(
handle
,
"_EJD"
,
NULL
,
&
buffer
);
if
(
ACPI_SUCCESS
(
status
))
{
obj
=
buffer
.
pointer
;
status
=
acpi_get_handle
(
NULL
,
obj
->
string
.
pointer
,
ejd
);
status
=
acpi_get_handle
(
ACPI_ROOT_OBJECT
,
obj
->
string
.
pointer
,
ejd
);
kfree
(
buffer
.
pointer
);
}
return
status
;
...
...
drivers/acpi/wmi.c
浏览文件 @
b4de123a
...
...
@@ -293,7 +293,7 @@ struct acpi_buffer *out)
{
struct
guid_block
*
block
=
NULL
;
struct
wmi_block
*
wblock
=
NULL
;
acpi_handle
handle
;
acpi_handle
handle
,
wc_handle
;
acpi_status
status
,
wc_status
=
AE_ERROR
;
struct
acpi_object_list
input
,
wc_input
;
union
acpi_object
wc_params
[
1
],
wq_params
[
1
];
...
...
@@ -338,8 +338,10 @@ struct acpi_buffer *out)
* expensive, but have no corresponding WCxx method. So we
* should not fail if this happens.
*/
wc_status
=
acpi_evaluate_object
(
handle
,
wc_method
,
&
wc_input
,
NULL
);
wc_status
=
acpi_get_handle
(
handle
,
wc_method
,
&
wc_handle
);
if
(
ACPI_SUCCESS
(
wc_status
))
wc_status
=
acpi_evaluate_object
(
handle
,
wc_method
,
&
wc_input
,
NULL
);
}
strcpy
(
method
,
"WQ"
);
...
...
@@ -351,7 +353,7 @@ struct acpi_buffer *out)
* If ACPI_WMI_EXPENSIVE, call the relevant WCxx method, even if
* the WQxx method failed - we should disable collection anyway.
*/
if
((
block
->
flags
&
ACPI_WMI_EXPENSIVE
)
&&
wc_status
)
{
if
((
block
->
flags
&
ACPI_WMI_EXPENSIVE
)
&&
ACPI_SUCCESS
(
wc_status
)
)
{
wc_params
[
0
].
integer
.
value
=
0
;
status
=
acpi_evaluate_object
(
handle
,
wc_method
,
&
wc_input
,
NULL
);
...
...
drivers/misc/Kconfig
浏览文件 @
b4de123a
...
...
@@ -108,6 +108,7 @@ config ACER_WMI
depends on ACPI
depends on LEDS_CLASS
depends on BACKLIGHT_CLASS_DEVICE
depends on SERIO_I8042
select ACPI_WMI
---help---
This is a driver for newer Acer (and Wistron) laptops. It adds
...
...
drivers/misc/acer-wmi.c
浏览文件 @
b4de123a
...
...
@@ -217,6 +217,15 @@ static struct dmi_system_id acer_quirks[] = {
},
.
driver_data
=
&
quirk_acer_travelmate_2490
,
},
{
.
callback
=
dmi_matched
,
.
ident
=
"Acer Aspire 3610"
,
.
matches
=
{
DMI_MATCH
(
DMI_SYS_VENDOR
,
"Acer"
),
DMI_MATCH
(
DMI_PRODUCT_NAME
,
"Aspire 3610"
),
},
.
driver_data
=
&
quirk_acer_travelmate_2490
,
},
{
.
callback
=
dmi_matched
,
.
ident
=
"Acer Aspire 5100"
,
...
...
@@ -226,6 +235,15 @@ static struct dmi_system_id acer_quirks[] = {
},
.
driver_data
=
&
quirk_acer_travelmate_2490
,
},
{
.
callback
=
dmi_matched
,
.
ident
=
"Acer Aspire 5610"
,
.
matches
=
{
DMI_MATCH
(
DMI_SYS_VENDOR
,
"Acer"
),
DMI_MATCH
(
DMI_PRODUCT_NAME
,
"Aspire 5610"
),
},
.
driver_data
=
&
quirk_acer_travelmate_2490
,
},
{
.
callback
=
dmi_matched
,
.
ident
=
"Acer Aspire 5630"
,
...
...
@@ -761,7 +779,7 @@ enum led_brightness value)
}
static
struct
led_classdev
mail_led
=
{
.
name
=
"acer-
mail:green
"
,
.
name
=
"acer-
wmi::mail
"
,
.
brightness_set
=
mail_led_set
,
};
...
...
@@ -1052,11 +1070,12 @@ static int __init acer_wmi_init(void)
if
(
wmi_has_guid
(
WMID_GUID2
)
&&
interface
)
{
if
(
ACPI_FAILURE
(
WMID_set_capabilities
()))
{
printk
(
ACER_ERR
"Unable to detect available devices
\n
"
);
printk
(
ACER_ERR
"Unable to detect available WMID "
"devices
\n
"
);
return
-
ENODEV
;
}
}
else
if
(
!
wmi_has_guid
(
WMID_GUID2
)
&&
interface
)
{
printk
(
ACER_ERR
"
Unable to detect available devices
\n
"
);
printk
(
ACER_ERR
"
No WMID device detection method found
\n
"
);
return
-
ENODEV
;
}
...
...
@@ -1064,21 +1083,20 @@ static int __init acer_wmi_init(void)
interface
=
&
AMW0_interface
;
if
(
ACPI_FAILURE
(
AMW0_set_capabilities
()))
{
printk
(
ACER_ERR
"Unable to detect available devices
\n
"
);
printk
(
ACER_ERR
"Unable to detect available AMW0 "
"devices
\n
"
);
return
-
ENODEV
;
}
}
if
(
wmi_has_guid
(
AMW0_GUID1
))
{
if
(
ACPI_FAILURE
(
AMW0_find_mailled
()))
printk
(
ACER_ERR
"Unable to detect mail LED
\n
"
);
}
if
(
wmi_has_guid
(
AMW0_GUID1
))
AMW0_find_mailled
();
find_quirks
();
if
(
!
interface
)
{
printk
(
ACER_ERR
"No or unsupported WMI interface, unable to "
);
printk
(
KERN_CONT
"load.
\n
"
);
printk
(
ACER_ERR
"No or unsupported WMI interface, unable to "
"load
\n
"
);
return
-
ENODEV
;
}
...
...
drivers/misc/sony-laptop.c
浏览文件 @
b4de123a
...
...
@@ -315,7 +315,7 @@ static void sony_laptop_report_input_event(u8 event)
break
;
default:
if
(
event
>
ARRAY_SIZE
(
sony_laptop_input_index
))
{
if
(
event
>
=
ARRAY_SIZE
(
sony_laptop_input_index
))
{
dprintk
(
"sony_laptop_report_input_event, event not known: %d
\n
"
,
event
);
break
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录