From 2a56f5ff13ffedee465ca9b8188f60869b2575b0 Mon Sep 17 00:00:00 2001 From: Daniel Krebs Date: Tue, 5 Jun 2018 14:48:35 +0200 Subject: [PATCH] tests/rtds2gpu: fix doorbell offset --- fpga/tests/rtds2gpu.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fpga/tests/rtds2gpu.cpp b/fpga/tests/rtds2gpu.cpp index a4c839bfc..b6206da5b 100644 --- a/fpga/tests/rtds2gpu.cpp +++ b/fpga/tests/rtds2gpu.cpp @@ -40,7 +40,7 @@ static constexpr size_t SAMPLE_SIZE = 4; static constexpr size_t SAMPLE_COUNT = 1; static constexpr size_t FRAME_SIZE = SAMPLE_COUNT * SAMPLE_SIZE; -static constexpr size_t DOORBELL_OFFSET = FRAME_SIZE; +static constexpr size_t DOORBELL_OFFSET = SAMPLE_COUNT; static constexpr size_t DATA_OFFSET = 0; static void dumpMem(const uint32_t* addr, size_t len) @@ -124,7 +124,7 @@ Test(fpga, rtds2gpu, .description = "Rtds2Gpu") // connect AXI Stream from DMA to Rtds2Gpu IP cr_assert(dma->connect(rtds2gpu)); - cr_assert(rtds2gpu.startOnce(dmaMemDst.getMemoryBlock(), SAMPLE_COUNT, DATA_OFFSET*4, DOORBELL_OFFSET*4), + cr_assert(rtds2gpu.startOnce(dmaMemDst.getMemoryBlock(), SAMPLE_COUNT, DATA_OFFSET * 4, DOORBELL_OFFSET * 4), "Preparing Rtds2Gpu IP failed"); cr_assert(dma->write(dmaMemSrc.getMemoryBlock(), FRAME_SIZE), @@ -195,7 +195,7 @@ Test(fpga, rtds2gpu_rtt_cpu, .description = "Rtds2Gpu RTT via CPU") auto dmaRam = villas::HostDmaRam::getAllocator().allocate(SAMPLE_COUNT + 1); uint32_t* data = &dmaRam[DATA_OFFSET]; - uint32_t* doorbell = &dmaRam[DOORBELL_OFFSET / SAMPLE_SIZE]; + uint32_t* doorbell = &dmaRam[DOORBELL_OFFSET]; // TEST: rtds loopback via switch // cr_assert(rtds.connect(rtds)); @@ -209,7 +209,7 @@ Test(fpga, rtds2gpu_rtt_cpu, .description = "Rtds2Gpu RTT via CPU") size_t count = 0; while(true) { rtds2gpu->doorbellReset(*doorbell); - rtds2gpu->startOnce(dmaRam.getMemoryBlock(), SAMPLE_COUNT, DATA_OFFSET, DOORBELL_OFFSET); + rtds2gpu->startOnce(dmaRam.getMemoryBlock(), SAMPLE_COUNT, DATA_OFFSET * 4, DOORBELL_OFFSET * 4); // while(not rtds2gpu->isFinished()); while(not rtds2gpu->doorbellIsValid(*doorbell));