ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

escc: convert to VMState, vmsd and reset 

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-10-24 16:07:10 +00:00
parent 5ac574c4d3
commit bdb78cae61
1 changed files with 38 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
hw/escc.c
View File

@ -113,6 +113,7 @@ typedef struct ChannelState {
int e0_mode, led_mode, caps_lock_mode, num_lock_mode; int e0_mode, led_mode, caps_lock_mode, num_lock_mode;
int disabled; int disabled;
int clock; int clock;
uint32_t vmstate_dummy;
} ChannelState; } ChannelState;
struct SerialState { struct SerialState {
@ -326,9 +327,10 @@ static void escc_reset_chn(ChannelState *s)
clear_queue(s); clear_queue(s);
} }
static void escc_reset(void *opaque) static void escc_reset(DeviceState *d)
{ {
SerialState *s = opaque; SerialState *s = container_of(d, SerialState, busdev.qdev);
escc_reset_chn(&s->chn[0]); escc_reset_chn(&s->chn[0]);
escc_reset_chn(&s->chn[1]); escc_reset_chn(&s->chn[1]);
} }
@ -547,7 +549,7 @@ static void escc_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
escc_reset_chn(&serial->chn[1]); escc_reset_chn(&serial->chn[1]);
return; return;
case MINTR_RST_ALL: case MINTR_RST_ALL:
escc_reset(serial); escc_reset(&serial->busdev.qdev);
return; return;
} }
break; break;
@ -666,64 +668,37 @@ static CPUWriteMemoryFunc * const escc_mem_write[3] = {
NULL, NULL,
}; };
static void escc_save_chn(QEMUFile *f, ChannelState *s) static const VMStateDescription vmstate_escc_chn = {
{ .name ="escc_chn",
uint32_t tmp = 0; .version_id = 2,
.minimum_version_id = 1,
qemu_put_be32s(f, &tmp); /* unused, was IRQ. */ .minimum_version_id_old = 1,
qemu_put_be32s(f, &s->reg); .fields = (VMStateField []) {
qemu_put_be32s(f, &s->rxint); VMSTATE_UINT32(vmstate_dummy, ChannelState),
qemu_put_be32s(f, &s->txint); VMSTATE_UINT32(reg, ChannelState),
qemu_put_be32s(f, &s->rxint_under_svc); VMSTATE_UINT32(rxint, ChannelState),
qemu_put_be32s(f, &s->txint_under_svc); VMSTATE_UINT32(txint, ChannelState),
qemu_put_8s(f, &s->rx); VMSTATE_UINT32(rxint_under_svc, ChannelState),
qemu_put_8s(f, &s->tx); VMSTATE_UINT32(txint_under_svc, ChannelState),
qemu_put_buffer(f, s->wregs, SERIAL_REGS); VMSTATE_UINT8(rx, ChannelState),
qemu_put_buffer(f, s->rregs, SERIAL_REGS); VMSTATE_UINT8(tx, ChannelState),
} VMSTATE_BUFFER(wregs, ChannelState),
VMSTATE_BUFFER(rregs, ChannelState),
static void escc_save(QEMUFile *f, void *opaque) VMSTATE_END_OF_LIST()
{
SerialState *s = opaque;
escc_save_chn(f, &s->chn[0]);
escc_save_chn(f, &s->chn[1]);
}
static int escc_load_chn(QEMUFile *f, ChannelState *s, int version_id)
{
uint32_t tmp;
if (version_id > 2)
return -EINVAL;
qemu_get_be32s(f, &tmp); /* unused */
qemu_get_be32s(f, &s->reg);
qemu_get_be32s(f, &s->rxint);
qemu_get_be32s(f, &s->txint);
if (version_id >= 2) {
qemu_get_be32s(f, &s->rxint_under_svc);
qemu_get_be32s(f, &s->txint_under_svc);
} }
qemu_get_8s(f, &s->rx); };
qemu_get_8s(f, &s->tx);
qemu_get_buffer(f, s->wregs, SERIAL_REGS);
qemu_get_buffer(f, s->rregs, SERIAL_REGS);
return 0;
}
static int escc_load(QEMUFile *f, void *opaque, int version_id) static const VMStateDescription vmstate_escc = {
{ .name ="escc",
SerialState *s = opaque; .version_id = 2,
int ret; .minimum_version_id = 1,
.minimum_version_id_old = 1,
ret = escc_load_chn(f, &s->chn[0], version_id); .fields = (VMStateField []) {
if (ret != 0) VMSTATE_STRUCT_ARRAY(chn, SerialState, 2, 2, vmstate_escc_chn,
return ret; ChannelState),
ret = escc_load_chn(f, &s->chn[1], version_id); VMSTATE_END_OF_LIST()
return ret; }
};
}
int escc_init(target_phys_addr_t base, qemu_irq irqA, qemu_irq irqB, int escc_init(target_phys_addr_t base, qemu_irq irqA, qemu_irq irqB,
CharDriverState *chrA, CharDriverState *chrB, CharDriverState *chrA, CharDriverState *chrB,
@ -942,9 +917,8 @@ static int escc_init1(SysBusDevice *dev)
if (s->chn[1].type == kbd) { if (s->chn[1].type == kbd) {
qemu_add_kbd_event_handler(sunkbd_event, &s->chn[1]); qemu_add_kbd_event_handler(sunkbd_event, &s->chn[1]);
} }
register_savevm("escc", -1, 2, escc_save, escc_load, s); escc_reset(&s->busdev.qdev);
qemu_register_reset(escc_reset, s);
escc_reset(s);
return 0; return 0;
} }
@ -952,6 +926,8 @@ static SysBusDeviceInfo escc_info = {
.init = escc_init1, .init = escc_init1,
.qdev.name = "escc", .qdev.name = "escc",
.qdev.size = sizeof(SerialState), .qdev.size = sizeof(SerialState),
.qdev.vmsd = &vmstate_escc,
.qdev.reset = escc_reset,
.qdev.props = (Property[]) { .qdev.props = (Property[]) {
DEFINE_PROP_UINT32("frequency", SerialState, frequency, 0), DEFINE_PROP_UINT32("frequency", SerialState, frequency, 0),
DEFINE_PROP_UINT32("it_shift", SerialState, it_shift, 0), DEFINE_PROP_UINT32("it_shift", SerialState, it_shift, 0),