diff --git a/fpga/include/villas/directed_graph.hpp b/fpga/include/villas/directed_graph.hpp index c2b92674a..5f8488b13 100644 --- a/fpga/include/villas/directed_graph.hpp +++ b/fpga/include/villas/directed_graph.hpp @@ -9,7 +9,7 @@ #include #include -#include "log.hpp" +#include namespace villas { diff --git a/fpga/include/villas/fpga/card.hpp b/fpga/include/villas/fpga/card.hpp index d4b4b5cc2..1abd659e6 100644 --- a/fpga/include/villas/fpga/card.hpp +++ b/fpga/include/villas/fpga/card.hpp @@ -30,24 +30,19 @@ #pragma once - -#include - -#include "common.h" -#include "kernel/pci.h" -#include "kernel/vfio.hpp" - #include #include #include +#include -#include "plugin.hpp" -#include "fpga/ip.hpp" +#include +#include +#include -#include "config.h" +#include +#include -#include "memory_manager.hpp" -#include "memory.hpp" +#include #define PCI_FILTER_DEFAULT_FPGA { \ .id = { \ diff --git a/fpga/include/villas/fpga/ip.hpp b/fpga/include/villas/fpga/ip.hpp index 1950a8ed2..0e60a8dea 100644 --- a/fpga/include/villas/fpga/ip.hpp +++ b/fpga/include/villas/fpga/ip.hpp @@ -31,17 +31,16 @@ #ifndef VILLAS_IP_HPP #define VILLAS_IP_HPP -#include "fpga/vlnv.hpp" -#include "plugin.hpp" -#include "log.hpp" - #include #include #include - #include -#include "memory_manager.hpp" +#include +#include +#include + +#include namespace villas { namespace fpga { diff --git a/fpga/include/villas/fpga/ip_node.hpp b/fpga/include/villas/fpga/ip_node.hpp index 37371b7ce..890156d1d 100644 --- a/fpga/include/villas/fpga/ip_node.hpp +++ b/fpga/include/villas/fpga/ip_node.hpp @@ -35,8 +35,9 @@ #include #include -#include "ip.hpp" -#include "log.hpp" +#include + +#include namespace villas { namespace fpga { diff --git a/fpga/include/villas/fpga/ips/dma.hpp b/fpga/include/villas/fpga/ips/dma.hpp index 88530dbe3..2a3af757b 100644 --- a/fpga/include/villas/fpga/ips/dma.hpp +++ b/fpga/include/villas/fpga/ips/dma.hpp @@ -26,13 +26,10 @@ #pragma once -#include -#include - #include -#include "fpga/ip_node.hpp" -#include "memory.hpp" +#include +#include namespace villas { namespace fpga { diff --git a/fpga/include/villas/fpga/ips/fifo.hpp b/fpga/include/villas/fpga/ips/fifo.hpp index 82fc3156a..0cfb15f67 100644 --- a/fpga/include/villas/fpga/ips/fifo.hpp +++ b/fpga/include/villas/fpga/ips/fifo.hpp @@ -29,9 +29,10 @@ #pragma once -#include "fpga/ip_node.hpp" #include +#include + namespace villas { namespace fpga { diff --git a/fpga/include/villas/fpga/ips/intc.hpp b/fpga/include/villas/fpga/ips/intc.hpp index d8d3e5f86..41b007953 100644 --- a/fpga/include/villas/fpga/ips/intc.hpp +++ b/fpga/include/villas/fpga/ips/intc.hpp @@ -28,10 +28,9 @@ #pragma once -#include "fpga/ip.hpp" #include -#include "fpga/ip_node.hpp" +#include namespace villas { namespace fpga { diff --git a/fpga/include/villas/fpga/ips/pcie.hpp b/fpga/include/villas/fpga/ips/pcie.hpp index ebce36178..1f69a673a 100644 --- a/fpga/include/villas/fpga/ips/pcie.hpp +++ b/fpga/include/villas/fpga/ips/pcie.hpp @@ -30,14 +30,9 @@ #pragma once -#include -#include - -#include #include -#include "fpga/ip_node.hpp" -#include "fpga/vlnv.hpp" +#include namespace villas { namespace fpga { diff --git a/fpga/include/villas/fpga/ips/switch.hpp b/fpga/include/villas/fpga/ips/switch.hpp index 587ae4b70..280b73785 100644 --- a/fpga/include/villas/fpga/ips/switch.hpp +++ b/fpga/include/villas/fpga/ips/switch.hpp @@ -30,14 +30,11 @@ #pragma once -#include #include -#include #include -#include "fpga/ip_node.hpp" -#include "fpga/vlnv.hpp" +#include namespace villas { namespace fpga { diff --git a/fpga/include/villas/fpga/ips/timer.hpp b/fpga/include/villas/fpga/ips/timer.hpp index fcf4d75ea..be3d5d26c 100644 --- a/fpga/include/villas/fpga/ips/timer.hpp +++ b/fpga/include/villas/fpga/ips/timer.hpp @@ -29,12 +29,12 @@ #pragma once -#include +#include #include -#include "config.h" -#include "fpga/ip.hpp" -#include "fpga/ips/intc.hpp" +#include + +#include namespace villas { namespace fpga { diff --git a/fpga/include/villas/kernel/pci.h b/fpga/include/villas/kernel/pci.h index 3cd9565ed..f0fae8de8 100644 --- a/fpga/include/villas/kernel/pci.h +++ b/fpga/include/villas/kernel/pci.h @@ -9,8 +9,9 @@ #pragma once +#include #include -#include "list.h" +#include #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) #define PCI_FUNC(devfn) ((devfn) & 0x07) diff --git a/fpga/include/villas/memory.hpp b/fpga/include/villas/memory.hpp index a3d5d5dd1..ce7a9190c 100644 --- a/fpga/include/villas/memory.hpp +++ b/fpga/include/villas/memory.hpp @@ -3,8 +3,8 @@ #include #include -#include "log.hpp" -#include "memory_manager.hpp" +#include +#include namespace villas { diff --git a/fpga/include/villas/memory_manager.hpp b/fpga/include/villas/memory_manager.hpp index 555baa694..bbc0cdffd 100644 --- a/fpga/include/villas/memory_manager.hpp +++ b/fpga/include/villas/memory_manager.hpp @@ -6,8 +6,8 @@ #include #include -#include "log.hpp" -#include "directed_graph.hpp" +#include +#include namespace villas { diff --git a/fpga/include/villas/plugin.hpp b/fpga/include/villas/plugin.hpp index fd3fd3fc8..e1ff6d644 100644 --- a/fpga/include/villas/plugin.hpp +++ b/fpga/include/villas/plugin.hpp @@ -28,8 +28,8 @@ #include #include -#include "log.hpp" -#include "utils.h" +#include +#include namespace villas { diff --git a/fpga/include/villas/utils.hpp b/fpga/include/villas/utils.hpp index d368de915..e07db49aa 100644 --- a/fpga/include/villas/utils.hpp +++ b/fpga/include/villas/utils.hpp @@ -2,7 +2,6 @@ #include #include -#include namespace villas { namespace utils { diff --git a/fpga/lib/card.cpp b/fpga/lib/card.cpp index 9df391438..9effeb26a 100644 --- a/fpga/lib/card.cpp +++ b/fpga/lib/card.cpp @@ -24,13 +24,13 @@ #include #include -#include "log.hpp" +#include -#include "kernel/pci.h" -#include "kernel/vfio.hpp" +#include +#include -#include "fpga/ip.hpp" -#include "fpga/card.hpp" +#include +#include namespace villas { namespace fpga { diff --git a/fpga/lib/common/memory_manager.cpp b/fpga/lib/common/memory_manager.cpp index 0754e0c13..ad234a1d5 100644 --- a/fpga/lib/common/memory_manager.cpp +++ b/fpga/lib/common/memory_manager.cpp @@ -3,7 +3,7 @@ #include #include -#include "memory_manager.hpp" +#include using namespace villas::utils; diff --git a/fpga/lib/common/plugin.cpp b/fpga/lib/common/plugin.cpp index 1b987c254..bfe959c27 100644 --- a/fpga/lib/common/plugin.cpp +++ b/fpga/lib/common/plugin.cpp @@ -20,17 +20,13 @@ * along with this program. If not, see . *********************************************************************************/ -#include -#include - -#include #include - +#include #include #include +#include -#include "plugin.hpp" -#include "log.hpp" +#include namespace villas { diff --git a/fpga/lib/common/utils.cpp b/fpga/lib/common/utils.cpp index f0cd982f1..e32b2a516 100644 --- a/fpga/lib/common/utils.cpp +++ b/fpga/lib/common/utils.cpp @@ -1,7 +1,7 @@ #include #include -#include "utils.hpp" +#include namespace villas { namespace utils { diff --git a/fpga/lib/ip.cpp b/fpga/lib/ip.cpp index 0a21d16e3..905aef99c 100644 --- a/fpga/lib/ip.cpp +++ b/fpga/lib/ip.cpp @@ -24,18 +24,17 @@ #include #include -#include "log.hpp" -#include "utils.hpp" -#include "memory_manager.hpp" +#include +#include +#include -#include "fpga/ip.hpp" -#include "fpga/vlnv.hpp" -#include "fpga/card.hpp" +#include +#include -// needed to get VLNVs for initialization order list -#include "fpga/ips/pcie.hpp" -#include "fpga/ips/intc.hpp" -#include "fpga/ips/switch.hpp" +#include +#include +#include +#include namespace villas { diff --git a/fpga/lib/ip_node.cpp b/fpga/lib/ip_node.cpp index 2ecb3f168..d202dae14 100644 --- a/fpga/lib/ip_node.cpp +++ b/fpga/lib/ip_node.cpp @@ -2,10 +2,11 @@ #include #include -#include "utils.hpp" -#include "fpga/ip_node.hpp" -#include "fpga/ips/switch.hpp" -#include "fpga/card.hpp" +#include + +#include +#include +#include namespace villas { namespace fpga { diff --git a/fpga/lib/ips/dma.cpp b/fpga/lib/ips/dma.cpp index 3d3bf0e70..94e284d22 100644 --- a/fpga/lib/ips/dma.cpp +++ b/fpga/lib/ips/dma.cpp @@ -25,12 +25,11 @@ #include -#include "fpga/card.hpp" -#include "fpga/ips/dma.hpp" -#include "fpga/ips/intc.hpp" +#include -#include "log.hpp" -#include "memory_manager.hpp" +#include +#include +#include // max. size of a DMA transfer in simple mode #define FPGA_DMA_BOUNDARY 0x1000 diff --git a/fpga/lib/ips/fifo.cpp b/fpga/lib/ips/fifo.cpp index 2993d5fad..f0d86f59d 100644 --- a/fpga/lib/ips/fifo.cpp +++ b/fpga/lib/ips/fifo.cpp @@ -28,9 +28,8 @@ #include #include -#include "log.hpp" -#include "fpga/ips/fifo.hpp" -#include "fpga/ips/intc.hpp" +#include +#include namespace villas { diff --git a/fpga/lib/ips/intc.cpp b/fpga/lib/ips/intc.cpp index 3fbad436d..711f129f5 100644 --- a/fpga/lib/ips/intc.cpp +++ b/fpga/lib/ips/intc.cpp @@ -23,15 +23,13 @@ #include #include -#include "config.h" -#include "log.h" -#include "plugin.hpp" +#include +#include -#include "kernel/vfio.hpp" -#include "kernel/kernel.h" +#include -#include "fpga/card.hpp" -#include "fpga/ips/intc.hpp" +#include +#include namespace villas { namespace fpga { diff --git a/fpga/lib/ips/pcie.cpp b/fpga/lib/ips/pcie.cpp index c058056ff..d8294469e 100644 --- a/fpga/lib/ips/pcie.cpp +++ b/fpga/lib/ips/pcie.cpp @@ -23,11 +23,11 @@ #include #include -#include "fpga/ips/pcie.hpp" -#include "fpga/card.hpp" +#include + +#include +#include -#include "log.hpp" -#include "memory_manager.hpp" namespace villas { namespace fpga { diff --git a/fpga/lib/ips/switch.cpp b/fpga/lib/ips/switch.cpp index 3439f9fbe..4ac1be06f 100644 --- a/fpga/lib/ips/switch.cpp +++ b/fpga/lib/ips/switch.cpp @@ -26,8 +26,7 @@ #include #include -#include "log.hpp" -#include "fpga/ips/switch.hpp" +#include namespace villas { namespace fpga { diff --git a/fpga/lib/ips/timer.cpp b/fpga/lib/ips/timer.cpp index 91e36ade3..c7644f541 100644 --- a/fpga/lib/ips/timer.cpp +++ b/fpga/lib/ips/timer.cpp @@ -23,11 +23,12 @@ * along with this program. If not, see . *********************************************************************************/ +#include + #include -#include "log.hpp" -#include "fpga/ips/timer.hpp" -#include "fpga/ips/intc.hpp" +#include +#include namespace villas { namespace fpga { diff --git a/fpga/lib/kernel/kernel.c b/fpga/lib/kernel/kernel.c index a795c9f0f..8972912bf 100644 --- a/fpga/lib/kernel/kernel.c +++ b/fpga/lib/kernel/kernel.c @@ -32,9 +32,9 @@ #include #include -#include "utils.h" -#include "config.h" -#include "kernel/kernel.h" +#include +#include +#include int kernel_get_cacheline_size() { diff --git a/fpga/lib/kernel/pci.c b/fpga/lib/kernel/pci.c index 0dbdf08a4..2c897b679 100644 --- a/fpga/lib/kernel/pci.c +++ b/fpga/lib/kernel/pci.c @@ -26,11 +26,11 @@ #include #include -#include "log.h" -#include "utils.h" +#include +#include -#include "kernel/pci.h" -#include "config.h" +#include +#include int pci_init(struct pci *p) { diff --git a/fpga/lib/kernel/vfio.cpp b/fpga/lib/kernel/vfio.cpp index 4451536ba..b9639c1de 100644 --- a/fpga/lib/kernel/vfio.cpp +++ b/fpga/lib/kernel/vfio.cpp @@ -39,11 +39,10 @@ #include #include -#include "kernel/pci.h" -#include "kernel/kernel.h" - -#include "kernel/vfio.hpp" -#include "log.hpp" +#include +#include +#include +#include static auto logger = loggerGetOrCreate("Vfio"); diff --git a/fpga/lib/list.c b/fpga/lib/list.c index 1550ee327..f990e5cbd 100644 --- a/fpga/lib/list.c +++ b/fpga/lib/list.c @@ -25,8 +25,8 @@ #include #include -#include "list.h" -#include "utils.h" +#include +#include /* Compare functions */ static int cmp_lookup(const void *a, const void *b) { diff --git a/fpga/lib/log.c b/fpga/lib/log.c index 0fe097288..9a1bff017 100644 --- a/fpga/lib/log.c +++ b/fpga/lib/log.c @@ -27,9 +27,9 @@ #include #include -#include "config.h" -#include "log.h" -#include "utils.h" +#include +#include +#include #ifdef ENABLE_OPAL_ASYNC /* Define RTLAB before including OpalPrint.h for messages to be sent diff --git a/fpga/lib/log_config.c b/fpga/lib/log_config.c index 3b6cf7cc4..5573323f6 100644 --- a/fpga/lib/log_config.c +++ b/fpga/lib/log_config.c @@ -24,12 +24,12 @@ #include #include #include +#include -#include "config.h" -#include "log.h" -#include "log_config.h" -#include "utils.h" -#include "string.h" +#include +#include +#include +#include int log_parse(struct log *l, json_t *cfg) { diff --git a/fpga/lib/log_helper.c b/fpga/lib/log_helper.c index 6f99e3696..2be0fbf67 100644 --- a/fpga/lib/log_helper.c +++ b/fpga/lib/log_helper.c @@ -24,8 +24,8 @@ #include #include -#include "utils.h" -#include "log.h" +#include +#include void debug(long class, const char *fmt, ...) { diff --git a/fpga/lib/memory.cpp b/fpga/lib/memory.cpp new file mode 100644 index 000000000..ed0656ec2 --- /dev/null +++ b/fpga/lib/memory.cpp @@ -0,0 +1,24 @@ +#include +#include + +#include + +namespace villas { + +bool +HostRam::free(void* addr, size_t length) +{ + return munmap(addr, length) == 0; +} + + +void* +HostRam::allocate(size_t length, int flags) +{ + const int mmap_flags = flags | MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT; + const int mmap_protection = PROT_READ | PROT_WRITE; + + return mmap(nullptr, length, mmap_protection, mmap_flags, 0, 0); +} + +} // namespace villas diff --git a/fpga/lib/utils.c b/fpga/lib/utils.c index 10fc8348f..c604c891c 100644 --- a/fpga/lib/utils.c +++ b/fpga/lib/utils.c @@ -31,8 +31,8 @@ #include #include -#include "config.h" -#include "utils.h" +#include +#include pthread_t main_thread; diff --git a/fpga/lib/vlnv.cpp b/fpga/lib/vlnv.cpp index 5d65d1329..1aa80d4cd 100644 --- a/fpga/lib/vlnv.cpp +++ b/fpga/lib/vlnv.cpp @@ -23,11 +23,7 @@ #include #include -#include -#include - -#include "fpga/vlnv.hpp" -#include "fpga/ip.hpp" +#include namespace villas { namespace fpga { diff --git a/fpga/src/streamer.cpp b/fpga/src/streamer.cpp new file mode 100644 index 000000000..b261b79a5 --- /dev/null +++ b/fpga/src/streamer.cpp @@ -0,0 +1,25 @@ +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + + +#include +#include + +int main(int argc, const char* argv[]) +{ + (void) argc; + cxxopts::Options options(argv[0], " - example command line options"); + + return 0; +} diff --git a/fpga/tests/fifo.cpp b/fpga/tests/fifo.cpp index e3f7a250b..17cfd3dde 100644 --- a/fpga/tests/fifo.cpp +++ b/fpga/tests/fifo.cpp @@ -24,6 +24,8 @@ #include #include +#include + #include #include diff --git a/fpga/tests/timer.cpp b/fpga/tests/timer.cpp index 4317e51b6..66cc71d41 100644 --- a/fpga/tests/timer.cpp +++ b/fpga/tests/timer.cpp @@ -27,7 +27,7 @@ #include #include -#include "config.h" +#include #include "global.hpp" Test(fpga, timer, .description = "Timer Counter")