Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
qemu
提交
cf4dc461
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看板
提交
cf4dc461
编写于
2月 07, 2012
作者:
M
malc
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Restore consistent formatting
Signed-off-by:
N
malc
<
av1474@comtv.ru
>
上级
e87f7fc6
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
129 addition
and
129 deletion
+129
-129
hw/ac97.c
hw/ac97.c
+28
-28
hw/adlib.c
hw/adlib.c
+1
-1
hw/cs4231a.c
hw/cs4231a.c
+11
-11
hw/es1370.c
hw/es1370.c
+21
-21
hw/gus.c
hw/gus.c
+14
-14
hw/sb16.c
hw/sb16.c
+54
-54
未找到文件。
hw/ac97.c
浏览文件 @
cf4dc461
...
@@ -1175,17 +1175,17 @@ static const VMStateDescription vmstate_ac97_bm_regs = {
...
@@ -1175,17 +1175,17 @@ static const VMStateDescription vmstate_ac97_bm_regs = {
.
minimum_version_id
=
1
,
.
minimum_version_id
=
1
,
.
minimum_version_id_old
=
1
,
.
minimum_version_id_old
=
1
,
.
fields
=
(
VMStateField
[])
{
.
fields
=
(
VMStateField
[])
{
VMSTATE_UINT32
(
bdbar
,
AC97BusMasterRegs
),
VMSTATE_UINT32
(
bdbar
,
AC97BusMasterRegs
),
VMSTATE_UINT8
(
civ
,
AC97BusMasterRegs
),
VMSTATE_UINT8
(
civ
,
AC97BusMasterRegs
),
VMSTATE_UINT8
(
lvi
,
AC97BusMasterRegs
),
VMSTATE_UINT8
(
lvi
,
AC97BusMasterRegs
),
VMSTATE_UINT16
(
sr
,
AC97BusMasterRegs
),
VMSTATE_UINT16
(
sr
,
AC97BusMasterRegs
),
VMSTATE_UINT16
(
picb
,
AC97BusMasterRegs
),
VMSTATE_UINT16
(
picb
,
AC97BusMasterRegs
),
VMSTATE_UINT8
(
piv
,
AC97BusMasterRegs
),
VMSTATE_UINT8
(
piv
,
AC97BusMasterRegs
),
VMSTATE_UINT8
(
cr
,
AC97BusMasterRegs
),
VMSTATE_UINT8
(
cr
,
AC97BusMasterRegs
),
VMSTATE_UINT32
(
bd_valid
,
AC97BusMasterRegs
),
VMSTATE_UINT32
(
bd_valid
,
AC97BusMasterRegs
),
VMSTATE_UINT32
(
bd
.
addr
,
AC97BusMasterRegs
),
VMSTATE_UINT32
(
bd
.
addr
,
AC97BusMasterRegs
),
VMSTATE_UINT32
(
bd
.
ctl_len
,
AC97BusMasterRegs
),
VMSTATE_UINT32
(
bd
.
ctl_len
,
AC97BusMasterRegs
),
VMSTATE_END_OF_LIST
()
VMSTATE_END_OF_LIST
()
}
}
};
};
...
@@ -1224,15 +1224,15 @@ static const VMStateDescription vmstate_ac97 = {
...
@@ -1224,15 +1224,15 @@ static const VMStateDescription vmstate_ac97 = {
.
minimum_version_id_old
=
2
,
.
minimum_version_id_old
=
2
,
.
post_load
=
ac97_post_load
,
.
post_load
=
ac97_post_load
,
.
fields
=
(
VMStateField
[])
{
.
fields
=
(
VMStateField
[])
{
VMSTATE_PCI_DEVICE
(
dev
,
AC97LinkState
),
VMSTATE_PCI_DEVICE
(
dev
,
AC97LinkState
),
VMSTATE_UINT32
(
glob_cnt
,
AC97LinkState
),
VMSTATE_UINT32
(
glob_cnt
,
AC97LinkState
),
VMSTATE_UINT32
(
glob_sta
,
AC97LinkState
),
VMSTATE_UINT32
(
glob_sta
,
AC97LinkState
),
VMSTATE_UINT32
(
cas
,
AC97LinkState
),
VMSTATE_UINT32
(
cas
,
AC97LinkState
),
VMSTATE_STRUCT_ARRAY
(
bm_regs
,
AC97LinkState
,
3
,
1
,
VMSTATE_STRUCT_ARRAY
(
bm_regs
,
AC97LinkState
,
3
,
1
,
vmstate_ac97_bm_regs
,
AC97BusMasterRegs
),
vmstate_ac97_bm_regs
,
AC97BusMasterRegs
),
VMSTATE_BUFFER
(
mixer_data
,
AC97LinkState
),
VMSTATE_BUFFER
(
mixer_data
,
AC97LinkState
),
VMSTATE_UNUSED_TEST
(
is_version_2
,
3
),
VMSTATE_UNUSED_TEST
(
is_version_2
,
3
),
VMSTATE_END_OF_LIST
()
VMSTATE_END_OF_LIST
()
}
}
};
};
...
@@ -1243,7 +1243,7 @@ static const MemoryRegionPortio nam_portio[] = {
...
@@ -1243,7 +1243,7 @@ static const MemoryRegionPortio nam_portio[] = {
{
0
,
256
*
1
,
1
,
.
write
=
nam_writeb
,
},
{
0
,
256
*
1
,
1
,
.
write
=
nam_writeb
,
},
{
0
,
256
*
2
,
2
,
.
write
=
nam_writew
,
},
{
0
,
256
*
2
,
2
,
.
write
=
nam_writew
,
},
{
0
,
256
*
4
,
4
,
.
write
=
nam_writel
,
},
{
0
,
256
*
4
,
4
,
.
write
=
nam_writel
,
},
PORTIO_END_OF_LIST
(),
PORTIO_END_OF_LIST
(),
};
};
static
const
MemoryRegionOps
ac97_io_nam_ops
=
{
static
const
MemoryRegionOps
ac97_io_nam_ops
=
{
...
@@ -1257,7 +1257,7 @@ static const MemoryRegionPortio nabm_portio[] = {
...
@@ -1257,7 +1257,7 @@ static const MemoryRegionPortio nabm_portio[] = {
{
0
,
64
*
1
,
1
,
.
write
=
nabm_writeb
,
},
{
0
,
64
*
1
,
1
,
.
write
=
nabm_writeb
,
},
{
0
,
64
*
2
,
2
,
.
write
=
nabm_writew
,
},
{
0
,
64
*
2
,
2
,
.
write
=
nabm_writew
,
},
{
0
,
64
*
4
,
4
,
.
write
=
nabm_writel
,
},
{
0
,
64
*
4
,
4
,
.
write
=
nabm_writel
,
},
PORTIO_END_OF_LIST
()
PORTIO_END_OF_LIST
()
};
};
static
const
MemoryRegionOps
ac97_io_nabm_ops
=
{
static
const
MemoryRegionOps
ac97_io_nabm_ops
=
{
...
@@ -1345,14 +1345,14 @@ int ac97_init (PCIBus *bus)
...
@@ -1345,14 +1345,14 @@ int ac97_init (PCIBus *bus)
}
}
static
Property
ac97_properties
[]
=
{
static
Property
ac97_properties
[]
=
{
DEFINE_PROP_UINT32
(
"use_broken_id"
,
AC97LinkState
,
use_broken_id
,
0
),
DEFINE_PROP_UINT32
(
"use_broken_id"
,
AC97LinkState
,
use_broken_id
,
0
),
DEFINE_PROP_END_OF_LIST
(),
DEFINE_PROP_END_OF_LIST
(),
};
};
static
void
ac97_class_init
(
ObjectClass
*
klass
,
void
*
data
)
static
void
ac97_class_init
(
ObjectClass
*
klass
,
void
*
data
)
{
{
DeviceClass
*
dc
=
DEVICE_CLASS
(
klass
);
DeviceClass
*
dc
=
DEVICE_CLASS
(
klass
);
PCIDeviceClass
*
k
=
PCI_DEVICE_CLASS
(
klass
);
PCIDeviceClass
*
k
=
PCI_DEVICE_CLASS
(
klass
);
k
->
init
=
ac97_initfn
;
k
->
init
=
ac97_initfn
;
k
->
exit
=
ac97_exitfn
;
k
->
exit
=
ac97_exitfn
;
...
@@ -1374,7 +1374,7 @@ static TypeInfo ac97_info = {
...
@@ -1374,7 +1374,7 @@ static TypeInfo ac97_info = {
static
void
ac97_register
(
void
)
static
void
ac97_register
(
void
)
{
{
type_register_static
(
&
ac97_info
);
type_register_static
(
&
ac97_info
);
}
}
device_init
(
ac97_register
);
device_init
(
ac97_register
);
hw/adlib.c
浏览文件 @
cf4dc461
...
@@ -164,7 +164,7 @@ static void timer_handler (int c, double interval_Sec)
...
@@ -164,7 +164,7 @@ static void timer_handler (int c, double interval_Sec)
s
->
ticking
[
n
]
=
1
;
s
->
ticking
[
n
]
=
1
;
#ifdef DEBUG
#ifdef DEBUG
interval
=
get_ticks_per_sec
()
*
interval_Sec
;
interval
=
get_ticks_per_sec
()
*
interval_Sec
;
exp
=
qemu_get_clock_ns
(
vm_clock
)
+
interval
;
exp
=
qemu_get_clock_ns
(
vm_clock
)
+
interval
;
s
->
exp
[
n
]
=
exp
;
s
->
exp
[
n
]
=
exp
;
#endif
#endif
...
...
hw/cs4231a.c
浏览文件 @
cf4dc461
...
@@ -622,13 +622,13 @@ static const VMStateDescription vmstate_cs4231a = {
...
@@ -622,13 +622,13 @@ static const VMStateDescription vmstate_cs4231a = {
.
pre_load
=
cs4231a_pre_load
,
.
pre_load
=
cs4231a_pre_load
,
.
post_load
=
cs4231a_post_load
,
.
post_load
=
cs4231a_post_load
,
.
fields
=
(
VMStateField
[])
{
.
fields
=
(
VMStateField
[])
{
VMSTATE_UINT32_ARRAY
(
regs
,
CSState
,
CS_REGS
),
VMSTATE_UINT32_ARRAY
(
regs
,
CSState
,
CS_REGS
),
VMSTATE_BUFFER
(
dregs
,
CSState
),
VMSTATE_BUFFER
(
dregs
,
CSState
),
VMSTATE_INT32
(
dma_running
,
CSState
),
VMSTATE_INT32
(
dma_running
,
CSState
),
VMSTATE_INT32
(
audio_free
,
CSState
),
VMSTATE_INT32
(
audio_free
,
CSState
),
VMSTATE_INT32
(
transferred
,
CSState
),
VMSTATE_INT32
(
transferred
,
CSState
),
VMSTATE_INT32
(
aci_counter
,
CSState
),
VMSTATE_INT32
(
aci_counter
,
CSState
),
VMSTATE_END_OF_LIST
()
VMSTATE_END_OF_LIST
()
}
}
};
};
...
@@ -672,10 +672,10 @@ static Property cs4231a_properties[] = {
...
@@ -672,10 +672,10 @@ static Property cs4231a_properties[] = {
DEFINE_PROP_END_OF_LIST
(),
DEFINE_PROP_END_OF_LIST
(),
};
};
static
void
cs4231a_class_initfn
(
ObjectClass
*
klass
,
void
*
data
)
static
void
cs4231a_class_initfn
(
ObjectClass
*
klass
,
void
*
data
)
{
{
DeviceClass
*
dc
=
DEVICE_CLASS
(
klass
);
DeviceClass
*
dc
=
DEVICE_CLASS
(
klass
);
ISADeviceClass
*
ic
=
ISA_DEVICE_CLASS
(
klass
);
ISADeviceClass
*
ic
=
ISA_DEVICE_CLASS
(
klass
);
ic
->
init
=
cs4231a_initfn
;
ic
->
init
=
cs4231a_initfn
;
dc
->
desc
=
"Crystal Semiconductor CS4231A"
;
dc
->
desc
=
"Crystal Semiconductor CS4231A"
;
dc
->
vmsd
=
&
vmstate_cs4231a
;
dc
->
vmsd
=
&
vmstate_cs4231a
;
...
@@ -691,6 +691,6 @@ static TypeInfo cs4231a_info = {
...
@@ -691,6 +691,6 @@ static TypeInfo cs4231a_info = {
static
void
cs4231a_register
(
void
)
static
void
cs4231a_register
(
void
)
{
{
type_register_static
(
&
cs4231a_info
);
type_register_static
(
&
cs4231a_info
);
}
}
device_init
(
cs4231a_register
)
device_init
(
cs4231a_register
)
hw/es1370.c
浏览文件 @
cf4dc461
...
@@ -914,7 +914,7 @@ static const MemoryRegionPortio es1370_portio[] = {
...
@@ -914,7 +914,7 @@ static const MemoryRegionPortio es1370_portio[] = {
{
0
,
0x40
*
4
,
1
,
.
read
=
es1370_readb
,
},
{
0
,
0x40
*
4
,
1
,
.
read
=
es1370_readb
,
},
{
0
,
0x40
*
2
,
2
,
.
read
=
es1370_readw
,
},
{
0
,
0x40
*
2
,
2
,
.
read
=
es1370_readw
,
},
{
0
,
0x40
,
4
,
.
read
=
es1370_readl
,
},
{
0
,
0x40
,
4
,
.
read
=
es1370_readl
,
},
PORTIO_END_OF_LIST
()
PORTIO_END_OF_LIST
()
};
};
static
const
MemoryRegionOps
es1370_io_ops
=
{
static
const
MemoryRegionOps
es1370_io_ops
=
{
...
@@ -928,12 +928,12 @@ static const VMStateDescription vmstate_es1370_channel = {
...
@@ -928,12 +928,12 @@ static const VMStateDescription vmstate_es1370_channel = {
.
minimum_version_id
=
2
,
.
minimum_version_id
=
2
,
.
minimum_version_id_old
=
2
,
.
minimum_version_id_old
=
2
,
.
fields
=
(
VMStateField
[])
{
.
fields
=
(
VMStateField
[])
{
VMSTATE_UINT32
(
shift
,
struct
chan
),
VMSTATE_UINT32
(
shift
,
struct
chan
),
VMSTATE_UINT32
(
leftover
,
struct
chan
),
VMSTATE_UINT32
(
leftover
,
struct
chan
),
VMSTATE_UINT32
(
scount
,
struct
chan
),
VMSTATE_UINT32
(
scount
,
struct
chan
),
VMSTATE_UINT32
(
frame_addr
,
struct
chan
),
VMSTATE_UINT32
(
frame_addr
,
struct
chan
),
VMSTATE_UINT32
(
frame_cnt
,
struct
chan
),
VMSTATE_UINT32
(
frame_cnt
,
struct
chan
),
VMSTATE_END_OF_LIST
()
VMSTATE_END_OF_LIST
()
}
}
};
};
...
@@ -973,15 +973,15 @@ static const VMStateDescription vmstate_es1370 = {
...
@@ -973,15 +973,15 @@ static const VMStateDescription vmstate_es1370 = {
.
minimum_version_id_old
=
2
,
.
minimum_version_id_old
=
2
,
.
post_load
=
es1370_post_load
,
.
post_load
=
es1370_post_load
,
.
fields
=
(
VMStateField
[])
{
.
fields
=
(
VMStateField
[])
{
VMSTATE_PCI_DEVICE
(
dev
,
ES1370State
),
VMSTATE_PCI_DEVICE
(
dev
,
ES1370State
),
VMSTATE_STRUCT_ARRAY
(
chan
,
ES1370State
,
NB_CHANNELS
,
2
,
VMSTATE_STRUCT_ARRAY
(
chan
,
ES1370State
,
NB_CHANNELS
,
2
,
vmstate_es1370_channel
,
struct
chan
),
vmstate_es1370_channel
,
struct
chan
),
VMSTATE_UINT32
(
ctl
,
ES1370State
),
VMSTATE_UINT32
(
ctl
,
ES1370State
),
VMSTATE_UINT32
(
status
,
ES1370State
),
VMSTATE_UINT32
(
status
,
ES1370State
),
VMSTATE_UINT32
(
mempage
,
ES1370State
),
VMSTATE_UINT32
(
mempage
,
ES1370State
),
VMSTATE_UINT32
(
codec
,
ES1370State
),
VMSTATE_UINT32
(
codec
,
ES1370State
),
VMSTATE_UINT32
(
sctl
,
ES1370State
),
VMSTATE_UINT32
(
sctl
,
ES1370State
),
VMSTATE_END_OF_LIST
()
VMSTATE_END_OF_LIST
()
}
}
};
};
...
@@ -1017,7 +1017,7 @@ static int es1370_initfn (PCIDevice *dev)
...
@@ -1017,7 +1017,7 @@ static int es1370_initfn (PCIDevice *dev)
return
0
;
return
0
;
}
}
static
int
es1370_exitfn
(
PCIDevice
*
dev
)
static
int
es1370_exitfn
(
PCIDevice
*
dev
)
{
{
ES1370State
*
s
=
DO_UPCAST
(
ES1370State
,
dev
,
dev
);
ES1370State
*
s
=
DO_UPCAST
(
ES1370State
,
dev
,
dev
);
...
@@ -1031,10 +1031,10 @@ int es1370_init (PCIBus *bus)
...
@@ -1031,10 +1031,10 @@ int es1370_init (PCIBus *bus)
return
0
;
return
0
;
}
}
static
void
es1370_class_init
(
ObjectClass
*
klass
,
void
*
data
)
static
void
es1370_class_init
(
ObjectClass
*
klass
,
void
*
data
)
{
{
DeviceClass
*
dc
=
DEVICE_CLASS
(
klass
);
DeviceClass
*
dc
=
DEVICE_CLASS
(
klass
);
PCIDeviceClass
*
k
=
PCI_DEVICE_CLASS
(
klass
);
PCIDeviceClass
*
k
=
PCI_DEVICE_CLASS
(
klass
);
k
->
init
=
es1370_initfn
;
k
->
init
=
es1370_initfn
;
k
->
exit
=
es1370_exitfn
;
k
->
exit
=
es1370_exitfn
;
...
@@ -1056,7 +1056,7 @@ static TypeInfo es1370_info = {
...
@@ -1056,7 +1056,7 @@ static TypeInfo es1370_info = {
static
void
es1370_register
(
void
)
static
void
es1370_register
(
void
)
{
{
type_register_static
(
&
es1370_info
);
type_register_static
(
&
es1370_info
);
}
}
device_init
(
es1370_register
);
device_init
(
es1370_register
);
hw/gus.c
浏览文件 @
cf4dc461
...
@@ -221,14 +221,14 @@ static const VMStateDescription vmstate_gus = {
...
@@ -221,14 +221,14 @@ static const VMStateDescription vmstate_gus = {
.
minimum_version_id
=
2
,
.
minimum_version_id
=
2
,
.
minimum_version_id_old
=
2
,
.
minimum_version_id_old
=
2
,
.
fields
=
(
VMStateField
[])
{
.
fields
=
(
VMStateField
[])
{
VMSTATE_INT32
(
pos
,
GUSState
),
VMSTATE_INT32
(
pos
,
GUSState
),
VMSTATE_INT32
(
left
,
GUSState
),
VMSTATE_INT32
(
left
,
GUSState
),
VMSTATE_INT32
(
shift
,
GUSState
),
VMSTATE_INT32
(
shift
,
GUSState
),
VMSTATE_INT32
(
irqs
,
GUSState
),
VMSTATE_INT32
(
irqs
,
GUSState
),
VMSTATE_INT32
(
samples
,
GUSState
),
VMSTATE_INT32
(
samples
,
GUSState
),
VMSTATE_INT64
(
last_ticks
,
GUSState
),
VMSTATE_INT64
(
last_ticks
,
GUSState
),
VMSTATE_BUFFER
(
himem
,
GUSState
),
VMSTATE_BUFFER
(
himem
,
GUSState
),
VMSTATE_END_OF_LIST
()
VMSTATE_END_OF_LIST
()
}
}
};
};
...
@@ -239,13 +239,13 @@ static const MemoryRegionPortio gus_portio_list1[] = {
...
@@ -239,13 +239,13 @@ static const MemoryRegionPortio gus_portio_list1[] = {
{
0x006
,
10
,
2
,
.
read
=
gus_readw
,
.
write
=
gus_writew
},
{
0x006
,
10
,
2
,
.
read
=
gus_readw
,
.
write
=
gus_writew
},
{
0x100
,
8
,
1
,
.
read
=
gus_readb
,
.
write
=
gus_writeb
},
{
0x100
,
8
,
1
,
.
read
=
gus_readb
,
.
write
=
gus_writeb
},
{
0x100
,
8
,
2
,
.
read
=
gus_readw
,
.
write
=
gus_writew
},
{
0x100
,
8
,
2
,
.
read
=
gus_readw
,
.
write
=
gus_writew
},
PORTIO_END_OF_LIST
(),
PORTIO_END_OF_LIST
(),
};
};
static
const
MemoryRegionPortio
gus_portio_list2
[]
=
{
static
const
MemoryRegionPortio
gus_portio_list2
[]
=
{
{
0
,
1
,
1
,
.
read
=
gus_readb
},
{
0
,
1
,
1
,
.
read
=
gus_readb
},
{
0
,
1
,
2
,
.
read
=
gus_readw
},
{
0
,
1
,
2
,
.
read
=
gus_readw
},
PORTIO_END_OF_LIST
(),
PORTIO_END_OF_LIST
(),
};
};
static
int
gus_initfn
(
ISADevice
*
dev
)
static
int
gus_initfn
(
ISADevice
*
dev
)
...
@@ -307,10 +307,10 @@ static Property gus_properties[] = {
...
@@ -307,10 +307,10 @@ static Property gus_properties[] = {
DEFINE_PROP_END_OF_LIST
(),
DEFINE_PROP_END_OF_LIST
(),
};
};
static
void
gus_class_initfn
(
ObjectClass
*
klass
,
void
*
data
)
static
void
gus_class_initfn
(
ObjectClass
*
klass
,
void
*
data
)
{
{
DeviceClass
*
dc
=
DEVICE_CLASS
(
klass
);
DeviceClass
*
dc
=
DEVICE_CLASS
(
klass
);
ISADeviceClass
*
ic
=
ISA_DEVICE_CLASS
(
klass
);
ISADeviceClass
*
ic
=
ISA_DEVICE_CLASS
(
klass
);
ic
->
init
=
gus_initfn
;
ic
->
init
=
gus_initfn
;
dc
->
desc
=
"Gravis Ultrasound GF1"
;
dc
->
desc
=
"Gravis Ultrasound GF1"
;
dc
->
vmsd
=
&
vmstate_gus
;
dc
->
vmsd
=
&
vmstate_gus
;
...
@@ -326,6 +326,6 @@ static TypeInfo gus_info = {
...
@@ -326,6 +326,6 @@ static TypeInfo gus_info = {
static
void
gus_register
(
void
)
static
void
gus_register
(
void
)
{
{
type_register_static
(
&
gus_info
);
type_register_static
(
&
gus_info
);
}
}
device_init
(
gus_register
)
device_init
(
gus_register
)
hw/sb16.c
浏览文件 @
cf4dc461
...
@@ -1289,55 +1289,55 @@ static const VMStateDescription vmstate_sb16 = {
...
@@ -1289,55 +1289,55 @@ static const VMStateDescription vmstate_sb16 = {
.
minimum_version_id_old
=
1
,
.
minimum_version_id_old
=
1
,
.
post_load
=
sb16_post_load
,
.
post_load
=
sb16_post_load
,
.
fields
=
(
VMStateField
[])
{
.
fields
=
(
VMStateField
[])
{
VMSTATE_UINT32
(
irq
,
SB16State
),
VMSTATE_UINT32
(
irq
,
SB16State
),
VMSTATE_UINT32
(
dma
,
SB16State
),
VMSTATE_UINT32
(
dma
,
SB16State
),
VMSTATE_UINT32
(
hdma
,
SB16State
),
VMSTATE_UINT32
(
hdma
,
SB16State
),
VMSTATE_UINT32
(
port
,
SB16State
),
VMSTATE_UINT32
(
port
,
SB16State
),
VMSTATE_UINT32
(
ver
,
SB16State
),
VMSTATE_UINT32
(
ver
,
SB16State
),
VMSTATE_INT32
(
in_index
,
SB16State
),
VMSTATE_INT32
(
in_index
,
SB16State
),
VMSTATE_INT32
(
out_data_len
,
SB16State
),
VMSTATE_INT32
(
out_data_len
,
SB16State
),
VMSTATE_INT32
(
fmt_stereo
,
SB16State
),
VMSTATE_INT32
(
fmt_stereo
,
SB16State
),
VMSTATE_INT32
(
fmt_signed
,
SB16State
),
VMSTATE_INT32
(
fmt_signed
,
SB16State
),
VMSTATE_INT32
(
fmt_bits
,
SB16State
),
VMSTATE_INT32
(
fmt_bits
,
SB16State
),
VMSTATE_UINT32
(
fmt
,
SB16State
),
VMSTATE_UINT32
(
fmt
,
SB16State
),
VMSTATE_INT32
(
dma_auto
,
SB16State
),
VMSTATE_INT32
(
dma_auto
,
SB16State
),
VMSTATE_INT32
(
block_size
,
SB16State
),
VMSTATE_INT32
(
block_size
,
SB16State
),
VMSTATE_INT32
(
fifo
,
SB16State
),
VMSTATE_INT32
(
fifo
,
SB16State
),
VMSTATE_INT32
(
freq
,
SB16State
),
VMSTATE_INT32
(
freq
,
SB16State
),
VMSTATE_INT32
(
time_const
,
SB16State
),
VMSTATE_INT32
(
time_const
,
SB16State
),
VMSTATE_INT32
(
speaker
,
SB16State
),
VMSTATE_INT32
(
speaker
,
SB16State
),
VMSTATE_INT32
(
needed_bytes
,
SB16State
),
VMSTATE_INT32
(
needed_bytes
,
SB16State
),
VMSTATE_INT32
(
cmd
,
SB16State
),
VMSTATE_INT32
(
cmd
,
SB16State
),
VMSTATE_INT32
(
use_hdma
,
SB16State
),
VMSTATE_INT32
(
use_hdma
,
SB16State
),
VMSTATE_INT32
(
highspeed
,
SB16State
),
VMSTATE_INT32
(
highspeed
,
SB16State
),
VMSTATE_INT32
(
can_write
,
SB16State
),
VMSTATE_INT32
(
can_write
,
SB16State
),
VMSTATE_INT32
(
v2x6
,
SB16State
),
VMSTATE_INT32
(
v2x6
,
SB16State
),
VMSTATE_UINT8
(
csp_param
,
SB16State
),
VMSTATE_UINT8
(
csp_param
,
SB16State
),
VMSTATE_UINT8
(
csp_value
,
SB16State
),
VMSTATE_UINT8
(
csp_value
,
SB16State
),
VMSTATE_UINT8
(
csp_mode
,
SB16State
),
VMSTATE_UINT8
(
csp_mode
,
SB16State
),
VMSTATE_UINT8
(
csp_param
,
SB16State
),
VMSTATE_UINT8
(
csp_param
,
SB16State
),
VMSTATE_BUFFER
(
csp_regs
,
SB16State
),
VMSTATE_BUFFER
(
csp_regs
,
SB16State
),
VMSTATE_UINT8
(
csp_index
,
SB16State
),
VMSTATE_UINT8
(
csp_index
,
SB16State
),
VMSTATE_BUFFER
(
csp_reg83
,
SB16State
),
VMSTATE_BUFFER
(
csp_reg83
,
SB16State
),
VMSTATE_INT32
(
csp_reg83r
,
SB16State
),
VMSTATE_INT32
(
csp_reg83r
,
SB16State
),
VMSTATE_INT32
(
csp_reg83w
,
SB16State
),
VMSTATE_INT32
(
csp_reg83w
,
SB16State
),
VMSTATE_BUFFER
(
in2_data
,
SB16State
),
VMSTATE_BUFFER
(
in2_data
,
SB16State
),
VMSTATE_BUFFER
(
out_data
,
SB16State
),
VMSTATE_BUFFER
(
out_data
,
SB16State
),
VMSTATE_UINT8
(
test_reg
,
SB16State
),
VMSTATE_UINT8
(
test_reg
,
SB16State
),
VMSTATE_UINT8
(
last_read_byte
,
SB16State
),
VMSTATE_UINT8
(
last_read_byte
,
SB16State
),
VMSTATE_INT32
(
nzero
,
SB16State
),
VMSTATE_INT32
(
nzero
,
SB16State
),
VMSTATE_INT32
(
left_till_irq
,
SB16State
),
VMSTATE_INT32
(
left_till_irq
,
SB16State
),
VMSTATE_INT32
(
dma_running
,
SB16State
),
VMSTATE_INT32
(
dma_running
,
SB16State
),
VMSTATE_INT32
(
bytes_per_second
,
SB16State
),
VMSTATE_INT32
(
bytes_per_second
,
SB16State
),
VMSTATE_INT32
(
align
,
SB16State
),
VMSTATE_INT32
(
align
,
SB16State
),
VMSTATE_INT32
(
mixer_nreg
,
SB16State
),
VMSTATE_INT32
(
mixer_nreg
,
SB16State
),
VMSTATE_BUFFER
(
mixer_regs
,
SB16State
),
VMSTATE_BUFFER
(
mixer_regs
,
SB16State
),
VMSTATE_END_OF_LIST
()
VMSTATE_END_OF_LIST
()
}
}
};
};
...
@@ -1349,7 +1349,7 @@ static const MemoryRegionPortio sb16_ioport_list[] = {
...
@@ -1349,7 +1349,7 @@ static const MemoryRegionPortio sb16_ioport_list[] = {
{
10
,
1
,
1
,
.
read
=
dsp_read
},
{
10
,
1
,
1
,
.
read
=
dsp_read
},
{
12
,
1
,
1
,
.
write
=
dsp_write
},
{
12
,
1
,
1
,
.
write
=
dsp_write
},
{
12
,
4
,
1
,
.
read
=
dsp_read
},
{
12
,
4
,
1
,
.
read
=
dsp_read
},
PORTIO_END_OF_LIST
(),
PORTIO_END_OF_LIST
(),
};
};
...
@@ -1400,10 +1400,10 @@ static Property sb16_properties[] = {
...
@@ -1400,10 +1400,10 @@ static Property sb16_properties[] = {
DEFINE_PROP_END_OF_LIST
(),
DEFINE_PROP_END_OF_LIST
(),
};
};
static
void
sb16_class_initfn
(
ObjectClass
*
klass
,
void
*
data
)
static
void
sb16_class_initfn
(
ObjectClass
*
klass
,
void
*
data
)
{
{
DeviceClass
*
dc
=
DEVICE_CLASS
(
klass
);
DeviceClass
*
dc
=
DEVICE_CLASS
(
klass
);
ISADeviceClass
*
ic
=
ISA_DEVICE_CLASS
(
klass
);
ISADeviceClass
*
ic
=
ISA_DEVICE_CLASS
(
klass
);
ic
->
init
=
sb16_initfn
;
ic
->
init
=
sb16_initfn
;
dc
->
desc
=
"Creative Sound Blaster 16"
;
dc
->
desc
=
"Creative Sound Blaster 16"
;
dc
->
vmsd
=
&
vmstate_sb16
;
dc
->
vmsd
=
&
vmstate_sb16
;
...
@@ -1419,6 +1419,6 @@ static TypeInfo sb16_info = {
...
@@ -1419,6 +1419,6 @@ static TypeInfo sb16_info = {
static
void
sb16_register
(
void
)
static
void
sb16_register
(
void
)
{
{
type_register_static
(
&
sb16_info
);
type_register_static
(
&
sb16_info
);
}
}
device_init
(
sb16_register
)
device_init
(
sb16_register
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录