Commit b0c94ef6 authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼
Browse files

wip

parent bda5171c
Pipeline #583301 failed with stages
......@@ -141,6 +141,12 @@ public:
virtual std::string
getDescription() const
{ return "Xilinx PCIe FPGA cards"; }
virtual
std::string getType() const
{
return "card";
}
};
} /* namespace fpga */
......
......@@ -55,7 +55,6 @@ class Core;
class CoreFactory;
class InterruptController;
class IpIdentifier {
public:
......@@ -245,6 +244,12 @@ public:
static Core::List
make(PCIeCard* card, json_t *json_ips);
virtual
std::string getType() const
{
return "core";
}
protected:
Logger
getLogger() const
......
......@@ -23,7 +23,7 @@
#include <unistd.h>
#include <errno.h>
#include <villas/config.h>
#include <villas/config.hpp>
#include <villas/plugin.hpp>
#include <villas/kernel/kernel.hpp>
......@@ -58,7 +58,7 @@ InterruptController::init()
for (int i = 0; i < num_irqs; i++) {
/* Try pinning to core */
int ret = kernel::irq_setaffinity(nos[i], card->affinity, nullptr);
int ret = kernel::setIRQAffinity(nos[i], card->affinity, nullptr);
switch(ret) {
case 0:
......
......@@ -48,9 +48,9 @@ void Gpu2Rtds::dump(spdlog::level::level_enum logLevel)
logger->log(logLevel, " Frame too short: {}", (status.frame_too_short ? "yes" : "no"));
logger->log(logLevel, " Frame too long: {}", (status.frame_too_long ? "yes" : "no"));
logger->log(logLevel, " Frame size invalid: {}", (status.invalid_frame_size ? "yes" : "no"));
logger->log(logLevel, " Last count: {}", status.last_count);
logger->log(logLevel, " Last seq. number: {}", status.last_seq_nr);
logger->log(logLevel, " Max. frame size: {}", status.max_frame_size);
logger->log(logLevel, " Last count: {}", (int) status.last_count);
logger->log(logLevel, " Last seq. number: {}", (int) status.last_seq_nr);
logger->log(logLevel, " Max. frame size: {}", (int) status.max_frame_size);
}
//bool Gpu2Rtds::startOnce(const MemoryBlock &mem, size_t frameSize, size_t dataOffset, size_t doorbellOffset)
......@@ -126,6 +126,6 @@ Gpu2Rtds::getMaxFrameSize()
// logger->info("Doorbell register: {:#08x}", doorbell.value);
// logger->info(" Valid: {}", (doorbell.is_valid ? "yes" : "no"));
// logger->info(" Count: {}", doorbell.count);
// logger->info(" Seq. number: {}", doorbell.seq_nr);
// logger->info(" Seq. number: {}", (int) doorbell.seq_nr);
//}
......@@ -42,9 +42,9 @@ void Rtds2Gpu::dump(spdlog::level::level_enum logLevel)
logger->log(logLevel, " Frame too short: {}", (status.frame_too_short ? "yes" : "no"));
logger->log(logLevel, " Frame too long: {}", (status.frame_too_long ? "yes" : "no"));
logger->log(logLevel, " Frame size invalid: {}", (status.invalid_frame_size ? "yes" : "no"));
logger->log(logLevel, " Last count: {}", status.last_count);
logger->log(logLevel, " Last seq. number: {}", status.last_seq_nr);
logger->log(logLevel, " Max. frame size: {}", status.max_frame_size);
logger->log(logLevel, " Last count: {}", (int) status.last_count);
logger->log(logLevel, " Last seq. number: {}", (int) status.last_seq_nr);
logger->log(logLevel, " Max. frame size: {}", (int) status.max_frame_size);
}
bool Rtds2Gpu::startOnce(const MemoryBlock &mem, size_t frameSize, size_t dataOffset, size_t doorbellOffset)
......@@ -106,8 +106,8 @@ Rtds2Gpu::dumpDoorbell(uint32_t doorbellRegister) const
auto &doorbell = reinterpret_cast<reg_doorbell_t&>(doorbellRegister);
logger->info("Doorbell register: {:#08x}", doorbell.value);
logger->info(" Valid: {}", (doorbell.is_valid ? "yes" : "no"));
logger->info(" Count: {}", doorbell.count);
logger->info(" Seq. number: {}", doorbell.seq_nr);
logger->info(" Valid: {}", doorbell.is_valid ? "yes" : "no");
logger->info(" Count: {}", (int) doorbell.count);
logger->info(" Seq. number: {}", (int) doorbell.seq_nr);
}
......@@ -73,14 +73,14 @@ int main(int argc, char **argv) {
PRINT_ERROR;
printf("%s opened.\n", filename);
printf("Target offset is %#lx, page size is %lu\n", target, sysconf(_SC_PAGE_SIZE));
printf("Target offset is %#jd, page size is %lu\n", (intmax_t) target, sysconf(_SC_PAGE_SIZE));
fflush(stdout);
/* Map one page */
printf("mmap(%d, %lu, %#x, %#x, %d, %#lx)\n", 0,
printf("mmap(%d, %lu, %#x, %#x, %d, %#jd)\n", 0,
MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED,
fd, target);
fd, (intmax_t) target);
map_base = mmap(0, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, target & ~MAP_MASK);
......
......@@ -26,7 +26,7 @@
#include <villas/fpga/card.hpp>
#include <villas/fpga/ips/timer.hpp>
#include <villas/config.h>
#include <villas/config.hpp>
#include "global.hpp"
// cppcheck-suppress unknownMacro
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment