diff --git a/fpga/include/villas/fpga/card.hpp b/fpga/include/villas/fpga/card.hpp index a65590432..2ac4ce514 100644 --- a/fpga/include/villas/fpga/card.hpp +++ b/fpga/include/villas/fpga/card.hpp @@ -106,8 +106,7 @@ class PCIeCardFactory : public Plugin { public: PCIeCardFactory() : - Plugin("FPGA Card plugin") - { pluginType = Plugin::Type::FpgaCard; } + Plugin(Plugin::Type::FpgaCard, "FPGA Card plugin") {} static CardList make(json_t *json, struct pci* pci, ::vfio_container* vc); diff --git a/fpga/include/villas/fpga/ip.hpp b/fpga/include/villas/fpga/ip.hpp index 2071a6bb4..bdcd78bcf 100644 --- a/fpga/include/villas/fpga/ip.hpp +++ b/fpga/include/villas/fpga/ip.hpp @@ -145,8 +145,8 @@ using IpCoreList = std::list>; class IpCoreFactory : public Plugin { public: IpCoreFactory(std::string concreteName) : - Plugin(std::string("IpCore - ") + concreteName) - { pluginType = Plugin::Type::FpgaIp; } + Plugin(Plugin::Type::FpgaIp, std::string("IpCore - ") + concreteName) + {} /// Returns a running and checked FPGA IP static IpCoreList diff --git a/fpga/include/villas/plugin.hpp b/fpga/include/villas/plugin.hpp index 97de10d4d..c07501e83 100644 --- a/fpga/include/villas/plugin.hpp +++ b/fpga/include/villas/plugin.hpp @@ -42,7 +42,7 @@ public: FpgaCard, }; - Plugin(std::string name); + Plugin(Type type, const std::string& name); virtual ~Plugin(); // copying a plugin doesn't make sense, so explicitly deny it diff --git a/fpga/lib/plugin.cpp b/fpga/lib/plugin.cpp index 82d358a24..1b987c254 100644 --- a/fpga/lib/plugin.cpp +++ b/fpga/lib/plugin.cpp @@ -45,8 +45,8 @@ Plugin::pluginListBuffer; int Plugin::pluginListNiftyCounter; -Plugin::Plugin(std::string name) : - pluginType(Plugin::Type::Unknown), +Plugin::Plugin(Type type, const std::string& name) : + pluginType(type), name(name), description(""), path(""),