From patchwork Fri Sep 18 18:51:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 33869 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DAB43B7B79 for ; Sat, 19 Sep 2009 05:04:43 +1000 (EST) Received: from localhost ([127.0.0.1]:58789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Moil7-0001xo-9I for incoming@patchwork.ozlabs.org; Fri, 18 Sep 2009 15:04:41 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MoiZX-0006m8-Un for qemu-devel@nongnu.org; Fri, 18 Sep 2009 14:52:44 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MoiZT-0006fF-8e for qemu-devel@nongnu.org; Fri, 18 Sep 2009 14:52:43 -0400 Received: from [199.232.76.173] (port=45893 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MoiZT-0006eq-2Y for qemu-devel@nongnu.org; Fri, 18 Sep 2009 14:52:39 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:53537) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MoiZS-000105-Ei for qemu-devel@nongnu.org; Fri, 18 Sep 2009 14:52:38 -0400 Received: from smtp05.web.de (fmsmtp05.dlan.cinetic.de [172.20.4.166]) by fmmailgate01.web.de (Postfix) with ESMTP id CFB2011D76673 for ; Fri, 18 Sep 2009 20:52:37 +0200 (CEST) Received: from [92.74.58.109] (helo=[192.168.1.10]) by smtp05.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #314) id 1MoiZL-0007ed-00 for qemu-devel@nongnu.org; Fri, 18 Sep 2009 20:52:31 +0200 Resent-From: Jan Kiszka Resent-To: qemu-devel Resent-Date: Fri, 18 Sep 2009 20:52:25 +0200 Resent-Message-Id: <4AB3D6E9.7090207@web.de> Resent-User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 From: Jan Kiszka To: qemu-devel@nongnu.org Date: Fri, 18 Sep 2009 20:51:23 +0200 Message-ID: <20090918185123.2879.52402.stgit@mchn012c.ww002.siemens.net> In-Reply-To: <20090918185122.2879.74216.stgit@mchn012c.ww002.siemens.net> References: <20090918185122.2879.74216.stgit@mchn012c.ww002.siemens.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/RCKpAG2ScUfF5JoFZmwLASxMsYJRpc1HM/eOc +5FB+R/fMV7aBKJR6AQjWHymrSAwpseJLr4CgWFkBHM1EJdiIE LayDxEUio= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Resent-Date: Fri, 18 Sep 2009 14:52:43 -0400 Subject: [Qemu-devel] [PATCH 6/8] musicpal: True reset support for audio device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Jan Kiszka --- hw/marvell_88w8618_audio.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/marvell_88w8618_audio.c b/hw/marvell_88w8618_audio.c index d6c14c6..7f17a9f 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",