From 01957c3b65e92417ad5a22dfef7661f608192c8b Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 12 Sep 2025 22:15:04 +0800 Subject: [PATCH] make baremetal work with windows CDC-ACM without special drivers --- .../src/platform/cramium/usb/handlers.rs | 2 +- baremetal/src/platform/cramium/usb/mod.rs | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/baremetal/src/platform/cramium/usb/handlers.rs b/baremetal/src/platform/cramium/usb/handlers.rs index 8c29da352..63d2fe68c 100644 --- a/baremetal/src/platform/cramium/usb/handlers.rs +++ b/baremetal/src/platform/cramium/usb/handlers.rs @@ -148,7 +148,7 @@ pub fn get_descriptor_request(this: &mut CorigineUsb, value: u16, _index: usize, match (value >> 8) as u8 { USB_DT_DEVICE => { - let mut dd = DeviceDescriptor::default_composite(); + let mut dd = DeviceDescriptor::composite_with_iad(); dd.b_max_packet_size0 = 64; let len = length.min(core::mem::size_of::()); ep0_buf[..len].copy_from_slice(&dd.as_ref()[..len]); diff --git a/baremetal/src/platform/cramium/usb/mod.rs b/baremetal/src/platform/cramium/usb/mod.rs index b907efb48..a41f8dce3 100644 --- a/baremetal/src/platform/cramium/usb/mod.rs +++ b/baremetal/src/platform/cramium/usb/mod.rs @@ -167,6 +167,7 @@ impl DeviceDescriptor { } } + #[allow(dead_code)] pub fn default_composite() -> Self { Self { b_length: core::mem::size_of::() as u8, @@ -185,6 +186,26 @@ impl DeviceDescriptor { b_num_configurations: 1, } } + + // Windows-friendly composite: EF/02/01 indicates IAD-present composite + pub fn composite_with_iad() -> Self { + Self { + b_length: core::mem::size_of::() as u8, + b_descriptor_type: USB_DT_DEVICE, + b_cd_usb: 0x0200, + b_device_class: 0xEF, // Miscellaneous + b_device_sub_class: 0x02, // Common Class + b_device_protocol: 0x01, // Interface Association Descriptor (IAD) + b_max_packet_size0: 0x40, + id_vendor: VENDOR_ID, + id_product: PRODUCT_ID, + b_cd_device: 0x0101, + i_manufacturer: 0x01, + i_product: 0x02, + i_serial_number: 0x03, + b_num_configurations: 1, + } + } } impl AsRef<[u8]> for DeviceDescriptor {