summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@web.de>2009-09-18 20:51:23 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-05 09:32:43 -0500
commit267c48404faab5a53334a884f4bb8627ffbdd031 (patch)
tree3047143092b0e6d12c7e05576f4375b56b87e111
parent30624c926ce2b0e78db25538bd58a6edf0a3d358 (diff)
downloadqemu-267c48404faab5a53334a884f4bb8627ffbdd031.tar.gz
qemu-267c48404faab5a53334a884f4bb8627ffbdd031.tar.bz2
qemu-267c48404faab5a53334a884f4bb8627ffbdd031.zip
musicpal: True reset support for audio device
Signed-off-by: Jan Kiszka <jan.kiszka@web.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/marvell_88w8618_audio.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/marvell_88w8618_audio.c b/hw/marvell_88w8618_audio.c
index d6c14c62cd..7f17a9f1fc 100644
--- a/hw/marvell_88w8618_audio.c
+++ b/hw/marvell_88w8618_audio.c
@@ -222,6 +222,9 @@ static void mv88w8618_audio_reset(void *opaque)
s->playback_mode = 0;
s->status = 0;
s->irq_enable = 0;
+ s->clock_div = 0;
+ s->threshold = 0;
+ s->phys_buf = 0;
}
static CPUReadMemoryFunc * const mv88w8618_audio_readfn[] = {
@@ -249,8 +252,6 @@ static int mv88w8618_audio_init(SysBusDevice *dev)
mv88w8618_audio_writefn, s);
sysbus_init_mmio(dev, MP_AUDIO_SIZE, iomemtype);
- qemu_register_reset(mv88w8618_audio_reset, s);
-
return 0;
}
@@ -258,6 +259,7 @@ static SysBusDeviceInfo mv88w8618_audio_info = {
.init = mv88w8618_audio_init,
.qdev.name = "mv88w8618_audio",
.qdev.size = sizeof(mv88w8618_audio_state),
+ .qdev.reset = mv88w8618_audio_reset,
.qdev.props = (Property[]) {
{
.name = "wm8750",