diff options
Diffstat (limited to 'hw/ac97.c')
| -rw-r--r-- | hw/ac97.c | 113 |
1 files changed, 49 insertions, 64 deletions
@@ -323,7 +323,7 @@ static void reset_bm_regs (AC97LinkState *s, AC97BusMasterRegs *r) static void mixer_store (AC97LinkState *s, uint32_t i, uint16_t v) { if (i + 2 > sizeof (s->mixer_data)) { - dolog ("mixer_store: index %d out of bounds %d\n", + dolog ("mixer_store: index %d out of bounds %zd\n", i, sizeof (s->mixer_data)); return; } @@ -337,7 +337,7 @@ static uint16_t mixer_load (AC97LinkState *s, uint32_t i) uint16_t val = 0xffff; if (i + 2 > sizeof (s->mixer_data)) { - dolog ("mixer_store: index %d out of bounds %d\n", + dolog ("mixer_store: index %d out of bounds %zd\n", i, sizeof (s->mixer_data)); } else { @@ -1167,73 +1167,31 @@ static void po_callback (void *opaque, int free) transfer_audio (opaque, PO_INDEX, free); } -static void ac97_save (QEMUFile *f, void *opaque) -{ - size_t i; - uint8_t active[LAST_INDEX]; - AC97LinkState *s = opaque; - - pci_device_save (&s->dev, f); - - qemu_put_be32s (f, &s->glob_cnt); - qemu_put_be32s (f, &s->glob_sta); - qemu_put_be32s (f, &s->cas); - - for (i = 0; i < ARRAY_SIZE (s->bm_regs); ++i) { - AC97BusMasterRegs *r = &s->bm_regs[i]; - qemu_put_be32s (f, &r->bdbar); - qemu_put_8s (f, &r->civ); - qemu_put_8s (f, &r->lvi); - qemu_put_be16s (f, &r->sr); - qemu_put_be16s (f, &r->picb); - qemu_put_8s (f, &r->piv); - qemu_put_8s (f, &r->cr); - qemu_put_be32s (f, &r->bd_valid); - qemu_put_be32s (f, &r->bd.addr); - qemu_put_be32s (f, &r->bd.ctl_len); +static const VMStateDescription vmstate_ac97_bm_regs = { + .name = "ac97_bm_regs", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + VMSTATE_UINT32(bdbar, AC97BusMasterRegs), + VMSTATE_UINT8(civ, AC97BusMasterRegs), + VMSTATE_UINT8(lvi, AC97BusMasterRegs), + VMSTATE_UINT16(sr, AC97BusMasterRegs), + VMSTATE_UINT16(picb, AC97BusMasterRegs), + VMSTATE_UINT8(piv, AC97BusMasterRegs), + VMSTATE_UINT8(cr, AC97BusMasterRegs), + VMSTATE_UINT32(bd_valid, AC97BusMasterRegs), + VMSTATE_UINT32(bd.addr, AC97BusMasterRegs), + VMSTATE_UINT32(bd.ctl_len, AC97BusMasterRegs), + VMSTATE_END_OF_LIST() } - qemu_put_buffer (f, s->mixer_data, sizeof (s->mixer_data)); - - active[PI_INDEX] = AUD_is_active_in (s->voice_pi) ? 1 : 0; - active[PO_INDEX] = AUD_is_active_out (s->voice_po) ? 1 : 0; - active[MC_INDEX] = AUD_is_active_in (s->voice_mc) ? 1 : 0; - qemu_put_buffer (f, active, sizeof (active)); -} +}; -static int ac97_load (QEMUFile *f, void *opaque, int version_id) +static int ac97_post_load (void *opaque, int version_id) { - int ret; - size_t i; uint8_t active[LAST_INDEX]; AC97LinkState *s = opaque; - if (version_id != 2) - return -EINVAL; - - ret = pci_device_load (&s->dev, f); - if (ret) - return ret; - - qemu_get_be32s (f, &s->glob_cnt); - qemu_get_be32s (f, &s->glob_sta); - qemu_get_be32s (f, &s->cas); - - for (i = 0; i < ARRAY_SIZE (s->bm_regs); ++i) { - AC97BusMasterRegs *r = &s->bm_regs[i]; - qemu_get_be32s (f, &r->bdbar); - qemu_get_8s (f, &r->civ); - qemu_get_8s (f, &r->lvi); - qemu_get_be16s (f, &r->sr); - qemu_get_be16s (f, &r->picb); - qemu_get_8s (f, &r->piv); - qemu_get_8s (f, &r->cr); - qemu_get_be32s (f, &r->bd_valid); - qemu_get_be32s (f, &r->bd.addr); - qemu_get_be32s (f, &r->bd.ctl_len); - } - qemu_get_buffer (f, s->mixer_data, sizeof (s->mixer_data)); - qemu_get_buffer (f, active, sizeof (active)); - #ifdef USE_MIXER record_select (s, mixer_load (s, AC97_Record_Select)); #define V_(a, b) set_volume (s, a, b, mixer_load (s, a)) @@ -1242,6 +1200,9 @@ static int ac97_load (QEMUFile *f, void *opaque, int version_id) V_ (AC97_Line_In_Volume_Mute, AUD_MIXER_LINE_IN); #undef V_ #endif + active[PI_INDEX] = !!(s->bm_regs[PI_INDEX].cr & CR_RPBM); + active[PO_INDEX] = !!(s->bm_regs[PO_INDEX].cr & CR_RPBM); + active[MC_INDEX] = !!(s->bm_regs[MC_INDEX].cr & CR_RPBM); reset_voices (s, active); s->bup_flag = 0; @@ -1249,6 +1210,30 @@ static int ac97_load (QEMUFile *f, void *opaque, int version_id) return 0; } +static bool is_version_2 (void *opaque, int version_id) +{ + return version_id == 2; +} + +static const VMStateDescription vmstate_ac97 = { + .name = "ac97", + .version_id = 3, + .minimum_version_id = 2, + .minimum_version_id_old = 2, + .post_load = ac97_post_load, + .fields = (VMStateField []) { + VMSTATE_PCI_DEVICE(dev, AC97LinkState), + VMSTATE_UINT32(glob_cnt, AC97LinkState), + VMSTATE_UINT32(glob_sta, AC97LinkState), + VMSTATE_UINT32(cas, AC97LinkState), + VMSTATE_STRUCT_ARRAY(bm_regs, AC97LinkState, 3, 1, + vmstate_ac97_bm_regs, AC97BusMasterRegs), + VMSTATE_BUFFER(mixer_data, AC97LinkState), + VMSTATE_UNUSED_TEST(is_version_2, 3), + VMSTATE_END_OF_LIST() + } +}; + static void ac97_map (PCIDevice *pci_dev, int region_num, pcibus_t addr, pcibus_t size, int type) { @@ -1334,7 +1319,6 @@ static int ac97_initfn (PCIDevice *dev) pci_register_bar (&s->dev, 0, 256 * 4, PCI_BASE_ADDRESS_SPACE_IO, ac97_map); pci_register_bar (&s->dev, 1, 64 * 4, PCI_BASE_ADDRESS_SPACE_IO, ac97_map); - register_savevm ("ac97", 0, 2, ac97_save, ac97_load, s); qemu_register_reset (ac97_on_reset, s); AUD_register_card ("ac97", &s->card); ac97_on_reset (s); @@ -1351,6 +1335,7 @@ static PCIDeviceInfo ac97_info = { .qdev.name = "AC97", .qdev.desc = "Intel 82801AA AC97 Audio", .qdev.size = sizeof (AC97LinkState), + .qdev.vmsd = &vmstate_ac97, .init = ac97_initfn, }; |