Merge pull request #8473 from jordan-woyak/evdev-combine

ControllerInterface: Combine evdev devices with the same unique ID.

1 files changed, 14 insertions, 6 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h
index f4b095558b..3c60e2cb57 100644
--- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h
+++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h
@@ -76,18 +76,26 @@ public:
   void UpdateInput() override;
   bool IsValid() const override;
 
-  evdevDevice(const std::string& devnode);
   ~evdevDevice();
 
+  // Return true if node was "interesting".
+  bool AddNode(std::string devnode, int fd, libevdev* dev);
+
+  const char* GetUniqueID() const;
+
   std::string GetName() const override { return m_name; }
   std::string GetSource() const override { return "evdev"; }
-  bool IsInteresting() const { return m_interesting; }
 
 private:
-  const std::string m_devfile;
-  int m_fd;
-  libevdev* m_dev;
   std::string m_name;
-  bool m_interesting = false;
+
+  struct Node
+  {
+    std::string devnode;
+    int fd;
+    libevdev* device;
+  };
+
+  std::vector<Node> m_nodes;
 };
 }  // namespace ciface::evdev