From b66733640a98399e82d434aa9af9fb8ec4aec331 Mon Sep 17 00:00:00 2001 From: Niklas Eiling Date: Thu, 5 Jan 2023 09:51:11 +0100 Subject: [PATCH] format and comment fixes Signed-off-by: Niklas Eiling --- fpga/lib/utils.cpp | 1 + fpga/src/villas-fpga-ctrl.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fpga/lib/utils.cpp b/fpga/lib/utils.cpp index 2a97be3a0..32107a40a 100644 --- a/fpga/lib/utils.cpp +++ b/fpga/lib/utils.cpp @@ -50,6 +50,7 @@ const std::shared_ptr portStringToStreamVertex(std::stri return aurora_channels[port]; } } + // parses a string lik "1->2" or "1<->stdout" and configures the crossbar void fpga::configCrossBarUsingConnectString(std::string connectString, std::shared_ptr dma, diff --git a/fpga/src/villas-fpga-ctrl.cpp b/fpga/src/villas-fpga-ctrl.cpp index 5cf1f9196..2ad64557e 100644 --- a/fpga/src/villas-fpga-ctrl.cpp +++ b/fpga/src/villas-fpga-ctrl.cpp @@ -33,7 +33,7 @@ using namespace villas; static std::shared_ptr pciDevices; -static auto logger = villas::logging.get("cat"); +static auto logger = villas::logging.get("ctrl"); @@ -66,9 +66,9 @@ int main(int argc, char* argv[]) return 1; } - //FIXME: This must be called before card is intialized, because the card descructor - // still accesses the allocated memory. This order ensures that the allocator - // is destroyed AFTER the card. + // This must be called before card is intialized, because the card descructor + // still accesses the allocated memory. This order ensures that the allocator + // is destroyed AFTER the card. auto &alloc = villas::HostRam::getAllocator(); villas::MemoryAccessor mem[] = {alloc.allocate(0x200), alloc.allocate(0x200)}; const villas::MemoryBlock block[] = {mem[0].getMemoryBlock(), mem[1].getMemoryBlock()};