Unload module for supported tablets

OpenTabletDriver.udev/Program.cs

@@ -61,11 +61,14 @@ static IEnumerable<string> CreateRules(DirectoryInfo directory)
                 if (string.IsNullOrWhiteSpace(tablet.Name))
                     continue;
                 yield return string.Format("# {0}", tablet.Name);
-
-                foreach (var rule in RuleCreator.CreateAccessRules(tablet, "hidraw", "0666"))
+
+                foreach (var rule in RuleCreator.CreateAccessRules(tablet, "hidraw"))
+                    yield return rule;
+
+                foreach (var rule in RuleCreator.CreateAccessRules(tablet, "usb"))
                     yield return rule;
-                
-                foreach (var rule in RuleCreator.CreateAccessRules(tablet, "usb", "0666"))
+
+                foreach (var rule in RuleCreator.CreateModuleRules(tablet))
                     yield return rule;
 
                 if (tablet.Attributes.TryGetValue("libinputoverride", out var value) && (value == "1" || value.ToLower() == "true"))

OpenTabletDriver.udev/RuleCreator.cs

@@ -9,6 +9,12 @@ namespace OpenTabletDriver.udev
 {
     internal static class RuleCreator
     {
+        private static IEnumerable<DeviceIdentifier> GetDistinctIdentifiers(TabletConfiguration config)
+        {
+            var allIdentifiers = config.DigitizerIdentifiers.Concat(config.AuxilaryDeviceIdentifiers);
+            return allIdentifiers.Distinct(new IdentifierComparer());
+        }
+
         public static Rule CreateAccessRule(string module, string subsystem)
         {
             return new Rule(
@@ -19,21 +25,15 @@ public static Rule CreateAccessRule(string module, string subsystem)
             );
         }
 
-        private static IEnumerable<DeviceIdentifier> GetDistinctIdentifiers(TabletConfiguration config)
-        {
-            var allIdentifiers = config.DigitizerIdentifiers.Concat(config.AuxilaryDeviceIdentifiers);
-            return allIdentifiers.Distinct(new IdentifierComparer());
-        }
-
-        public static IEnumerable<Rule> CreateAccessRules(TabletConfiguration tablet, string subsystem, string mode)
+        public static IEnumerable<Rule> CreateAccessRules(TabletConfiguration tablet, string subsystem)
         {
             foreach (var id in GetDistinctIdentifiers(tablet))
             {
                 yield return new Rule(
                     new Token("SUBSYSTEM", Operator.Equal, subsystem),
                     new ATTRS("idVendor", Operator.Equal, id.VendorID.ToHexFormat()),
                     new ATTRS("idProduct", Operator.Equal, id.ProductID.ToHexFormat()),
-                    new Token("MODE", Operator.Assign, mode)
+                    new Token("TAG", Operator.Add, "uaccess")
                 );
             }
         }
@@ -50,5 +50,20 @@ public static IEnumerable<Rule> CreateOverrideRules(TabletConfiguration tablet)
                 );
             }
         }
+
+        public static IEnumerable<Rule> CreateModuleRules(TabletConfiguration tablet)
+        {
+            foreach (var id in GetDistinctIdentifiers(tablet))
+            {
+                var module = id.VendorID == 1386 ? "wacom" : "hid_uclogic";
+                yield return new Rule(
+                    new Token("SUBSYSTEM", Operator.Equal, "input"),
+                    new ATTRS("idVendor", Operator.Equal, id.VendorID.ToHexFormat()),
+                    new ATTRS("idProduct", Operator.Equal, id.ProductID.ToHexFormat()),
+                    new Token("ACTION", Operator.Assign, "add"),
+                    new Token("PROGRAM", Operator.Assign, $"/sbin/rmmod {module}")
+                );
+            }
+        }
     }
 }