[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 07/16] xilinx_axidma: Register reset properly
From: |
peter . crosthwaite |
Subject: |
[Qemu-devel] [PATCH v6 07/16] xilinx_axidma: Register reset properly |
Date: |
Tue, 16 Apr 2013 10:22:41 +1000 |
From: Peter Crosthwaite <address@hidden>
Register the reset function as the Device::reset function rather than
explicitly call it from the sysbus::init.
Signed-off-by: Peter Crosthwaite <address@hidden>
Acked-by: Edgar E. Iglesias <address@hidden>
---
hw/dma/xilinx_axidma.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 0b5bb44..91b8f07 100644
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -357,6 +357,16 @@ static void stream_process_s2mem(struct Stream *s,
}
}
+static void xilinx_axidma_reset(DeviceState *dev)
+{
+ int i;
+ XilinxAXIDMA *s = XILINX_AXI_DMA(dev);
+
+ for (i = 0; i < 2; i++) {
+ stream_reset(&s->streams[i]);
+ }
+}
+
static void
axidma_push(StreamSlave *obj, unsigned char *buf, size_t len, uint32_t *app)
{
@@ -477,7 +487,6 @@ static int xilinx_axidma_init(SysBusDevice *dev)
sysbus_init_mmio(dev, &s->iomem);
for (i = 0; i < 2; i++) {
- stream_reset(&s->streams[i]);
s->streams[i].nr = i;
s->streams[i].bh = qemu_bh_new(timer_hit, &s->streams[i]);
s->streams[i].ptimer = ptimer_init(s->streams[i].bh);
@@ -506,6 +515,7 @@ static void axidma_class_init(ObjectClass *klass, void
*data)
StreamSlaveClass *ssc = STREAM_SLAVE_CLASS(klass);
k->init = xilinx_axidma_init;
+ dc->reset = xilinx_axidma_reset;
dc->props = axidma_properties;
ssc->push = axidma_push;
}
--
1.7.0.4
- [Qemu-devel] [PATCH v6 00/16] Stream Patches, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 01/16] xilinx_axienet: typedef XilinxAXIEnet struct, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 02/16] xilinx_axienet: Defined and use type cast macro, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 03/16] xilinx_axienet: Register reset properly, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 04/16] xilinx_axienet: converted init->realize, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 05/16] xilinx_axidma: typedef XilinxAXIDMA struct, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 06/16] xilinx_axidma: Defined and use type cast macro, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 07/16] xilinx_axidma: Register reset properly,
peter . crosthwaite <=
- [Qemu-devel] [PATCH v6 08/16] xilinx_axidma: converted init->realize, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 09/16] petalogix_ml605_mmu: Fix machine node attachment, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 10/16] petalogix_ml605_mmu: Attach ethernet to machine, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 11/16] xilinx_axienet: Create Proxy object for stream, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 12/16] xilinx_axidma: Create Proxy object for stream, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 13/16] xilinx_axidma: Fix rx/tx halted bit., peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 14/16] stream: Add flow control API, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 15/16] xilinx_axienet/dma: Implement rx path flow control, peter . crosthwaite, 2013/04/15
- [Qemu-devel] [PATCH v6 16/16] stream: Remove app argument hack, peter . crosthwaite, 2013/04/15
- Re: [Qemu-devel] [PATCH v6 00/16] Stream Patches, Edgar E. Iglesias, 2013/04/16