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

sparc32: convert DMA controller to reset + vmsd, fix reset on init 

Add a missing call to reset on device init.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-10-24 19:35:32 +00:00
parent 285e468d64
commit 49ef6c9055
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/sparc32_dma.c
View File

@ -214,9 +214,9 @@ static CPUWriteMemoryFunc * const dma_mem_write[3] = {
dma_mem_writel, dma_mem_writel,
}; };
static void dma_reset(void *opaque) static void dma_reset(DeviceState *d)
{ {
DMAState *s = opaque; DMAState *s = container_of(d, DMAState, busdev.qdev);
memset(s->dmaregs, 0, DMA_SIZE); memset(s->dmaregs, 0, DMA_SIZE);
s->dmaregs[0] = DMA_VER; s->dmaregs[0] = DMA_VER;
@ -243,11 +243,10 @@ static int sparc32_dma_init1(SysBusDevice *dev)
dma_io_memory = cpu_register_io_memory(dma_mem_read, dma_mem_write, s); dma_io_memory = cpu_register_io_memory(dma_mem_read, dma_mem_write, s);
sysbus_init_mmio(dev, DMA_SIZE, dma_io_memory); sysbus_init_mmio(dev, DMA_SIZE, dma_io_memory);
vmstate_register(-1, &vmstate_dma, s);
qemu_register_reset(dma_reset, s);
qdev_init_gpio_in(&dev->qdev, dma_set_irq, 1); qdev_init_gpio_in(&dev->qdev, dma_set_irq, 1);
qdev_init_gpio_out(&dev->qdev, &s->dev_reset, 1); qdev_init_gpio_out(&dev->qdev, &s->dev_reset, 1);
dma_reset(&s->busdev.qdev);
return 0; return 0;
} }
@ -255,6 +254,8 @@ static SysBusDeviceInfo sparc32_dma_info = {
.init = sparc32_dma_init1, .init = sparc32_dma_init1,
.qdev.name = "sparc32_dma", .qdev.name = "sparc32_dma",
.qdev.size = sizeof(DMAState), .qdev.size = sizeof(DMAState),
.qdev.vmsd = &vmstate_dma,
.qdev.reset = dma_reset,
.qdev.props = (Property[]) { .qdev.props = (Property[]) {
DEFINE_PROP_PTR("iommu_opaque", DMAState, iommu), DEFINE_PROP_PTR("iommu_opaque", DMAState, iommu),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),