[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 31/58] vmstate: port pxa2xx_i2s
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 31/58] vmstate: port pxa2xx_i2s |
Date: |
Thu, 24 Feb 2011 18:57:28 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/pxa2xx.c | 53 ++++++++++++++++++-----------------------------------
1 files changed, 18 insertions(+), 35 deletions(-)
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c
index dc595f3..8e8305d 100644
--- a/hw/pxa2xx.c
+++ b/hw/pxa2xx.c
@@ -1710,39 +1710,23 @@ static CPUWriteMemoryFunc * const pxa2xx_i2s_writefn[]
= {
pxa2xx_i2s_write,
};
-static void pxa2xx_i2s_save(QEMUFile *f, void *opaque)
-{
- PXA2xxI2SState *s = (PXA2xxI2SState *) opaque;
-
- qemu_put_be32s(f, &s->control[0]);
- qemu_put_be32s(f, &s->control[1]);
- qemu_put_be32s(f, &s->status);
- qemu_put_be32s(f, &s->mask);
- qemu_put_be32s(f, &s->clk);
-
- qemu_put_be32(f, s->enable);
- qemu_put_be32(f, s->rx_len);
- qemu_put_be32(f, s->tx_len);
- qemu_put_be32(f, s->fifo_len);
-}
-
-static int pxa2xx_i2s_load(QEMUFile *f, void *opaque, int version_id)
-{
- PXA2xxI2SState *s = (PXA2xxI2SState *) opaque;
-
- qemu_get_be32s(f, &s->control[0]);
- qemu_get_be32s(f, &s->control[1]);
- qemu_get_be32s(f, &s->status);
- qemu_get_be32s(f, &s->mask);
- qemu_get_be32s(f, &s->clk);
-
- s->enable = qemu_get_be32(f);
- s->rx_len = qemu_get_be32(f);
- s->tx_len = qemu_get_be32(f);
- s->fifo_len = qemu_get_be32(f);
-
- return 0;
-}
+static const VMStateDescription vmstate_pxa2xx_i2s = {
+ .name = "pxa2xx_i2s",
+ .version_id = 0,
+ .minimum_version_id = 0,
+ .minimum_version_id_old = 0,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32_ARRAY(control, PXA2xxI2SState, 2),
+ VMSTATE_UINT32(status, PXA2xxI2SState),
+ VMSTATE_UINT32(mask, PXA2xxI2SState),
+ VMSTATE_UINT32(clk, PXA2xxI2SState),
+ VMSTATE_INT32(enable, PXA2xxI2SState),
+ VMSTATE_INT32(rx_len, PXA2xxI2SState),
+ VMSTATE_INT32(tx_len, PXA2xxI2SState),
+ VMSTATE_INT32(fifo_len, PXA2xxI2SState),
+ VMSTATE_END_OF_LIST()
+ }
+};
static void pxa2xx_i2s_data_req(void *opaque, int tx, int rx)
{
@@ -1783,8 +1767,7 @@ static PXA2xxI2SState *pxa2xx_i2s_init(target_phys_addr_t
base,
pxa2xx_i2s_writefn, s, DEVICE_NATIVE_ENDIAN);
cpu_register_physical_memory(base, 0x100000, iomemtype);
- register_savevm(NULL, "pxa2xx_i2s", base, 0,
- pxa2xx_i2s_save, pxa2xx_i2s_load, s);
+ vmstate_register(NULL, base, &vmstate_pxa2xx_i2s, s);
return s;
}
--
1.7.4
- [Qemu-devel] [PATCH 45/58] vmstate: port pxa2xx_dma, (continued)
- [Qemu-devel] [PATCH 45/58] vmstate: port pxa2xx_dma, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 18/58] vmstate: port pmtimer, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 49/58] max111x: input field is only used as uint8_t, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 05/58] vmstate: add VMSTATE_INT64_ARRAY, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 43/58] vmstate: stellaris use unused for placeholder entries, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 08/58] vmstate: be able to store/save a pci device from a pointer, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 16/58] vmstate: port arm_timer, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 12/58] vmstate: port ads7846, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 14/58] vmstate: port mipsnet, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 31/58] vmstate: port pxa2xx_i2s,
Juan Quintela <=
- [Qemu-devel] [PATCH 28/58] vmstate: port heathrow_pic, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 48/58] vmstate: port pxa2xx_lcdc, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 53/58] mac_nvram: size is a size, no need to be a target dependent type, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 07/58] vmstate: Add a way to send a partial array, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 46/58] pxa2xx_lcd: name anonymous struct, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 15/58] vmstate: port arm sp804, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 51/58] nand: pin values are uint8_t, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 44/58] pxa2xx_dma: make req array static, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 54/58] vmstate: port mac_nvram, Juan Quintela, 2011/02/24