From f8de9425fe210cd91bde35819221eb19aaf64744 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 21 Aug 2018 11:10:09 +0200 Subject: [PATCH] streamer: use new memory api --- fpga/src/streamer.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fpga/src/streamer.cpp b/fpga/src/streamer.cpp index ece8db5ba..ecb2b591c 100644 --- a/fpga/src/streamer.cpp +++ b/fpga/src/streamer.cpp @@ -34,7 +34,6 @@ #include #include - #include #include #include @@ -189,10 +188,12 @@ int main(int argc, char* argv[]) dma->connect(dma->getMasterPort(dma->mm2sPort), rtds->getSlavePort(rtds->slavePort)); - auto mem = villas::HostRam::allocate(0x100 / sizeof(int32_t)); + auto alloc = villas::HostRam::getAllocator(); + auto mem = alloc.allocate(0x100 / sizeof(int32_t)); + auto block = mem.getMemoryBlock(); while(true) { - dma->read(mem, mem.getSize()); + dma->read(block, block.getSize()); const size_t bytesRead = dma->readComplete(); const size_t valuesRead = bytesRead / sizeof(int32_t); @@ -214,7 +215,7 @@ int main(int argc, char* argv[]) mem[memIdx++] = number; } - dma->write(mem, memIdx * sizeof(int32_t)); + dma->write(block, memIdx * sizeof(int32_t)); } return 0;