From patchwork Fri Sep 11 10:10:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 33432 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 5CC18B6F34 for ; Fri, 11 Sep 2009 20:36:58 +1000 (EST) Received: from localhost ([127.0.0.1]:47727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm3Up-0006s6-Vb for incoming@patchwork.ozlabs.org; Fri, 11 Sep 2009 06:36:52 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mm38O-0004SZ-Dd for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:40 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mm38I-0004PF-Ce for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:38 -0400 Received: from [199.232.76.173] (port=36111 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm38I-0004PA-1O for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60820) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mm38H-000111-1V for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:33 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8BADStG025262 for ; Fri, 11 Sep 2009 06:13:28 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8BADJVY025817; Fri, 11 Sep 2009 06:13:27 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 11 Sep 2009 12:10:27 +0200 Message-Id: <0d474c2c51880d1e7e69d62cc99526ad0cee2d30.1252662256.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 07/20] vmstate: port wm8750 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: Juan Quintela --- hw/wm8750.c | 120 ++++++++++++++++++++++------------------------------------- 1 files changed, 45 insertions(+), 75 deletions(-) diff --git a/hw/wm8750.c b/hw/wm8750.c index f55eae7..8159e1a 100644 --- a/hw/wm8750.c +++ b/hw/wm8750.c @@ -46,6 +46,7 @@ typedef struct { uint8_t diff[2], pol, ds, monomix[2], alc, mute; uint8_t path[4], mpath[2], power, format; const WMRate *rate; + uint8_t rate_vmstate; int adc_hz, dac_hz, ext_adc_hz, ext_dac_hz, master; } WM8750State; @@ -564,87 +565,56 @@ static int wm8750_rx(i2c_slave *i2c) return 0x00; } -static void wm8750_save(QEMUFile *f, void *opaque) +static void wm8750_pre_save(const void *opaque) { - WM8750State *s = (WM8750State *) opaque; - int i; - qemu_put_8s(f, &s->i2c_data[0]); - qemu_put_8s(f, &s->i2c_data[1]); - qemu_put_be32(f, s->i2c_len); - qemu_put_be32(f, s->enable); - qemu_put_be32(f, s->idx_in); - qemu_put_be32(f, s->req_in); - qemu_put_be32(f, s->idx_out); - qemu_put_be32(f, s->req_out); - - for (i = 0; i < 7; i ++) - qemu_put_8s(f, &s->outvol[i]); - for (i = 0; i < 2; i ++) - qemu_put_8s(f, &s->outmute[i]); - for (i = 0; i < 4; i ++) - qemu_put_8s(f, &s->invol[i]); - for (i = 0; i < 2; i ++) - qemu_put_8s(f, &s->inmute[i]); - - for (i = 0; i < 2; i ++) - qemu_put_8s(f, &s->diff[i]); - qemu_put_8s(f, &s->pol); - qemu_put_8s(f, &s->ds); - for (i = 0; i < 2; i ++) - qemu_put_8s(f, &s->monomix[i]); - qemu_put_8s(f, &s->alc); - qemu_put_8s(f, &s->mute); - for (i = 0; i < 4; i ++) - qemu_put_8s(f, &s->path[i]); - for (i = 0; i < 2; i ++) - qemu_put_8s(f, &s->mpath[i]); - qemu_put_8s(f, &s->format); - qemu_put_8s(f, &s->power); - qemu_put_byte(f, (s->rate - wm_rate_table) / sizeof(*s->rate)); - i2c_slave_save(f, &s->i2c); + WM8750State *s = (void *)opaque; + + s->rate_vmstate = (s->rate - wm_rate_table) / sizeof(*s->rate); } -static int wm8750_load(QEMUFile *f, void *opaque, int version_id) +static int wm8750_post_load(void *opaque) { - WM8750State *s = (WM8750State *) opaque; - int i; - qemu_get_8s(f, &s->i2c_data[0]); - qemu_get_8s(f, &s->i2c_data[1]); - s->i2c_len = qemu_get_be32(f); - s->enable = qemu_get_be32(f); - s->idx_in = qemu_get_be32(f); - s->req_in = qemu_get_be32(f); - s->idx_out = qemu_get_be32(f); - s->req_out = qemu_get_be32(f); - - for (i = 0; i < 7; i ++) - qemu_get_8s(f, &s->outvol[i]); - for (i = 0; i < 2; i ++) - qemu_get_8s(f, &s->outmute[i]); - for (i = 0; i < 4; i ++) - qemu_get_8s(f, &s->invol[i]); - for (i = 0; i < 2; i ++) - qemu_get_8s(f, &s->inmute[i]); - - for (i = 0; i < 2; i ++) - qemu_get_8s(f, &s->diff[i]); - qemu_get_8s(f, &s->pol); - qemu_get_8s(f, &s->ds); - for (i = 0; i < 2; i ++) - qemu_get_8s(f, &s->monomix[i]); - qemu_get_8s(f, &s->alc); - qemu_get_8s(f, &s->mute); - for (i = 0; i < 4; i ++) - qemu_get_8s(f, &s->path[i]); - for (i = 0; i < 2; i ++) - qemu_get_8s(f, &s->mpath[i]); - qemu_get_8s(f, &s->format); - qemu_get_8s(f, &s->power); - s->rate = &wm_rate_table[(uint8_t) qemu_get_byte(f) & 0x1f]; - i2c_slave_load(f, &s->i2c); + WM8750State *s = opaque; + + s->rate = &wm_rate_table[s->rate_vmstate & 0x1f]; return 0; } +static const VMStateDescription vmstate_wm8750 = { + .name = CODEC, + .version_id = 0, + .minimum_version_id = 0, + .minimum_version_id_old = 0, + .pre_save = wm8750_pre_save, + .post_load = wm8750_post_load, + .fields = (VMStateField []) { + VMSTATE_UINT8_ARRAY(i2c_data, WM8750State, 2), + VMSTATE_INT32(i2c_len, WM8750State), + VMSTATE_INT32(enable, WM8750State), + VMSTATE_INT32(idx_in, WM8750State), + VMSTATE_INT32(req_in, WM8750State), + VMSTATE_INT32(idx_out, WM8750State), + VMSTATE_INT32(req_out, WM8750State), + VMSTATE_UINT8_ARRAY(outvol, WM8750State, 7), + VMSTATE_UINT8_ARRAY(outmute, WM8750State, 2), + VMSTATE_UINT8_ARRAY(invol, WM8750State, 4), + VMSTATE_UINT8_ARRAY(inmute, WM8750State, 2), + VMSTATE_UINT8_ARRAY(diff, WM8750State, 2), + VMSTATE_UINT8(pol, WM8750State), + VMSTATE_UINT8(ds, WM8750State), + VMSTATE_UINT8_ARRAY(monomix, WM8750State, 2), + VMSTATE_UINT8(alc, WM8750State), + VMSTATE_UINT8(mute, WM8750State), + VMSTATE_UINT8_ARRAY(path, WM8750State, 4), + VMSTATE_UINT8_ARRAY(mpath, WM8750State, 2), + VMSTATE_UINT8(format, WM8750State), + VMSTATE_UINT8(power, WM8750State), + VMSTATE_UINT8(rate_vmstate, WM8750State), + VMSTATE_I2C_SLAVE(i2c, WM8750State), + VMSTATE_END_OF_LIST() + } +}; + static int wm8750_init(i2c_slave *i2c) { WM8750State *s = FROM_I2C_SLAVE(WM8750State, i2c); @@ -652,7 +622,7 @@ static int wm8750_init(i2c_slave *i2c) AUD_register_card(CODEC, &s->card); wm8750_reset(&s->i2c); - register_savevm(CODEC, -1, 0, wm8750_save, wm8750_load, s); + vmstate_register(-1, &vmstate_wm8750, s); return 0; }