Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
eca008c8
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
eca008c8
编写于
9月 22, 2005
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[ACPI] handle ACPICA 20050916's acpi_resource.type rename
Signed-off-by:
N
Len Brown
<
len.brown@intel.com
>
上级
bda663d3
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
33 addition
and
33 deletion
+33
-33
drivers/acpi/ec.c
drivers/acpi/ec.c
+1
-1
drivers/acpi/glue.c
drivers/acpi/glue.c
+3
-3
drivers/acpi/motherboard.c
drivers/acpi/motherboard.c
+2
-2
drivers/acpi/pci_link.c
drivers/acpi/pci_link.c
+5
-5
drivers/acpi/pci_root.c
drivers/acpi/pci_root.c
+3
-3
drivers/char/hpet.c
drivers/char/hpet.c
+1
-1
drivers/pnp/pnpacpi/rsparser.c
drivers/pnp/pnpacpi/rsparser.c
+18
-18
未找到文件。
drivers/acpi/ec.c
浏览文件 @
eca008c8
...
...
@@ -1151,7 +1151,7 @@ acpi_ec_io_ports(struct acpi_resource *resource, void *context)
union
acpi_ec
*
ec
=
(
union
acpi_ec
*
)
context
;
struct
acpi_generic_address
*
addr
;
if
(
resource
->
id
!=
ACPI_RSTYPE_IO
)
{
if
(
resource
->
type
!=
ACPI_RSTYPE_IO
)
{
return
AE_OK
;
}
...
...
drivers/acpi/glue.c
浏览文件 @
eca008c8
...
...
@@ -99,9 +99,9 @@ do_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
int
*
busnr
=
(
int
*
)
data
;
struct
acpi_resource_address64
address
;
if
(
resource
->
id
!=
ACPI_RSTYPE_ADDRESS16
&&
resource
->
id
!=
ACPI_RSTYPE_ADDRESS32
&&
resource
->
id
!=
ACPI_RSTYPE_ADDRESS64
)
if
(
resource
->
type
!=
ACPI_RSTYPE_ADDRESS16
&&
resource
->
type
!=
ACPI_RSTYPE_ADDRESS32
&&
resource
->
type
!=
ACPI_RSTYPE_ADDRESS64
)
return
AE_OK
;
acpi_resource_to_address64
(
resource
,
&
address
);
...
...
drivers/acpi/motherboard.c
浏览文件 @
eca008c8
...
...
@@ -54,7 +54,7 @@ static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)
ACPI_FUNCTION_TRACE
(
"acpi_reserve_io_ranges"
);
if
(
res
->
id
==
ACPI_RSTYPE_IO
)
{
if
(
res
->
type
==
ACPI_RSTYPE_IO
)
{
struct
acpi_resource_io
*
io_res
=
&
res
->
data
.
io
;
if
(
io_res
->
min_base_address
!=
io_res
->
max_base_address
)
...
...
@@ -70,7 +70,7 @@ static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)
request_region
(
io_res
->
min_base_address
,
io_res
->
range_length
,
"motherboard"
);
}
}
else
if
(
res
->
id
==
ACPI_RSTYPE_FIXED_IO
)
{
}
else
if
(
res
->
type
==
ACPI_RSTYPE_FIXED_IO
)
{
struct
acpi_resource_fixed_io
*
fixed_io_res
=
&
res
->
data
.
fixed_io
;
...
...
drivers/acpi/pci_link.c
浏览文件 @
eca008c8
...
...
@@ -108,7 +108,7 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
ACPI_FUNCTION_TRACE
(
"acpi_pci_link_check_possible"
);
switch
(
resource
->
id
)
{
switch
(
resource
->
type
)
{
case
ACPI_RSTYPE_START_DPF
:
return_ACPI_STATUS
(
AE_OK
);
case
ACPI_RSTYPE_IRQ
:
...
...
@@ -201,7 +201,7 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
ACPI_FUNCTION_TRACE
(
"acpi_pci_link_check_current"
);
switch
(
resource
->
id
)
{
switch
(
resource
->
type
)
{
case
ACPI_RSTYPE_IRQ
:
{
struct
acpi_resource_irq
*
p
=
&
resource
->
data
.
irq
;
...
...
@@ -326,7 +326,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
switch
(
link
->
irq
.
resource_type
)
{
case
ACPI_RSTYPE_IRQ
:
resource
->
res
.
id
=
ACPI_RSTYPE_IRQ
;
resource
->
res
.
type
=
ACPI_RSTYPE_IRQ
;
resource
->
res
.
length
=
sizeof
(
struct
acpi_resource
);
resource
->
res
.
data
.
irq
.
edge_level
=
link
->
irq
.
edge_level
;
resource
->
res
.
data
.
irq
.
active_high_low
=
...
...
@@ -341,7 +341,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
break
;
case
ACPI_RSTYPE_EXT_IRQ
:
resource
->
res
.
id
=
ACPI_RSTYPE_EXT_IRQ
;
resource
->
res
.
type
=
ACPI_RSTYPE_EXT_IRQ
;
resource
->
res
.
length
=
sizeof
(
struct
acpi_resource
);
resource
->
res
.
data
.
extended_irq
.
producer_consumer
=
ACPI_CONSUMER
;
...
...
@@ -364,7 +364,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
goto
end
;
}
resource
->
end
.
id
=
ACPI_RSTYPE_END_TAG
;
resource
->
end
.
type
=
ACPI_RSTYPE_END_TAG
;
/* Attempt to set the resource */
status
=
acpi_set_current_resources
(
link
->
handle
,
&
buffer
);
...
...
drivers/acpi/pci_root.c
浏览文件 @
eca008c8
...
...
@@ -122,9 +122,9 @@ get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
int
*
busnr
=
(
int
*
)
data
;
struct
acpi_resource_address64
address
;
if
(
resource
->
id
!=
ACPI_RSTYPE_ADDRESS16
&&
resource
->
id
!=
ACPI_RSTYPE_ADDRESS32
&&
resource
->
id
!=
ACPI_RSTYPE_ADDRESS64
)
if
(
resource
->
type
!=
ACPI_RSTYPE_ADDRESS16
&&
resource
->
type
!=
ACPI_RSTYPE_ADDRESS32
&&
resource
->
type
!=
ACPI_RSTYPE_ADDRESS64
)
return
AE_OK
;
acpi_resource_to_address64
(
resource
,
&
address
);
...
...
drivers/char/hpet.c
浏览文件 @
eca008c8
...
...
@@ -897,7 +897,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
for
(
hpetp
=
hpets
;
hpetp
;
hpetp
=
hpetp
->
hp_next
)
if
(
hpetp
->
hp_hpet
==
hdp
->
hd_address
)
return
-
EBUSY
;
}
else
if
(
res
->
id
==
ACPI_RSTYPE_EXT_IRQ
)
{
}
else
if
(
res
->
type
==
ACPI_RSTYPE_EXT_IRQ
)
{
struct
acpi_resource_ext_irq
*
irqp
;
int
i
;
...
...
drivers/pnp/pnpacpi/rsparser.c
浏览文件 @
eca008c8
...
...
@@ -163,7 +163,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
struct
pnp_resource_table
*
res_table
=
(
struct
pnp_resource_table
*
)
data
;
int
i
;
switch
(
res
->
id
)
{
switch
(
res
->
type
)
{
case
ACPI_RSTYPE_IRQ
:
/*
* Per spec, only one interrupt per descriptor is allowed in
...
...
@@ -233,7 +233,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
case
ACPI_RSTYPE_VENDOR
:
break
;
default:
pnp_warn
(
"PnPACPI: unknown resource type %d"
,
res
->
id
);
pnp_warn
(
"PnPACPI: unknown resource type %d"
,
res
->
type
);
return
AE_ERROR
;
}
...
...
@@ -467,7 +467,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
struct
pnp_dev
*
dev
=
parse_data
->
dev
;
struct
pnp_option
*
option
=
parse_data
->
option
;
switch
(
res
->
id
)
{
switch
(
res
->
type
)
{
case
ACPI_RSTYPE_IRQ
:
pnpacpi_parse_irq_option
(
option
,
&
res
->
data
.
irq
);
break
;
...
...
@@ -528,7 +528,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
parse_data
->
option_independent
=
NULL
;
break
;
default:
pnp_warn
(
"PnPACPI: unknown resource type %d"
,
res
->
id
);
pnp_warn
(
"PnPACPI: unknown resource type %d"
,
res
->
type
);
return
AE_ERROR
;
}
...
...
@@ -559,7 +559,7 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
void
*
data
)
{
int
*
res_cnt
=
(
int
*
)
data
;
switch
(
res
->
id
)
{
switch
(
res
->
type
)
{
case
ACPI_RSTYPE_IRQ
:
case
ACPI_RSTYPE_EXT_IRQ
:
case
ACPI_RSTYPE_DMA
:
...
...
@@ -584,7 +584,7 @@ static acpi_status pnpacpi_type_resources(struct acpi_resource *res,
void
*
data
)
{
struct
acpi_resource
**
resource
=
(
struct
acpi_resource
**
)
data
;
switch
(
res
->
id
)
{
switch
(
res
->
type
)
{
case
ACPI_RSTYPE_IRQ
:
case
ACPI_RSTYPE_EXT_IRQ
:
case
ACPI_RSTYPE_DMA
:
...
...
@@ -598,7 +598,7 @@ static acpi_status pnpacpi_type_resources(struct acpi_resource *res,
case ACPI_RSTYPE_ADDRESS32:
case ACPI_RSTYPE_ADDRESS64:
#endif
(
*
resource
)
->
id
=
res
->
id
;
(
*
resource
)
->
type
=
res
->
type
;
(
*
resource
)
++
;
default:
return
AE_OK
;
...
...
@@ -636,7 +636,7 @@ int pnpacpi_build_resource_template(acpi_handle handle,
return
-
EINVAL
;
}
/* resource will pointer the end resource now */
resource
->
id
=
ACPI_RSTYPE_END_TAG
;
resource
->
type
=
ACPI_RSTYPE_END_TAG
;
return
0
;
}
...
...
@@ -648,7 +648,7 @@ static void pnpacpi_encode_irq(struct acpi_resource *resource,
decode_irq_flags
(
p
->
flags
&
IORESOURCE_BITS
,
&
edge_level
,
&
active_high_low
);
resource
->
id
=
ACPI_RSTYPE_IRQ
;
resource
->
type
=
ACPI_RSTYPE_IRQ
;
resource
->
length
=
sizeof
(
struct
acpi_resource
);
resource
->
data
.
irq
.
edge_level
=
edge_level
;
resource
->
data
.
irq
.
active_high_low
=
active_high_low
;
...
...
@@ -667,7 +667,7 @@ static void pnpacpi_encode_ext_irq(struct acpi_resource *resource,
decode_irq_flags
(
p
->
flags
&
IORESOURCE_BITS
,
&
edge_level
,
&
active_high_low
);
resource
->
id
=
ACPI_RSTYPE_EXT_IRQ
;
resource
->
type
=
ACPI_RSTYPE_EXT_IRQ
;
resource
->
length
=
sizeof
(
struct
acpi_resource
);
resource
->
data
.
extended_irq
.
producer_consumer
=
ACPI_CONSUMER
;
resource
->
data
.
extended_irq
.
edge_level
=
edge_level
;
...
...
@@ -683,7 +683,7 @@ static void pnpacpi_encode_ext_irq(struct acpi_resource *resource,
static
void
pnpacpi_encode_dma
(
struct
acpi_resource
*
resource
,
struct
resource
*
p
)
{
resource
->
id
=
ACPI_RSTYPE_DMA
;
resource
->
type
=
ACPI_RSTYPE_DMA
;
resource
->
length
=
sizeof
(
struct
acpi_resource
);
/* Note: pnp_assign_dma will copy pnp_dma->flags into p->flags */
if
(
p
->
flags
&
IORESOURCE_DMA_COMPATIBLE
)
...
...
@@ -708,7 +708,7 @@ static void pnpacpi_encode_dma(struct acpi_resource *resource,
static
void
pnpacpi_encode_io
(
struct
acpi_resource
*
resource
,
struct
resource
*
p
)
{
resource
->
id
=
ACPI_RSTYPE_IO
;
resource
->
type
=
ACPI_RSTYPE_IO
;
resource
->
length
=
sizeof
(
struct
acpi_resource
);
/* Note: pnp_assign_port will copy pnp_port->flags into p->flags */
resource
->
data
.
io
.
io_decode
=
(
p
->
flags
&
PNP_PORT_FLAG_16BITADDR
)
?
...
...
@@ -722,7 +722,7 @@ static void pnpacpi_encode_io(struct acpi_resource *resource,
static
void
pnpacpi_encode_fixed_io
(
struct
acpi_resource
*
resource
,
struct
resource
*
p
)
{
resource
->
id
=
ACPI_RSTYPE_FIXED_IO
;
resource
->
type
=
ACPI_RSTYPE_FIXED_IO
;
resource
->
length
=
sizeof
(
struct
acpi_resource
);
resource
->
data
.
fixed_io
.
base_address
=
p
->
start
;
resource
->
data
.
fixed_io
.
range_length
=
p
->
end
-
p
->
start
+
1
;
...
...
@@ -731,7 +731,7 @@ static void pnpacpi_encode_fixed_io(struct acpi_resource *resource,
static
void
pnpacpi_encode_mem24
(
struct
acpi_resource
*
resource
,
struct
resource
*
p
)
{
resource
->
id
=
ACPI_RSTYPE_MEM24
;
resource
->
type
=
ACPI_RSTYPE_MEM24
;
resource
->
length
=
sizeof
(
struct
acpi_resource
);
/* Note: pnp_assign_mem will copy pnp_mem->flags into p->flags */
resource
->
data
.
memory24
.
read_write_attribute
=
...
...
@@ -746,7 +746,7 @@ static void pnpacpi_encode_mem24(struct acpi_resource *resource,
static
void
pnpacpi_encode_mem32
(
struct
acpi_resource
*
resource
,
struct
resource
*
p
)
{
resource
->
id
=
ACPI_RSTYPE_MEM32
;
resource
->
type
=
ACPI_RSTYPE_MEM32
;
resource
->
length
=
sizeof
(
struct
acpi_resource
);
resource
->
data
.
memory32
.
read_write_attribute
=
(
p
->
flags
&
IORESOURCE_MEM_WRITEABLE
)
?
...
...
@@ -760,7 +760,7 @@ static void pnpacpi_encode_mem32(struct acpi_resource *resource,
static
void
pnpacpi_encode_fixed_mem32
(
struct
acpi_resource
*
resource
,
struct
resource
*
p
)
{
resource
->
id
=
ACPI_RSTYPE_FIXED_MEM32
;
resource
->
type
=
ACPI_RSTYPE_FIXED_MEM32
;
resource
->
length
=
sizeof
(
struct
acpi_resource
);
resource
->
data
.
fixed_memory32
.
read_write_attribute
=
(
p
->
flags
&
IORESOURCE_MEM_WRITEABLE
)
?
...
...
@@ -780,7 +780,7 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
pnp_dbg
(
"res cnt %d"
,
res_cnt
);
while
(
i
<
res_cnt
)
{
switch
(
resource
->
id
)
{
switch
(
resource
->
type
)
{
case
ACPI_RSTYPE_IRQ
:
pnp_dbg
(
"Encode irq"
);
pnpacpi_encode_irq
(
resource
,
...
...
@@ -831,7 +831,7 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
mem
++
;
break
;
default:
/* other type */
pnp_warn
(
"unknown resource type %d"
,
resource
->
id
);
pnp_warn
(
"unknown resource type %d"
,
resource
->
type
);
return
-
EINVAL
;
}
resource
++
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录