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

fix compiler errors

parent bda5171c
Pipeline #547668 failed with stages
......@@ -140,7 +140,12 @@ public:
virtual std::string
getDescription() const
{ return "Xilinx PCIe FPGA cards"; }
{ return "Xilinx PCIe FPGA cards"; }
/// Get plugin type
virtual std::string
getType() const
{ return "card"; }
};
} /* namespace fpga */
......
......@@ -245,6 +245,11 @@ public:
static Core::List
make(PCIeCard* card, json_t *json_ips);
/// Get plugin type
virtual std::string
getType() const
{ return "core"; }
protected:
Logger
getLogger() const
......
......@@ -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)
......
......@@ -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);
}
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