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

Minor cleanup of bios controller

Browse Source
This commit is contained in:
Luke D. Jones
2021-05-29 15:33:47 +12:00
parent f520e381a9
commit 62a18d4e57
1 changed files with 12 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
daemon/src/ctrl_rog_bios.rs
View File

@@ -28,8 +28,8 @@ impl GetSupported for CtrlRogBios {
fn get_supported() -> Self::A { fn get_supported() -> Self::A {
RogBiosSupportedFunctions { RogBiosSupportedFunctions {
post_sound_toggle: CtrlRogBios::check_path_exists(ASUS_POST_LOGO_SOUND).is_ok(), post_sound_toggle: Path::new(ASUS_POST_LOGO_SOUND).exists(),
dedicated_gfx_toggle: CtrlRogBios::check_path_exists(ASUS_SWITCH_GRAPHIC_MODE).is_ok(), dedicated_gfx_toggle: Path::new(ASUS_SWITCH_GRAPHIC_MODE).exists(),
} }
} }
} }
@@ -63,8 +63,6 @@ impl CtrlRogBios {
#[dbus_interface(signal)] #[dbus_interface(signal)]
pub fn notify_dedicated_graphic_mode(&self, dedicated: bool) -> zbus::Result<()> {} pub fn notify_dedicated_graphic_mode(&self, dedicated: bool) -> zbus::Result<()> {}
// // // // // // // // // //
pub fn set_post_boot_sound(&mut self, on: bool) { pub fn set_post_boot_sound(&mut self, on: bool) {
Self::set_boot_sound(on) Self::set_boot_sound(on)
.map_err(|err| { .map_err(|err| {
@@ -116,23 +114,17 @@ impl crate::Reloadable for CtrlRogBios {
impl CtrlRogBios { impl CtrlRogBios {
pub fn new(config: Arc<Mutex<Config>>) -> Result<Self, RogError> { pub fn new(config: Arc<Mutex<Config>>) -> Result<Self, RogError> {
match CtrlRogBios::check_path_exists(ASUS_SWITCH_GRAPHIC_MODE) { if Path::new(ASUS_SWITCH_GRAPHIC_MODE).exists() {
Ok(_) => { CtrlRogBios::set_path_mutable(ASUS_SWITCH_GRAPHIC_MODE)?;
CtrlRogBios::set_path_mutable(ASUS_SWITCH_GRAPHIC_MODE)?; } else {
} info!("G-Sync Switchable Graphics not detected");
Err(err) => { info!("If your laptop is not a G-Sync enabled laptop then you can ignore this. Standard graphics switching will still work.");
info!("G-Sync Switchable Graphics not detected: {}", err);
info!("If your laptop is not a G-Sync enabled laptop then you can ignore this. Standard graphics switching will still work.");
}
} }
match CtrlRogBios::check_path_exists(ASUS_POST_LOGO_SOUND) { if Path::new(ASUS_POST_LOGO_SOUND).exists() {
Ok(_) => { CtrlRogBios::set_path_mutable(ASUS_POST_LOGO_SOUND)?;
CtrlRogBios::set_path_mutable(ASUS_POST_LOGO_SOUND)?; } else {
} info!("Switch for POST boot sound not detected");
Err(err) => {
info!("Switch for POST boot sound not detected: {}", err);
}
} }
Ok(CtrlRogBios { _config: config }) Ok(CtrlRogBios { _config: config })
@@ -148,19 +140,8 @@ impl CtrlRogBios {
Ok(()) Ok(())
} }
fn check_path_exists(path: &str) -> Result<(), RogError> {
if Path::new(path).exists() {
Ok(())
} else {
Err(RogError::MissingFunction(path.into()))
}
}
pub fn has_dedicated_gfx_toggle() -> bool { pub fn has_dedicated_gfx_toggle() -> bool {
if CtrlRogBios::check_path_exists(ASUS_SWITCH_GRAPHIC_MODE).is_ok() { Path::new(ASUS_SWITCH_GRAPHIC_MODE).exists()
return true;
}
false
} }
pub fn get_gfx_mode() -> Result<i8, RogError> { pub fn get_gfx_mode() -> Result<i8, RogError> {
@@ -201,17 +182,6 @@ impl CtrlRogBios {
.map_err(|err| RogError::Path(path.into(), err))?; .map_err(|err| RogError::Path(path.into(), err))?;
self.update_initramfs(dedicated)?; self.update_initramfs(dedicated)?;
// if let Ok(ded) = CtrlRogBios::get_gfx_mode() {
// if let Ok(vendor) = CtrlGraphics::get_vendor() {
// if ded == 1 && vendor != "nvidia" {
// warn!("Dedicated GFX toggle is on but driver mode is not nvidia \nSetting to nvidia driver mode");
// CtrlGraphics::set_gfx_config(&GfxVendors::Nvidia)
// .unwrap_or_else(|err| warn!("Gfx controller: {}", err));
// }
// }
// }
Ok(()) Ok(())
} }