From 980414e7e74b2d18e1ab520bba851abfcbb256d9 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 20 Mar 2025 11:51:58 -0600 Subject: [PATCH] usbhidd: fix configuration request --- input/usbhidd/src/main.rs | 9 ++++----- usbhubd/src/main.rs | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/input/usbhidd/src/main.rs b/input/usbhidd/src/main.rs index dfda4cd472..da4e798cdd 100644 --- a/input/usbhidd/src/main.rs +++ b/input/usbhidd/src/main.rs @@ -204,11 +204,10 @@ fn main() { log::info!("{:X?}", desc); let mut endp_count = 0; - let (conf_desc, conf_num, (if_desc, endp_desc_opt, hid_desc)) = desc + let (conf_desc, (if_desc, endp_desc_opt, hid_desc)) = desc .config_descs .iter() - .enumerate() - .find_map(|(conf_num, conf_desc)| { + .find_map(|conf_desc| { let if_desc = conf_desc.interface_descs.iter().find_map(|if_desc| { if if_desc.number == interface_num { let endp_desc_opt = if_desc.endpoints.iter().find_map(|endp_desc| { @@ -231,13 +230,13 @@ fn main() { None } })?; - Some((conf_desc.clone(), conf_num, if_desc)) + Some((conf_desc.clone(), if_desc)) }) .expect("Failed to find suitable configuration"); handle .configure_endpoints(&ConfigureEndpointsReq { - config_desc: conf_num as u8, + config_desc: conf_desc.configuration_value, interface_desc: Some(interface_num), alternate_setting: Some(if_desc.alternate_setting), }) diff --git a/usbhubd/src/main.rs b/usbhubd/src/main.rs index f95b8a7a92..d3ed91f182 100644 --- a/usbhubd/src/main.rs +++ b/usbhubd/src/main.rs @@ -61,7 +61,7 @@ fn main() { /*TODO handle .configure_endpoints(&ConfigureEndpointsReq { - config_desc: conf_num as u8, + config_desc: conf_desc.configuration_value, interface_desc: Some(interface_num), alternate_setting: Some(if_desc.alternate_setting), })