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

sparc32: convert cs4231 to VMState, vmsd and reset 

Also remove unused include directive.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-10-24 16:20:32 +00:00
parent 09330e90fe
commit 82d4c6e683
1 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
hw/cs4231.c
View File

@ -22,7 +22,6 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "sun4m.h"
#include "sysbus.h" #include "sysbus.h"
/* debug CS4231 */ /* debug CS4231 */
@ -54,9 +53,9 @@ typedef struct CSState {
#define DPRINTF(fmt, ...) #define DPRINTF(fmt, ...)
#endif #endif
static void cs_reset(void *opaque) static void cs_reset(DeviceState *d)
{ {
CSState *s = opaque; CSState *s = container_of(d, CSState, busdev.qdev);
memset(s->regs, 0, CS_REGS * 4); memset(s->regs, 0, CS_REGS * 4);
memset(s->dregs, 0, CS_DREGS); memset(s->dregs, 0, CS_DREGS);
@ -118,8 +117,9 @@ static void cs_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
case 2: // Read only case 2: // Read only
break; break;
case 4: case 4:
if (val & 1) if (val & 1) {
cs_reset(s); cs_reset(&s->busdev.qdev);
}
val &= 0x7f; val &= 0x7f;
s->regs[saddr] = val; s->regs[saddr] = val;
break; break;
@ -141,31 +141,17 @@ static CPUWriteMemoryFunc * const cs_mem_write[3] = {
cs_mem_writel, cs_mem_writel,
}; };
static void cs_save(QEMUFile *f, void *opaque) static const VMStateDescription vmstate_cs4231 = {
{ .name ="cs4231",
CSState *s = opaque; .version_id = 1,
unsigned int i; .minimum_version_id = 1,
.minimum_version_id_old = 1,
for (i = 0; i < CS_REGS; i++) .fields = (VMStateField []) {
qemu_put_be32s(f, &s->regs[i]); VMSTATE_UINT32_ARRAY(regs, CSState, CS_REGS),
VMSTATE_UINT8_ARRAY(dregs, CSState, CS_DREGS),
qemu_put_buffer(f, s->dregs, CS_DREGS); VMSTATE_END_OF_LIST()
} }
};
static int cs_load(QEMUFile *f, void *opaque, int version_id)
{
CSState *s = opaque;
unsigned int i;
if (version_id > 1)
return -EINVAL;
for (i = 0; i < CS_REGS; i++)
qemu_get_be32s(f, &s->regs[i]);
qemu_get_buffer(f, s->dregs, CS_DREGS);
return 0;
}
static int cs4231_init1(SysBusDevice *dev) static int cs4231_init1(SysBusDevice *dev)
{ {
@ -176,9 +162,7 @@ static int cs4231_init1(SysBusDevice *dev)
sysbus_init_mmio(dev, CS_SIZE, io); sysbus_init_mmio(dev, CS_SIZE, io);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
register_savevm("cs4231", -1, 1, cs_save, cs_load, s); cs_reset(&s->busdev.qdev);
qemu_register_reset(cs_reset, s);
cs_reset(s);
return 0; return 0;
} }
@ -186,6 +170,8 @@ static SysBusDeviceInfo cs4231_info = {
.init = cs4231_init1, .init = cs4231_init1,
.qdev.name = "SUNW,CS4231", .qdev.name = "SUNW,CS4231",
.qdev.size = sizeof(CSState), .qdev.size = sizeof(CSState),
.qdev.vmsd = &vmstate_cs4231,
.qdev.reset = cs_reset,
.qdev.props = (Property[]) { .qdev.props = (Property[]) {
{.name = NULL} {.name = NULL}
} }