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

Refactor device initialisation

Browse Source
This commit is contained in:
Luke
2020-06-11 10:17:56 +12:00
parent 0b51f61f7a
commit bd0b2ac82f
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rog-core/src/rogcore.rs
View File

@@ -46,7 +46,8 @@ impl RogCore {
err err
})?; })?;
// Interface with outputs // Interface with outputs
let mut interface = 0; let mut interface = 2; // The interface with keyboard consumer device and LED control
// is #2 on 0x1866 device at least
for iface in dev_config.interfaces() { for iface in dev_config.interfaces() {
for desc in iface.descriptors() { for desc in iface.descriptors() {
for endpoint in desc.endpoint_descriptors() { for endpoint in desc.endpoint_descriptors() {
@@ -70,10 +71,25 @@ impl RogCore {
error!("Auto-detach kernel driver failed: {:?}", err); error!("Auto-detach kernel driver failed: {:?}", err);
err err
})?; })?;
dev_handle.claim_interface(interface).map_err(|err| {
error!("Could not claim keyboard device interface: {:?}", err); if let Err(err) = dev_handle.claim_interface(interface) {
err warn!("Could not claim keyboard device interface: {:?}", err);
})?; warn!("Trying to detach kernel driver then retry");
if let Ok(active) = dev_handle.kernel_driver_active(interface) {
if active {
dev_handle.detach_kernel_driver(interface).map_err(|err| {
warn!("Could not detach kernel driver: {:?}", err);
err
})?;
} else {
warn!("Kernel driver not active, continue");
}
}
dev_handle.claim_interface(interface).map_err(|err| {
error!("Could not claim keyboard device interface: {:?}", err);
err
})?;
}
Ok(RogCore { Ok(RogCore {
handle: dev_handle, handle: dev_handle,