diff --git a/fpga/include/villas/fpga/core.hpp b/fpga/include/villas/fpga/core.hpp index 3ebfb1194..bc39fd170 100644 --- a/fpga/include/villas/fpga/core.hpp +++ b/fpga/include/villas/fpga/core.hpp @@ -305,7 +305,7 @@ protected: // Configure IP instance from JSON config virtual - void configure(Core &, json_t *) + void parse(Core &, json_t *) { } private: diff --git a/fpga/include/villas/fpga/ips/bram.hpp b/fpga/include/villas/fpga/ips/bram.hpp index 2f1a688f6..d9e1d79d3 100644 --- a/fpga/include/villas/fpga/ips/bram.hpp +++ b/fpga/include/villas/fpga/ips/bram.hpp @@ -57,7 +57,7 @@ private: class BramFactory : public CoreFactory { public: - void configure(Core &ip, json_t *cfg); + void parse(Core &ip, json_t *cfg); Core* create() { diff --git a/fpga/include/villas/fpga/ips/dma.hpp b/fpga/include/villas/fpga/ips/dma.hpp index 26885a604..86ecdaaa1 100644 --- a/fpga/include/villas/fpga/ips/dma.hpp +++ b/fpga/include/villas/fpga/ips/dma.hpp @@ -175,7 +175,7 @@ public: } virtual - void configure(Core& ip, json_t* json) override; + void parse(Core& ip, json_t* json) override; virtual void configurePollingMode(Core& ip, PollingMode mode) override diff --git a/fpga/include/villas/fpga/ips/pcie.hpp b/fpga/include/villas/fpga/ips/pcie.hpp index 34e6e3cd3..b41455ab3 100644 --- a/fpga/include/villas/fpga/ips/pcie.hpp +++ b/fpga/include/villas/fpga/ips/pcie.hpp @@ -67,7 +67,7 @@ public: return "xilinx.com:ip:axi_pcie:"; } - void configure(Core &ip, json_t *cfg); + void parse(Core &ip, json_t *cfg); Core* create() { diff --git a/fpga/include/villas/fpga/ips/switch.hpp b/fpga/include/villas/fpga/ips/switch.hpp index 5f5ac4b87..031f81dc7 100644 --- a/fpga/include/villas/fpga/ips/switch.hpp +++ b/fpga/include/villas/fpga/ips/switch.hpp @@ -79,7 +79,7 @@ public: return "xilinx.com:ip:axis_switch:"; } - void configure(Core &ip, json_t *cfg); + void parse(Core &ip, json_t *cfg); Core* create() { diff --git a/fpga/include/villas/fpga/node.hpp b/fpga/include/villas/fpga/node.hpp index e63161672..0ae11a2d9 100644 --- a/fpga/include/villas/fpga/node.hpp +++ b/fpga/include/villas/fpga/node.hpp @@ -167,7 +167,7 @@ public: using CoreFactory::CoreFactory; virtual - void configure(Core &ip, json_t *cfg); + void parse(Core &ip, json_t *cfg); }; } /* namespace ip */ diff --git a/fpga/lib/core.cpp b/fpga/lib/core.cpp index b125cb230..13280bcde 100644 --- a/fpga/lib/core.cpp +++ b/fpga/lib/core.cpp @@ -245,7 +245,7 @@ CoreFactory::make(PCIeCard* card, json_t *json_ips) } // IP-specific setup via JSON config - CoreFactory->configure(*ip, json_ip); + CoreFactory->parse(*ip, json_ip); // Set polling mode CoreFactory->configurePollingMode(*ip, (card->polling ? PollingMode::POLL : PollingMode::IRQ)); diff --git a/fpga/lib/ips/bram.cpp b/fpga/lib/ips/bram.cpp index bff173b99..15b44b2b3 100644 --- a/fpga/lib/ips/bram.cpp +++ b/fpga/lib/ips/bram.cpp @@ -27,9 +27,9 @@ using namespace villas::fpga::ip; static BramFactory factory; -void BramFactory::configure(Core &ip, json_t* cfg) +void BramFactory::parse(Core &ip, json_t* cfg) { - CoreFactory::configure(ip, cfg); + CoreFactory::parse(ip, cfg); auto &bram = dynamic_cast(ip); diff --git a/fpga/lib/ips/dma.cpp b/fpga/lib/ips/dma.cpp index 03a247b26..a90ccaddf 100644 --- a/fpga/lib/ips/dma.cpp +++ b/fpga/lib/ips/dma.cpp @@ -618,9 +618,9 @@ void Dma::dump() logger->info("MM2S_DMASR: {:x}", XAxiDma_ReadReg(xDma.RegBase, XAXIDMA_TX_OFFSET + XAXIDMA_SR_OFFSET)); } -void DmaFactory::configure(Core &ip, json_t *cfg) +void DmaFactory::parse(Core &ip, json_t *cfg) { - NodeFactory::configure(ip, cfg); + NodeFactory::parse(ip, cfg); auto &dma = dynamic_cast(ip); diff --git a/fpga/lib/ips/pcie.cpp b/fpga/lib/ips/pcie.cpp index 2edf530a0..2881ad50a 100644 --- a/fpga/lib/ips/pcie.cpp +++ b/fpga/lib/ips/pcie.cpp @@ -113,9 +113,9 @@ AxiPciExpressBridge::init() } void -AxiPciExpressBridgeFactory::configure(Core &ip, json_t *cfg) +AxiPciExpressBridgeFactory::parse(Core &ip, json_t *cfg) { - CoreFactory::configure(ip, cfg); + CoreFactory::parse(ip, cfg); auto logger = getLogger(); auto &pcie = dynamic_cast(ip); diff --git a/fpga/lib/ips/switch.cpp b/fpga/lib/ips/switch.cpp index 45ea1b1b7..588489470 100644 --- a/fpga/lib/ips/switch.cpp +++ b/fpga/lib/ips/switch.cpp @@ -128,9 +128,9 @@ int AxiStreamSwitch::portNameToNum(const std::string &portName) return std::stoi(number); } -void AxiStreamSwitchFactory::configure(Core &ip, json_t *cfg) +void AxiStreamSwitchFactory::parse(Core &ip, json_t *cfg) { - NodeFactory::configure(ip, cfg); + NodeFactory::parse(ip, cfg); auto logger = getLogger(); diff --git a/fpga/lib/node.cpp b/fpga/lib/node.cpp index 171bfa459..67c7933b6 100644 --- a/fpga/lib/node.cpp +++ b/fpga/lib/node.cpp @@ -36,9 +36,9 @@ using namespace villas::fpga::ip; StreamGraph Node::streamGraph; -void NodeFactory::configure(Core &ip, json_t *cfg) +void NodeFactory::parse(Core &ip, json_t *cfg) { - CoreFactory::configure(ip, cfg); + CoreFactory::parse(ip, cfg); auto &Node = dynamic_cast(ip); auto logger = getLogger();