Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

Merge branch 'fix-codestyle' into 'master'

Browse source 
fix code-style

See merge request acs/public/villas/fpga/fpga!12
This commit is contained in:
Steffen Vogel 2020-07-27 17:09:57 +02:00
commit f550ec5359
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fpga/gpu/src/gpu.cpp
View file

@ -121,8 +121,7 @@ bool Gpu::registerIoMemory(const MemoryBlock &mem)
return true;
else
logger->warn("There's already a mapping, but too small");
}
catch(const std::out_of_range&) {
} catch (const std::out_of_range&) {
// not yet reachable, that's okay, proceed
}
@ -154,7 +153,7 @@ bool Gpu::registerIoMemory(const MemoryBlock &mem)
mappedBaseAddrSpaceId);
baseAddrOnPci = translationPci.getLocalAddr(0);
sizeOnPci = translationPci.getSize();
} catch(const std::out_of_range&) {
} catch (const std::out_of_range&) {
logger->error("Memory is not reachable via PCIe bus");
return false;
}
@ -324,7 +323,7 @@ Gpu::makeAccessibleFromPCIeOrHostRam(const MemoryBlock &mem)
try {
auto path = mm.findPath(mm.getPciAddressSpace(), mem.getAddrSpaceId());
isIoMemory = true;
} catch(const std::out_of_range&) {
} catch (const std::out_of_range&) {
// not reachable via PCI -> not IO memory
}

4
fpga/lib/core.cpp
View file

@ -178,7 +178,7 @@ CoreFactory::make(PCIeCard* card, json_t *json_ips)
int num;
try {
num = std::stoi(tokens[1]);
} catch(const std::invalid_argument&) {
} catch (const std::invalid_argument&) {
logger->warn("IRQ number is not an integer: '{}'", irqEntry);
continue;
}
@ -357,7 +357,7 @@ Core::getInterruptController(const std::string &interruptName) const
try {
const IrqPort irq = irqs.at(interruptName);
return irq.irqController;
} catch(const std::out_of_range&) {
} catch (const std::out_of_range&) {
return nullptr;
}
}

2
fpga/lib/ips/dma.cpp
View file

@ -381,7 +381,7 @@ Dma::isMemoryBlockAccesible(const MemoryBlock &mem, const std::string &interface
try {
mm.findPath(getMasterAddrSpaceByInterface(interface), mem.getAddrSpaceId());
} catch(const std::out_of_range&) {
} catch (const std::out_of_range&) {
// not (yet) accessible
return false;
}

2
fpga/lib/ips/fifo.cpp
View file

@ -47,7 +47,7 @@ bool Fifo::init()
// if this throws an exception, then there's no AXI4 data interface
fifo_cfg.Axi4BaseAddress = getBaseAddr(axi4Memory);
fifo_cfg.Datainterface = 1;
} catch(const std::out_of_range&) {
} catch (const std::out_of_range&) {
fifo_cfg.Datainterface = 0;
}

4
fpga/lib/ips/switch.cpp
View file

@ -76,7 +76,7 @@ AxiStreamSwitch::connectInternal(const std::string &portSlave,
// check if slave port exists
try {
getSlavePort(portSlave);
} catch(const std::out_of_range&) {
} catch (const std::out_of_range&) {
logger->error("Switch doesn't have a slave port named '{}'", portSlave);
return false;
}
@ -84,7 +84,7 @@ AxiStreamSwitch::connectInternal(const std::string &portSlave,
// check if master port exists
try {
getMasterPort(portMaster);
} catch(const std::out_of_range&) {
} catch (const std::out_of_range&) {
logger->error("Switch doesn't have a master port named '{}'", portMaster);
return false;
}