Merge pull request #4299

f9b22a7b hw_device: support for multiple devices added [for review] (Dusan Klinec)

2 files changed, 61 insertions, 22 deletions

diff --git a/src/device/device.cpp b/src/device/device.cpp
index 983f59b60..8a8b40061 100644
--- a/src/device/device.cpp
+++ b/src/device/device.cpp
@@ -39,32 +39,60 @@ namespace hw {
     
     /* ======================================================================= */
     /*  SETUP                                                                  */
-    /* ======================================================================= */   
-    device& get_device(const std::string device_descriptor) {
-        
-        struct s_devices {
-            std::map<std::string, std::unique_ptr<device>> registry;
-            s_devices() : registry() {
-                hw::core::register_all(registry);
-                #ifdef HAVE_PCSC
-                hw::ledger::register_all(registry); 
-                #endif
-           };
-        };
-        
-        static const s_devices devices;
+    /* ======================================================================= */
+
+    static std::unique_ptr<device_registry> registry;
+
+    device_registry::device_registry(){
+        hw::core::register_all(registry);
+        #ifdef HAVE_PCSC
+        hw::ledger::register_all(registry);
+        #endif
+    }
+
+    bool device_registry::register_device(const std::string & device_name, device * hw_device){
+        auto search = registry.find(device_name);
+        if (search != registry.end()){
+            return false;
+        }
+
+        registry.insert(std::make_pair(device_name, std::unique_ptr<device>(hw_device)));
+        return true;
+    }
+
+    device& device_registry::get_device(const std::string & device_descriptor){
+        // Device descriptor can contain further specs after first :
+        auto delim = device_descriptor.find(':');
+        auto device_descriptor_lookup = device_descriptor;
+        if (delim != std::string::npos) {
+            device_descriptor_lookup = device_descriptor.substr(0, delim);
+        }
 
-        auto device = devices.registry.find(device_descriptor);
-        if (device == devices.registry.end()) {
-            MERROR("device not found in registry: '" << device_descriptor << "'\n" <<
-                      "known devices:");
-            
-            for( const auto& sm_pair : devices.registry ) {
+        auto device = registry.find(device_descriptor_lookup);
+        if (device == registry.end()) {
+            MERROR("Device not found in registry: '" << device_descriptor << "'. Known devices: ");
+            for( const auto& sm_pair : registry ) {
                 MERROR(" - " << sm_pair.first);
             }
-            throw std::runtime_error("device not found: "+ device_descriptor);
+            throw std::runtime_error("device not found: " + device_descriptor);
         }
         return *device->second;
     }
 
+    device& get_device(const std::string & device_descriptor) {
+        if (!registry){
+            registry.reset(new device_registry());
+        }
+
+        return registry->get_device(device_descriptor);
+    }
+
+    bool register_device(const std::string & device_name, device * hw_device){
+        if (!registry){
+            registry.reset(new device_registry());
+        }
+
+        return registry->register_device(device_name, hw_device);
+    }
+
 }
diff --git a/src/device/device.hpp b/src/device/device.hpp
index c21456daf..d14b8848c 100644
--- a/src/device/device.hpp
+++ b/src/device/device.hpp
@@ -202,6 +202,17 @@ namespace hw {
         ~reset_mode() { hwref.set_mode(hw::device::NONE);}
     };
 
-    device& get_device(const std::string device_descriptor) ;
+    class device_registry {
+    private:
+      std::map<std::string, std::unique_ptr<device>> registry;
+
+    public:
+      device_registry();
+      bool register_device(const std::string & device_name, device * hw_device);
+      device& get_device(const std::string & device_descriptor);
+    };
+
+    device& get_device(const std::string & device_descriptor);
+    bool register_device(const std::string & device_name, device * hw_device);
 }