gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: share a single HID device

Browse Source 
Avoid opening multiple handles to the same device whenever possible.
This commit is contained in:
Denis Benato
2025-10-22 22:05:17 +02:00
parent c9e76f3273
commit 180566e5f1
14 changed files with 84 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asusd/src/aura_anime/mod.rs
View File

@@ -8,7 +8,6 @@ use std::sync::Arc;
use std::thread::sleep;
use config_traits::StdConfig;
use futures_util::lock::Mutex;
use log::{debug, error, info, warn};
use rog_anime::usb::{
pkt_flush, pkt_set_brightness, pkt_set_enable_display, pkt_set_enable_powersave_anim,
@@ -17,6 +16,7 @@ use rog_anime::usb::{
use rog_anime::{ActionData, AnimeDataBuffer, AnimePacketType};
use rog_platform::hid_raw::HidRaw;
use rog_platform::usb_raw::USBRaw;
use tokio::sync::Mutex;
use self::config::{AniMeConfig, AniMeConfigCached};
use crate::error::RogError;
@@ -51,7 +51,7 @@ impl AniMe {
/// Will fail if something is already holding the config lock
async fn do_init_cache(&mut self) {
if let Some(mut config) = self.config.try_lock() {
if let Ok(mut config) = self.config.try_lock() {
if let Err(e) = self.cache.init_from_config(&config, config.anime_type) {
error!(
"Trying to cache the Anime Config failed, will reset to default config: {e:?}"

14
asusd/src/aura_anime/trait_impls.rs
View File

@@ -85,7 +85,7 @@ impl AniMeZbus {
/// Set base brightness level
#[zbus(property)]
async fn brightness(&self) -> Brightness {
if let Some(config) = self.0.config.try_lock() {
if let Ok(config) = self.0.config.try_lock() {
return config.display_brightness;
}
Brightness::Off
@@ -117,7 +117,7 @@ impl AniMeZbus {
#[zbus(property)]
async fn builtins_enabled(&self) -> bool {
if let Some(config) = self.0.config.try_lock() {
if let Ok(config) = self.0.config.try_lock() {
return config.builtin_anims_enabled;
}
false
@@ -162,7 +162,7 @@ impl AniMeZbus {
#[zbus(property)]
async fn builtin_animations(&self) -> Animations {
if let Some(config) = self.0.config.try_lock() {
if let Ok(config) = self.0.config.try_lock() {
return config.builtin_anims;
}
Animations::default()
@@ -195,7 +195,7 @@ impl AniMeZbus {
#[zbus(property)]
async fn enable_display(&self) -> bool {
if let Some(config) = self.0.config.try_lock() {
if let Ok(config) = self.0.config.try_lock() {
return config.display_enabled;
}
false
@@ -218,7 +218,7 @@ impl AniMeZbus {
#[zbus(property)]
async fn off_when_unplugged(&self) -> bool {
if let Some(config) = self.0.config.try_lock() {
if let Ok(config) = self.0.config.try_lock() {
return config.off_when_unplugged;
}
false
@@ -245,7 +245,7 @@ impl AniMeZbus {
#[zbus(property)]
async fn off_when_suspended(&self) -> bool {
if let Some(config) = self.0.config.try_lock() {
if let Ok(config) = self.0.config.try_lock() {
return config.off_when_suspended;
}
false
@@ -261,7 +261,7 @@ impl AniMeZbus {
#[zbus(property)]
async fn off_when_lid_closed(&self) -> bool {
if let Some(config) = self.0.config.try_lock() {
if let Ok(config) = self.0.config.try_lock() {
return config.off_when_lid_closed;
}
false