From 3c73b497909ce5bacd16d23e54928a7f66544e09 Mon Sep 17 00:00:00 2001
From: Gerhard de Clercq <11624490+Gerharddc@users.noreply.github.com>
Date: Mon, 12 May 2025 15:51:19 +0200
Subject: [embassy-usb-dfu] support function level WinUSB GUIDs

This commit makes it possible to provide function level msos GUIDs to usb_dfu. This helps to ensure that composite DFU devices automatically get assigned the WinUSB driver on Windows.
---
 examples/boot/bootloader/stm32wb-dfu/src/main.rs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'examples/boot/bootloader')

diff --git a/examples/boot/bootloader/stm32wb-dfu/src/main.rs b/examples/boot/bootloader/stm32wb-dfu/src/main.rs
index 28216806e..2cd7f859d 100644
--- a/examples/boot/bootloader/stm32wb-dfu/src/main.rs
+++ b/examples/boot/bootloader/stm32wb-dfu/src/main.rs
@@ -67,17 +67,24 @@ fn main() -> ! {
 
         // We add MSOS headers so that the device automatically gets assigned the WinUSB driver on Windows.
         // Otherwise users need to do this manually using a tool like Zadig.
-        //
-        // It seems it is important for the DFU class that these headers be on the Device level.
-        //
         builder.msos_descriptor(msos::windows_version::WIN8_1, 2);
+
+        // In the case of non-composite devices, it seems that feature headers need to be on the device level.
+        // (As is implemented here)
+        //
+        // For composite devices however, they should be on the function level instead.
+        // (This is achieved by passing a GUID to the "usb_dfu" function)
         builder.msos_feature(msos::CompatibleIdFeatureDescriptor::new("WINUSB", ""));
         builder.msos_feature(msos::RegistryPropertyFeatureDescriptor::new(
             "DeviceInterfaceGUIDs",
             msos::PropertyData::RegMultiSz(DEVICE_INTERFACE_GUIDS),
         ));
 
-        usb_dfu::<_, _, _, _, 4096>(&mut builder, &mut state);
+        // For non-composite devices:
+        usb_dfu::<_, _, _, _, 4096>(&mut builder, &mut state, None);
+
+        // Or for composite devices:
+        // usb_dfu::<_, _, _, _, 4096>(&mut builder, &mut state, Some(DEVICE_INTERFACE_GUIDS));
 
         let mut dev = builder.build();
         embassy_futures::block_on(dev.run());
-- 
cgit