Commit d8e8b40e authored by Daniel Krebs's avatar Daniel Krebs
Browse files

fix include paths, use `<villas/...>` style

parent 69437338
......@@ -9,7 +9,7 @@
#include <stdexcept>
#include <algorithm>
#include "log.hpp"
#include <villas/log.hpp>
namespace villas {
......
......@@ -30,24 +30,19 @@
#pragma once
#include <jansson.h>
#include "common.h"
#include "kernel/pci.h"
#include "kernel/vfio.hpp"
#include <list>
#include <set>
#include <string>
#include <jansson.h>
#include "plugin.hpp"
#include "fpga/ip.hpp"
#include <villas/plugin.hpp>
#include <villas/config.h>
#include <villas/memory.hpp>
#include "config.h"
#include <villas/kernel/pci.h>
#include <villas/kernel/vfio.hpp>
#include "memory_manager.hpp"
#include "memory.hpp"
#include <villas/fpga/ip.hpp>
#define PCI_FILTER_DEFAULT_FPGA { \
.id = { \
......
......@@ -31,17 +31,16 @@
#ifndef VILLAS_IP_HPP
#define VILLAS_IP_HPP
#include "fpga/vlnv.hpp"
#include "plugin.hpp"
#include "log.hpp"
#include <map>
#include <list>
#include <memory>
#include <jansson.h>
#include "memory_manager.hpp"
#include <villas/log.hpp>
#include <villas/memory.hpp>
#include <villas/plugin.hpp>
#include <villas/fpga/vlnv.hpp>
namespace villas {
namespace fpga {
......
......@@ -35,8 +35,9 @@
#include <string>
#include <jansson.h>
#include "ip.hpp"
#include "log.hpp"
#include <villas/fpga/ip.hpp>
#include <villas/directed_graph.hpp>
namespace villas {
namespace fpga {
......
......@@ -26,13 +26,10 @@
#pragma once
#include <list>
#include <string>
#include <xilinx/xaxidma.h>
#include "fpga/ip_node.hpp"
#include "memory.hpp"
#include <villas/memory.hpp>
#include <villas/fpga/ip_node.hpp>
namespace villas {
namespace fpga {
......
......@@ -29,9 +29,10 @@
#pragma once
#include "fpga/ip_node.hpp"
#include <xilinx/xllfifo.h>
#include <villas/fpga/ip_node.hpp>
namespace villas {
namespace fpga {
......
......@@ -28,10 +28,9 @@
#pragma once
#include "fpga/ip.hpp"
#include <xilinx/xintc.h>
#include "fpga/ip_node.hpp"
#include <villas/fpga/ip.hpp>
namespace villas {
namespace fpga {
......
......@@ -30,14 +30,9 @@
#pragma once
#include <string>
#include <map>
#include <jansson.h>
#include <xilinx/xaxis_switch.h>
#include "fpga/ip_node.hpp"
#include "fpga/vlnv.hpp"
#include <villas/fpga/ip_node.hpp>
namespace villas {
namespace fpga {
......
......@@ -30,14 +30,11 @@
#pragma once
#include <string>
#include <map>
#include <jansson.h>
#include <xilinx/xaxis_switch.h>
#include "fpga/ip_node.hpp"
#include "fpga/vlnv.hpp"
#include <villas/fpga/ip_node.hpp>
namespace villas {
namespace fpga {
......
......@@ -29,12 +29,12 @@
#pragma once
#include <stdint.h>
#include <cstdint>
#include <xilinx/xtmrctr.h>
#include "config.h"
#include "fpga/ip.hpp"
#include "fpga/ips/intc.hpp"
#include <villas/config.h>
#include <villas/fpga/ip.hpp>
namespace villas {
namespace fpga {
......
......@@ -9,8 +9,9 @@
#pragma once
#include <stddef.h>
#include <stdint.h>
#include "list.h"
#include <villas/list.h>
#define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f)
#define PCI_FUNC(devfn) ((devfn) & 0x07)
......
......@@ -3,8 +3,8 @@
#include <string>
#include <unistd.h>
#include "log.hpp"
#include "memory_manager.hpp"
#include <villas/log.hpp>
#include <villas/memory_manager.hpp>
namespace villas {
......
......@@ -6,8 +6,8 @@
#include <stdexcept>
#include <unistd.h>
#include "log.hpp"
#include "directed_graph.hpp"
#include <villas/log.hpp>
#include <villas/directed_graph.hpp>
namespace villas {
......
......@@ -28,8 +28,8 @@
#include <string>
#include <jansson.h>
#include "log.hpp"
#include "utils.h"
#include <villas/log.hpp>
#include <villas/common.h>
namespace villas {
......
......@@ -2,7 +2,6 @@
#include <string>
#include <vector>
#include <list>
namespace villas {
namespace utils {
......
......@@ -24,13 +24,13 @@
#include <memory>
#include <utility>
#include "log.hpp"
#include <villas/memory.hpp>
#include "kernel/pci.h"
#include "kernel/vfio.hpp"
#include <villas/kernel/pci.h>
#include <villas/kernel/vfio.hpp>
#include "fpga/ip.hpp"
#include "fpga/card.hpp"
#include <villas/fpga/ip.hpp>
#include <villas/fpga/card.hpp>
namespace villas {
namespace fpga {
......
......@@ -3,7 +3,7 @@
#include <cstdint>
#include <villas/utils.hpp>
#include "memory_manager.hpp"
#include <villas/memory_manager.hpp>
using namespace villas::utils;
......
......@@ -20,17 +20,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************************/
#include <dlfcn.h>
#include <string.h>
#include <string>
#include <iostream>
#include <string>
#include <new>
#include <type_traits>
#include <dlfcn.h>
#include "plugin.hpp"
#include "log.hpp"
#include <villas/plugin.hpp>
namespace villas {
......
#include <vector>
#include <string>
#include "utils.hpp"
#include <villas/utils.hpp>
namespace villas {
namespace utils {
......
......@@ -24,18 +24,17 @@
#include <memory>
#include <utility>
#include "log.hpp"
#include "utils.hpp"
#include "memory_manager.hpp"
#include "fpga/ip.hpp"
#include "fpga/vlnv.hpp"
#include "fpga/card.hpp"
// needed to get VLNVs for initialization order list
#include "fpga/ips/pcie.hpp"
#include "fpga/ips/intc.hpp"
#include "fpga/ips/switch.hpp"
#include <villas/log.hpp>
#include <villas/memory.hpp>
#include <villas/utils.hpp>
#include <villas/fpga/card.hpp>
#include <villas/fpga/vlnv.hpp>
#include <villas/fpga/ip.hpp>
#include <villas/fpga/ips/pcie.hpp>
#include <villas/fpga/ips/intc.hpp>
#include <villas/fpga/ips/switch.hpp>
namespace villas {
......
Supports Markdown
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