max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: fix descriptor set length and DeviceInterfaceGUIDs

Browse Source
This commit is contained in:
Matt Ickstadt 2023-01-13 10:18:33 -06:00 committed by alexmoon
parent f5ff3c4ac3
commit 617b0a03b9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
embassy-usb/src/msos.rs
View File

@ -205,7 +205,7 @@ impl<'a> DeviceDescriptorSetBuilder<'a> {
let used = self.builder.used; let used = self.builder.used;
let buf = self.builder.buf; let buf = self.builder.buf;
// Update length in header with final length // Update length in header with final length
let total_len = &mut buf[4..6]; let total_len = &mut buf[8..10];
total_len.copy_from_slice((used as u16).to_le_bytes().as_slice()); total_len.copy_from_slice((used as u16).to_le_bytes().as_slice());
MsOsDescriptorSet { MsOsDescriptorSet {
@ -528,7 +528,7 @@ impl<'a> RegistryPropertyFeatureDescriptor<'a> {
unsafe { core::slice::from_raw_parts(s.as_ptr() as *const u8, (s.len() + 1) * 2) } unsafe { core::slice::from_raw_parts(s.as_ptr() as *const u8, (s.len() + 1) * 2) }
} }
/// A registry property that sets the DeviceInterfaceGUID to the device interface class for USB devices which are /// A registry property that sets the DeviceInterfaceGUIDs to the device interface class for USB devices which are
/// attached to a USB hub. /// attached to a USB hub.
pub fn new_usb_deviceinterfaceguid() -> Self { pub fn new_usb_deviceinterfaceguid() -> Self {
// Can't use defmt::panic in constant expressions (inside u16cstr!) // Can't use defmt::panic in constant expressions (inside u16cstr!)
@ -540,9 +540,9 @@ impl<'a> RegistryPropertyFeatureDescriptor<'a> {
}; };
} }
Self::new_string( Self::new_multi_string(
u16cstr!("DeviceInterfaceGUID"), u16cstr!("DeviceInterfaceGUIDs"),
u16cstr!("{A5DCBF10-6530-11D2-901F-00C04FB951ED}"), u16cstr!("{A5DCBF10-6530-11D2-901F-00C04FB951ED}").as_slice_with_nul(),
) )
} }