Initial cleanup

daemon/src/ctrl_leds.rs

@@ -4,11 +4,7 @@ static LED_SET: [u8; 17] = [0x5d, 0xb5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 
 static KBD_BRIGHT_PATH: &str = "/sys/class/leds/asus::kbd_backlight/brightness";
 
-use crate::{
+use crate::{config_aura::AuraConfig, error::RogError, laptops::{ASUS_KEYBOARD_DEVICES, HELP_ADDRESS, LaptopLedData, laptop_data}};
-    config_aura::AuraConfig,
-    error::RogError,
-    laptops::{match_laptop, LaptopLedData, HELP_ADDRESS},
-};
 use log::{error, info, warn};
 use rog_types::{
     aura_modes::{AuraEffect, AuraModeNum},
@@ -37,16 +33,14 @@ impl GetSupported for CtrlKbdBacklight {
 
     fn get_supported() -> Self::A {
         // let mode = <&str>::from(&<AuraModes>::from(*mode));
-        let mut stock_led_modes = None;
         let multizone_led_mode = false;
         let per_key_led_mode = false;
-        if let Some(laptop) = match_laptop() {
+        let laptop = laptop_data();
-            stock_led_modes = if laptop.supported_modes().standard.is_empty() {
+        let stock_led_modes = if laptop.supported_modes().standard.is_empty() {
-                None
+            None
-            } else {
+        } else {
-                Some(laptop.supported_modes().standard.clone())
+            Some(laptop.supported_modes().standard.clone())
-            };
+        };
-        }
 
         LedSupportedFunctions {
             brightness_set: CtrlKbdBacklight::get_kbd_bright_path().is_ok(),
@@ -59,8 +53,6 @@ impl GetSupported for CtrlKbdBacklight {
 
 pub struct CtrlKbdBacklight {
     led_node: Option<String>,
-    #[allow(dead_code)]
-    kbd_node: Option<String>,
     pub bright_node: String,
     supported_modes: LaptopLedData,
     flip_effect_write: bool,
@@ -258,46 +250,39 @@ impl crate::CtrlTask for CtrlKbdBacklight {
 
 impl CtrlKbdBacklight {
     #[inline]
-    pub fn new(
+    pub fn new(supported_modes: LaptopLedData, config: AuraConfig) -> Result<Self, RogError> {
-        id_product: &str,
-        condev_iface: Option<&String>,
-        supported_modes: LaptopLedData,
-        config: AuraConfig,
-    ) -> Result<Self, RogError> {
         // TODO: return error if *all* nodes are None
-        let led_node = Self::get_node_failover(id_product, None, Self::scan_led_node).map_or_else(
+        let mut led_node = None;
-            |err| {
+        for prod in ASUS_KEYBOARD_DEVICES.iter() {
-                warn!("led_node: {}", err);
+            match Self::get_node_failover(prod, Self::scan_led_node) {
-                None
+                Ok(node) => {
-            },
+                    led_node = Some(node);
-            Some,
+                    break;
-        );
+                }
+                Err(err) => warn!("led_node: {}", err),
+            }
+        }
 
-        let kbd_node = Self::get_node_failover(id_product, condev_iface, Self::scan_kbd_node)
+        let bright_node = Self::get_kbd_bright_path().map_or_else(|_| None, Some);
-            .map_or_else(
-                |err| {
-                    warn!("kbd_node: {}", err);
-                    None
-                },
-                Some,
-            );
 
-        let bright_node = Self::get_kbd_bright_path();
+        if led_node.is_none() && bright_node.is_none() {
-
-        if led_node.is_none() && kbd_node.is_none() && Self::get_kbd_bright_path().is_err() {
             return Err(RogError::MissingFunction(
                 "All keyboard features missing, you may require a v5.11 series kernel or newer"
                     .into(),
             ));
         }
 
+        if bright_node.is_none() {
+            return Err(RogError::MissingFunction(
+                "No brightness control, you may require a v5.11 series kernel or newer"
+                    .into(),
+            ));
+        }
+        
+
         let ctrl = CtrlKbdBacklight {
-            // Using `ok` here so we can continue without keyboard features but
-            // still get brightness control at least... maybe...
             led_node,
-            kbd_node,
+            bright_node: bright_node.unwrap(), // If was none then we already returned above
-            // TODO: Check for existance
-            bright_node: bright_node?.to_owned(),
             supported_modes,
             flip_effect_write: false,
             config,
@@ -305,9 +290,9 @@ impl CtrlKbdBacklight {
         Ok(ctrl)
     }
 
-    fn get_kbd_bright_path() -> Result<&'static str, RogError> {
+    fn get_kbd_bright_path() -> Result<String, RogError> {
         if Path::new(KBD_BRIGHT_PATH).exists() {
-            Ok(KBD_BRIGHT_PATH)
+            Ok(KBD_BRIGHT_PATH.to_string())
         } else {
             Err(RogError::MissingFunction(
                 "Keyboard features missing, you may require a v5.11 series kernel or newer".into(),
@@ -348,19 +333,18 @@ impl CtrlKbdBacklight {
 
     fn get_node_failover(
         id_product: &str,
-        iface: Option<&String>,
+        fun: fn(&str) -> Result<String, RogError>,
-        fun: fn(&str, Option<&String>) -> Result<String, RogError>,
     ) -> Result<String, RogError> {
-        match fun(id_product, iface) {
+        match fun(id_product) {
             Ok(o) => return Ok(o),
             Err(e) => {
                 warn!("Looking for node: {}", e.to_string());
             }
         }
-        Err(RogError::NotFound(format!("{}, {:?}", id_product, iface)))
+        Err(RogError::NotFound(format!("{}", id_product)))
     }
 
-    fn scan_led_node(id_product: &str, _: Option<&String>) -> Result<String, RogError> {
+    fn scan_led_node(id_product: &str) -> Result<String, RogError> {
         let mut enumerator = udev::Enumerator::new().map_err(|err| {
             warn!("{}", err);
             RogError::Udev("enumerator failed".into(), err)
@@ -399,51 +383,6 @@ impl CtrlKbdBacklight {
         ))
     }
 
-    fn scan_kbd_node(id_product: &str, iface: Option<&String>) -> Result<String, RogError> {
-        let mut enumerator = udev::Enumerator::new().map_err(|err| {
-            warn!("{}", err);
-            RogError::Udev("enumerator failed".into(), err)
-        })?;
-        enumerator.match_subsystem("input").map_err(|err| {
-            warn!("{}", err);
-            RogError::Udev("match_subsystem failed".into(), err)
-        })?;
-        enumerator
-            .match_property("ID_MODEL_ID", id_product)
-            .map_err(|err| {
-                warn!("{}", err);
-                RogError::Udev("match_property failed".into(), err)
-            })?;
-
-        for device in enumerator
-            .scan_devices()
-            .map_err(|err| {
-                warn!("{}", err);
-                err
-            })
-            .map_err(|err| {
-                warn!("{}", err);
-                RogError::Udev("scan_devices failed".into(), err)
-            })?
-        {
-            if let Some(dev_node) = device.devnode() {
-                if let Some(inum) = device.property_value("ID_USB_INTERFACE_NUM") {
-                    if let Some(iface) = iface {
-                        if inum == iface.as_str() {
-                            info!("Using device at: {:?} for keyboard polling", dev_node);
-                            return Ok(dev_node.to_string_lossy().to_string());
-                        }
-                    }
-                }
-            }
-        }
-
-        warn!("Did not find keyboard consumer device node, if expected functions are missing please file an issue at {}", HELP_ADDRESS);
-        Err(RogError::MissingFunction(
-            "ASUS keyboard 'Consumer Device' node not found".into(),
-        ))
-    }
-
     pub(crate) fn do_command(&mut self, mode: AuraEffect) -> Result<(), RogError> {
         self.set_and_save(mode)
     }

daemon/src/daemon.rs

@@ -1,6 +1,5 @@
-use daemon::ctrl_fan_cpu::{CtrlFanAndCPU, DbusFanAndCpu};
+use daemon::{ctrl_fan_cpu::{CtrlFanAndCPU, DbusFanAndCpu}, laptops::laptop_data};
 use daemon::ctrl_leds::{CtrlKbdBacklight, DbusKbdBacklight};
-use daemon::laptops::match_laptop;
 use daemon::{
     config::Config, ctrl_supported::SupportedFunctions, laptops::print_board_info, GetSupported,
 };
@@ -136,12 +135,11 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
         DbusFanAndCpu::new(tmp).add_to_server(&mut object_server);
     };
 
-    if let Some(laptop) = match_laptop() {
+    let laptop = laptop_data();
+    if !laptop.supported_modes().standard.is_empty() {
         let aura_config = AuraConfig::load(laptop.supported_modes());
 
         if let Ok(ctrl) = CtrlKbdBacklight::new(
-            laptop.usb_product(),
-            laptop.condev_iface(),
             laptop.supported_modes().to_owned(),
             aura_config,
         )

daemon/src/laptops.rs

@@ -4,63 +4,28 @@ use serde_derive::{Deserialize, Serialize};
 use std::fs::OpenOptions;
 use std::io::Read;
 
-pub static LEDMODE_CONFIG_PATH: &str = "/etc/asusd/asusd-ledmodes.toml";
+pub const LEDMODE_CONFIG_PATH: &str = "/etc/asusd/asusd-ledmodes.toml";
-pub static HELP_ADDRESS: &str = "https://gitlab.com/asus-linux/asus-nb-ctrl";
+pub const HELP_ADDRESS: &str = "https://gitlab.com/asus-linux/asus-nb-ctrl";
-static LAPTOP_DEVICES: [u16; 4] = [0x1866, 0x1869, 0x1854, 0x19b6];
+pub const ASUS_KEYBOARD_DEVICES: [&str; 4] = ["0x1866", "0x1869", "0x1854", "0x19b6"];
 
 /// A helper of sorts specifically for functions tied to laptop models
 #[derive(Debug)]
 pub struct LaptopBase {
-    usb_product: String,
-    condev_iface: Option<String>, // required for finding the Consumer Device interface
     led_support: LaptopLedData,
 }
 
 impl LaptopBase {
-    pub fn usb_product(&self) -> &str {
-        &self.usb_product
-    }
-    pub fn condev_iface(&self) -> Option<&String> {
-        self.condev_iface.as_ref()
-    }
     pub fn supported_modes(&self) -> &LaptopLedData {
         &self.led_support
     }
 }
 
-pub fn match_laptop() -> Option<LaptopBase> {
+pub fn laptop_data() -> LaptopBase {
-    for device in rusb::devices().expect("Couldn't get device").iter() {
-        let device_desc = device
-            .device_descriptor()
-            .expect("Couldn't get device descriptor");
-        if device_desc.vendor_id() == 0x0b05 && LAPTOP_DEVICES.contains(&device_desc.product_id()) {
-            let prod_str = format!("{:x?}", device_desc.product_id());
-
-            if device_desc.product_id() == 0x1854 {
-                let laptop = laptop(prod_str, None);
-                return Some(laptop);
-            }
-
-            let laptop = laptop(prod_str, Some("02".to_owned()));
-            return Some(laptop);
-        }
-    }
-    warn!(
-        "Unsupported laptop, please request support at {}",
-        HELP_ADDRESS
-    );
-    warn!("Continuing with minimal support");
-    None
-}
-
-fn laptop(prod: String, condev_iface: Option<String>) -> LaptopBase {
     let dmi = sysfs_class::DmiId::default();
     let board_name = dmi.board_name().expect("Could not get board_name");
     let prod_family = dmi.product_family().expect("Could not get product_family");
 
     let mut laptop = LaptopBase {
-        usb_product: prod,
-        condev_iface,
         led_support: LaptopLedData {
             board_names: vec![],
             prod_family: String::new(),