Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
qemu
提交
c20df14b
Q
qemu
项目概览
openeuler
/
qemu
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c20df14b
编写于
12月 03, 2010
作者:
J
Juan Quintela
提交者:
Anthony Liguori
4月 22, 2011
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mac_dbdma: create DBDMAState instead of passing one array around
Signed-off-by:
N
Juan Quintela
<
quintela@redhat.com
>
上级
9039d78e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
27 addition
and
18 deletion
+27
-18
hw/mac_dbdma.c
hw/mac_dbdma.c
+27
-18
未找到文件。
hw/mac_dbdma.c
浏览文件 @
c20df14b
...
...
@@ -165,6 +165,10 @@ typedef struct DBDMA_channel {
int
processing
;
}
DBDMA_channel
;
typedef
struct
{
DBDMA_channel
channels
[
DBDMA_CHANNELS
];
}
DBDMAState
;
#ifdef DEBUG_DBDMA
static
void
dump_dbdma_cmd
(
dbdma_cmd
*
cmd
)
{
...
...
@@ -617,31 +621,34 @@ static void channel_run(DBDMA_channel *ch)
}
}
static
void
DBDMA_run
(
DBDMA_channel
*
ch
)
static
void
DBDMA_run
(
DBDMAState
*
s
)
{
int
channel
;
for
(
channel
=
0
;
channel
<
DBDMA_CHANNELS
;
channel
++
,
ch
++
)
{
uint32_t
status
=
ch
->
regs
[
DBDMA_STATUS
];
if
(
!
ch
->
processing
&&
(
status
&
RUN
)
&&
(
status
&
ACTIVE
))
channel_run
(
ch
);
for
(
channel
=
0
;
channel
<
DBDMA_CHANNELS
;
channel
++
)
{
DBDMA_channel
*
ch
=
&
s
->
channels
[
channel
];
uint32_t
status
=
ch
->
regs
[
DBDMA_STATUS
];
if
(
!
ch
->
processing
&&
(
status
&
RUN
)
&&
(
status
&
ACTIVE
))
{
channel_run
(
ch
);
}
}
}
static
void
DBDMA_run_bh
(
void
*
opaque
)
{
DBDMA
_channel
*
ch
=
opaque
;
DBDMA
State
*
s
=
opaque
;
DBDMA_DPRINTF
(
"DBDMA_run_bh
\n
"
);
DBDMA_run
(
ch
);
DBDMA_run
(
s
);
}
void
DBDMA_register_channel
(
void
*
dbdma
,
int
nchan
,
qemu_irq
irq
,
DBDMA_rw
rw
,
DBDMA_flush
flush
,
void
*
opaque
)
{
DBDMA_channel
*
ch
=
(
DBDMA_channel
*
)
dbdma
+
nchan
;
DBDMAState
*
s
=
dbdma
;
DBDMA_channel
*
ch
=
&
s
->
channels
[
nchan
];
DBDMA_DPRINTF
(
"DBDMA_register_channel 0x%x
\n
"
,
nchan
);
...
...
@@ -700,7 +707,8 @@ static void dbdma_writel (void *opaque,
target_phys_addr_t
addr
,
uint32_t
value
)
{
int
channel
=
addr
>>
DBDMA_CHANNEL_SHIFT
;
DBDMA_channel
*
ch
=
(
DBDMA_channel
*
)
opaque
+
channel
;
DBDMAState
*
s
=
opaque
;
DBDMA_channel
*
ch
=
&
s
->
channels
[
channel
];
int
reg
=
(
addr
-
(
channel
<<
DBDMA_CHANNEL_SHIFT
))
>>
2
;
DBDMA_DPRINTF
(
"writel 0x"
TARGET_FMT_plx
" <= 0x%08x
\n
"
,
addr
,
value
);
...
...
@@ -749,7 +757,8 @@ static uint32_t dbdma_readl (void *opaque, target_phys_addr_t addr)
{
uint32_t
value
;
int
channel
=
addr
>>
DBDMA_CHANNEL_SHIFT
;
DBDMA_channel
*
ch
=
(
DBDMA_channel
*
)
opaque
+
channel
;
DBDMAState
*
s
=
opaque
;
DBDMA_channel
*
ch
=
&
s
->
channels
[
channel
];
int
reg
=
(
addr
-
(
channel
<<
DBDMA_CHANNEL_SHIFT
))
>>
2
;
value
=
ch
->
regs
[
reg
];
...
...
@@ -803,17 +812,17 @@ static CPUReadMemoryFunc * const dbdma_read[] = {
static
void
dbdma_save
(
QEMUFile
*
f
,
void
*
opaque
)
{
DBDMA
_channel
*
s
=
opaque
;
DBDMA
State
*
s
=
opaque
;
unsigned
int
i
,
j
;
for
(
i
=
0
;
i
<
DBDMA_CHANNELS
;
i
++
)
for
(
j
=
0
;
j
<
DBDMA_REGS
;
j
++
)
qemu_put_be32s
(
f
,
&
s
[
i
].
regs
[
j
]);
qemu_put_be32s
(
f
,
&
s
->
channels
[
i
].
regs
[
j
]);
}
static
int
dbdma_load
(
QEMUFile
*
f
,
void
*
opaque
,
int
version_id
)
{
DBDMA
_channel
*
s
=
opaque
;
DBDMA
State
*
s
=
opaque
;
unsigned
int
i
,
j
;
if
(
version_id
!=
2
)
...
...
@@ -821,25 +830,25 @@ static int dbdma_load(QEMUFile *f, void *opaque, int version_id)
for
(
i
=
0
;
i
<
DBDMA_CHANNELS
;
i
++
)
for
(
j
=
0
;
j
<
DBDMA_REGS
;
j
++
)
qemu_get_be32s
(
f
,
&
s
[
i
].
regs
[
j
]);
qemu_get_be32s
(
f
,
&
s
->
channels
[
i
].
regs
[
j
]);
return
0
;
}
static
void
dbdma_reset
(
void
*
opaque
)
{
DBDMA
_channel
*
s
=
opaque
;
DBDMA
State
*
s
=
opaque
;
int
i
;
for
(
i
=
0
;
i
<
DBDMA_CHANNELS
;
i
++
)
memset
(
s
[
i
].
regs
,
0
,
DBDMA_SIZE
);
memset
(
s
->
channels
[
i
].
regs
,
0
,
DBDMA_SIZE
);
}
void
*
DBDMA_init
(
int
*
dbdma_mem_index
)
{
DBDMA
_channel
*
s
;
DBDMA
State
*
s
;
s
=
qemu_mallocz
(
sizeof
(
DBDMA
_channel
)
*
DBDMA_CHANNELS
);
s
=
qemu_mallocz
(
sizeof
(
DBDMA
State
)
);
*
dbdma_mem_index
=
cpu_register_io_memory
(
dbdma_read
,
dbdma_write
,
s
,
DEVICE_LITTLE_ENDIAN
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录