Move configuration of polling mode to parse()

etc/fpgas.json

@@ -4,8 +4,7 @@
         "id": "10ee:7021",
         "slot": "0000:88:00.0",
         "do_reset": true,
-        "ips": "etc/vc707-xbar-pcie/vc707-xbar-pcie.json",
-        "polling": false
+        "ips": "etc/vc707-xbar-pcie/vc707-xbar-pcie.json"
       }
     }
 }

include/villas/fpga/card.hpp

@@ -104,7 +104,6 @@ class PCIeCard : public Card {
 
 	bool doReset;					// Reset VILLASfpga during startup?
 	int affinity;					// Affinity for MSI interrupts
-	bool polling;					// Poll on interrupts?
 
 	std::string name;				// The name of the FPGA card
 

include/villas/fpga/core.hpp

@@ -293,11 +293,6 @@ class CoreFactory : public plugin::Plugin {
 	}
 
 protected:
-	enum PollingMode {
-		POLL,
-		IRQ,
-	};
-
 	Logger getLogger() const
 	{
 		return villas::logging.get(getName());
@@ -312,10 +307,6 @@ class CoreFactory : public plugin::Plugin {
 	// Create a concrete IP instance
 	virtual Core* create() = 0;
 
-	virtual
-	void configurePollingMode(Core &, PollingMode)
-	{ }
-
 	virtual
 	Vlnv getCompatibleVlnv() const = 0;
 

include/villas/fpga/ips/dma.hpp

@@ -180,12 +180,6 @@ class DmaFactory : public NodeFactory {
 
 	virtual
 	void parse(Core& ip, json_t* json) override;
-
-	virtual void
-	configurePollingMode(Core& ip, PollingMode mode) override
-	{
-		dynamic_cast<Dma&>(ip).polling = (mode == POLL);
-	}
 };
 
 } /* namespace ip */

lib/card.cpp

@@ -58,7 +58,6 @@ PCIeCard::List PCIeCardFactory::make(json_t *json, std::shared_ptr<kernel::pci::
 		const char* pci_id   = nullptr;
 		int         do_reset = 0;
 		int         affinity = 0;
-		int 	    polling  = 0;
 
 		json_error_t err;
 		int ret = json_unpack_ex(json_card, &err, 0, "{ s: o, s?: i, s?: b, s?: s, s?: s, s?: b, s?: o }",
@@ -80,7 +79,6 @@ PCIeCard::List PCIeCardFactory::make(json_t *json, std::shared_ptr<kernel::pci::
 		card->vfioContainer = vc;
 		card->affinity = affinity;
 		card->doReset = do_reset != 0;
-		card->polling = (polling != 0);
 
 		kernel::pci::Device filter = defaultFilter;
 

lib/core.cpp

@@ -249,9 +249,6 @@ CoreFactory::make(PCIeCard* card, json_t *json_ips)
 		// IP-specific setup via JSON config
 		CoreFactory->parse(*ip, json_ip);
 
-		// Set polling mode
-		CoreFactory->configurePollingMode(*ip, (card->polling ? PollingMode::POLL : PollingMode::IRQ));
-
 		// IP has been configured now
 		configuredIps.push_back(std::move(ip));
 	}

lib/ips/dma.cpp

@@ -646,8 +646,12 @@ void DmaFactory::parse(Core &ip, json_t *cfg)
 	dma.xConfig.AddrWidth = 32;
 	dma.xConfig.SgLengthWidth = 14;
 
+	int polling;
+
 	json_error_t err;
-	int ret = json_unpack_ex(cfg, &err, 0, "{ s: { s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i } }",
+	int ret = json_unpack_ex(cfg, &err, 0, "{ s: b, s: { s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i, s?: i } }",
+		"polling", &polling,
+
 		"parameters",
 			"c_sg_include_stscntrl_strm", 	&dma.xConfig.HasStsCntrlStrm,
 			"c_include_mm2s", 		&dma.xConfig.HasMm2S,
@@ -667,4 +671,5 @@ void DmaFactory::parse(Core &ip, json_t *cfg)
 		throw ConfigError(cfg, err, "", "Failed to parse DMA configuration");
 
 	dma.configDone = true;
+	dma.polling = polling != 0;
 }