Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
5cb69bca
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,发现更多精彩内容 >>
提交
5cb69bca
编写于
3月 09, 2007
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
差异文件
Pull ibm into release branch
上级
c207908f
c9bf296b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
2 deletion
+37
-2
drivers/acpi/Kconfig
drivers/acpi/Kconfig
+11
-0
drivers/acpi/ibm_acpi.c
drivers/acpi/ibm_acpi.c
+26
-2
未找到文件。
drivers/acpi/Kconfig
浏览文件 @
5cb69bca
...
...
@@ -243,6 +243,17 @@ config ACPI_IBM_DOCK
If you are not sure, say N here.
config ACPI_IBM_BAY
bool "Legacy Removable Bay Support"
depends on ACPI_IBM
default y
---help---
Allows the ibm_acpi driver to handle removable bays. It will allow
disabling the device in the bay, and also generate notifications when
the bay lever is ejected or inserted.
If you are not sure, say Y here.
config ACPI_TOSHIBA
tristate "Toshiba Laptop Extras"
depends on X86
...
...
drivers/acpi/ibm_acpi.c
浏览文件 @
5cb69bca
...
...
@@ -86,6 +86,7 @@
#include <linux/proc_fs.h>
#include <linux/backlight.h>
#include <linux/fb.h>
#include <asm/uaccess.h>
#include <linux/dmi.h>
...
...
@@ -157,6 +158,7 @@ IBM_HANDLE(dock, root, "\\_SB.GDCK", /* X30, X31, X40 */
"
\\
_SB.PCI.ISA.SLCE"
,
/* 570 */
);
/* A21e,G4x,R30,R31,R32,R40,R40e,R50e */
#endif
#ifdef CONFIG_ACPI_IBM_BAY
IBM_HANDLE
(
bay
,
root
,
"
\\
_SB.PCI.IDE.SECN.MAST"
,
/* 570 */
"
\\
_SB.PCI0.IDE0.IDES.IDSM"
,
/* 600e/x, 770e, 770x */
"
\\
_SB.PCI0.SATA.SCND.MSTR"
,
/* T60, X60, Z60 */
...
...
@@ -174,6 +176,7 @@ IBM_HANDLE(bay2, root, "\\_SB.PCI0.IDE0.PRIM.SLAV", /* A3x, R32 */
IBM_HANDLE
(
bay2_ej
,
bay2
,
"_EJ3"
,
/* 600e/x, 770e, A3x */
"_EJ0"
,
/* 770x */
);
/* all others */
#endif
/* CONFIG_ACPI_IBM_BAY */
/* don't list other alternatives as we install a notify handler on the 570 */
IBM_HANDLE
(
pci
,
root
,
"
\\
_SB.PCI"
);
/* 570 */
...
...
@@ -1044,6 +1047,7 @@ static int light_write(char *buf)
return
0
;
}
#if defined(CONFIG_ACPI_IBM_DOCK) || defined(CONFIG_ACPI_IBM_BAY)
static
int
_sta
(
acpi_handle
handle
)
{
int
status
;
...
...
@@ -1053,6 +1057,7 @@ static int _sta(acpi_handle handle)
return
status
;
}
#endif
#ifdef CONFIG_ACPI_IBM_DOCK
#define dock_docked() (_sta(dock_handle) & 1)
...
...
@@ -1119,6 +1124,7 @@ static void dock_notify(struct ibm_struct *ibm, u32 event)
}
#endif
#ifdef CONFIG_ACPI_IBM_BAY
static
int
bay_status_supported
;
static
int
bay_status2_supported
;
static
int
bay_eject_supported
;
...
...
@@ -1194,6 +1200,7 @@ static void bay_notify(struct ibm_struct *ibm, u32 event)
{
acpi_bus_generate_event
(
ibm
->
device
,
event
,
0
);
}
#endif
/* CONFIG_ACPI_IBM_BAY */
static
int
cmos_read
(
char
*
p
)
{
...
...
@@ -1701,7 +1708,10 @@ static int brightness_write(char *buf)
static
int
brightness_update_status
(
struct
backlight_device
*
bd
)
{
return
brightness_set
(
bd
->
props
.
brightness
);
return
brightness_set
(
(
bd
->
props
.
fb_blank
==
FB_BLANK_UNBLANK
&&
bd
->
props
.
power
==
FB_BLANK_UNBLANK
)
?
bd
->
props
.
brightness
:
0
);
}
static
struct
backlight_ops
ibm_backlight_data
=
{
...
...
@@ -1711,6 +1721,12 @@ static struct backlight_ops ibm_backlight_data = {
static
int
brightness_init
(
void
)
{
int
b
;
b
=
brightness_get
(
NULL
);
if
(
b
<
0
)
return
b
;
ibm_backlight_device
=
backlight_device_register
(
"ibm"
,
NULL
,
NULL
,
&
ibm_backlight_data
);
if
(
IS_ERR
(
ibm_backlight_device
))
{
...
...
@@ -1718,7 +1734,9 @@ static int brightness_init(void)
return
PTR_ERR
(
ibm_backlight_device
);
}
ibm_backlight_device
->
props
.
max_brightness
=
7
;
ibm_backlight_device
->
props
.
max_brightness
=
7
;
ibm_backlight_device
->
props
.
brightness
=
b
;
backlight_update_status
(
ibm_backlight_device
);
return
0
;
}
...
...
@@ -2353,6 +2371,7 @@ static struct ibm_struct ibms[] = {
.
type
=
ACPI_SYSTEM_NOTIFY
,
},
#endif
#ifdef CONFIG_ACPI_IBM_BAY
{
.
name
=
"bay"
,
.
init
=
bay_init
,
...
...
@@ -2362,6 +2381,7 @@ static struct ibm_struct ibms[] = {
.
handle
=
&
bay_handle
,
.
type
=
ACPI_SYSTEM_NOTIFY
,
},
#endif
/* CONFIG_ACPI_IBM_BAY */
{
.
name
=
"cmos"
,
.
read
=
cmos_read
,
...
...
@@ -2647,7 +2667,9 @@ IBM_PARAM(light);
#ifdef CONFIG_ACPI_IBM_DOCK
IBM_PARAM
(
dock
);
#endif
#ifdef CONFIG_ACPI_IBM_BAY
IBM_PARAM
(
bay
);
#endif
/* CONFIG_ACPI_IBM_BAY */
IBM_PARAM
(
cmos
);
IBM_PARAM
(
led
);
IBM_PARAM
(
beep
);
...
...
@@ -2723,12 +2745,14 @@ static int __init acpi_ibm_init(void)
IBM_HANDLE_INIT
(
dock
);
#endif
IBM_HANDLE_INIT
(
pci
);
#ifdef CONFIG_ACPI_IBM_BAY
IBM_HANDLE_INIT
(
bay
);
if
(
bay_handle
)
IBM_HANDLE_INIT
(
bay_ej
);
IBM_HANDLE_INIT
(
bay2
);
if
(
bay2_handle
)
IBM_HANDLE_INIT
(
bay2_ej
);
#endif
/* CONFIG_ACPI_IBM_BAY */
IBM_HANDLE_INIT
(
beep
);
IBM_HANDLE_INIT
(
ecrd
);
IBM_HANDLE_INIT
(
ecwr
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录