From fc98aaecb424620234eea0be98322c68dc6ea1eb Mon Sep 17 00:00:00 2001 From: daniel-k Date: Tue, 16 Jan 2018 15:07:21 +0100 Subject: [PATCH] lib/ips/intc: C++-ify interface --- fpga/include/villas/fpga/ips/intc.hpp | 8 ++++---- fpga/lib/ips/intc.cpp | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/fpga/include/villas/fpga/ips/intc.hpp b/fpga/include/villas/fpga/ips/intc.hpp index 54e76a6e0..68819371d 100644 --- a/fpga/include/villas/fpga/ips/intc.hpp +++ b/fpga/include/villas/fpga/ips/intc.hpp @@ -48,12 +48,12 @@ public: bool init(); - int enableInterrupt(IrqMaskType mask, bool polling); - int enableInterrupt(IrqPort irq, bool polling) + bool enableInterrupt(IrqMaskType mask, bool polling); + bool enableInterrupt(IrqPort irq, bool polling) { return enableInterrupt(1 << irq.num, polling); } - int disableInterrupt(IrqMaskType mask); - int disableInterrupt(IrqPort irq) + bool disableInterrupt(IrqMaskType mask); + bool disableInterrupt(IrqPort irq) { return disableInterrupt(1 << irq.num); } int waitForInterrupt(int irq); diff --git a/fpga/lib/ips/intc.cpp b/fpga/lib/ips/intc.cpp index c2426cb1f..e7716c1ff 100644 --- a/fpga/lib/ips/intc.cpp +++ b/fpga/lib/ips/intc.cpp @@ -45,7 +45,8 @@ InterruptController::~InterruptController() vfio_pci_msi_deinit(&card->vfio_device , this->efds); } -bool InterruptController::init() +bool +InterruptController::init() { const uintptr_t base = getBaseaddr(); auto logger = getLogger(); @@ -80,7 +81,7 @@ bool InterruptController::init() return true; } -int +bool InterruptController::enableInterrupt(InterruptController::IrqMaskType mask, bool polling) { auto logger = getLogger(); @@ -115,7 +116,7 @@ InterruptController::enableInterrupt(InterruptController::IrqMaskType mask, bool return true; } -int +bool InterruptController::disableInterrupt(InterruptController::IrqMaskType mask) { const uintptr_t base = getBaseaddr(); @@ -126,7 +127,8 @@ InterruptController::disableInterrupt(InterruptController::IrqMaskType mask) return true; } -int InterruptController::waitForInterrupt(int irq) +int +InterruptController::waitForInterrupt(int irq) { assert(irq < maxIrqs);