Update usb-device (#718)

* Update usb-device to 0.3.1 The usb-device upgrade is a breaking change for both usb-device and our HAL. This commit updates our tier 1 BSPs only. * Roll back HAL version bump
atsamd-rs · Feb 1, 2024 · d46b635 · d46b635
1 parent 49e0bcc
commit d46b635
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 34 deletions.
diff --git a/boards/atsame54_xpro/Cargo.toml b/boards/atsame54_xpro/Cargo.toml
@@ -27,7 +27,7 @@ version = "0.16.0"
 default-features = false
 
 [dependencies.usb-device]
-version = "0.2"
+version = "0.3.1"
 optional = true
 
 [dev-dependencies]

diff --git a/boards/feather_m0/Cargo.toml b/boards/feather_m0/Cargo.toml
@@ -29,7 +29,7 @@ version = "0.7"
 features = ["critical-section-single-core"]
 
 [dependencies.usb-device]
-version = "0.2"
+version = "0.3.1"
 optional = true
 
 [dependencies.embedded-sdmmc]
@@ -39,7 +39,7 @@ optional = true
 [dev-dependencies]
 cortex-m-rtic = "1.0"
 cortex-m = "0.7"
-usbd-serial = "0.1"
+usbd-serial = "0.2"
 cortex-m-semihosting = "0.3"
 ssd1306 = "0.7"
 embedded-graphics = "0.7.1"

diff --git a/boards/feather_m0/examples/usb_echo.rs b/boards/feather_m0/examples/usb_echo.rs
@@ -50,9 +50,11 @@ fn main() -> ! {
         USB_SERIAL = Some(SerialPort::new(bus_allocator));
         USB_BUS = Some(
             UsbDeviceBuilder::new(bus_allocator, UsbVidPid(0x16c0, 0x27dd))
-                .manufacturer("Fake company")
-                .product("Serial port")
-                .serial_number("TEST")
+                .strings(&[StringDescriptors::new(LangID::EN)
+                    .manufacturer("Fake company")
+                    .product("Serial port")
+                    .serial_number("TEST")])
+                .expect("Failed to set strings")
                 .device_class(USB_CLASS_CDC)
                 .build(),
         );

diff --git a/boards/feather_m4/Cargo.toml b/boards/feather_m4/Cargo.toml
@@ -29,11 +29,11 @@ version = "0.16.0"
 default-features = false
 
 [dependencies.usb-device]
-version = "0.2"
+version = "0.3.1"
 optional = true
 
 [dev-dependencies]
-usbd-serial = "0.1"
+usbd-serial = "0.2"
 cortex-m-rtic = "0.6.0-rc.2"
 panic-halt = "0.2"
 panic-semihosting = "0.5"

diff --git a/boards/feather_m4/examples/nvm_dsu.rs b/boards/feather_m4/examples/nvm_dsu.rs
@@ -59,9 +59,11 @@ fn main() -> ! {
         USB_SERIAL = Some(SerialPort::new(bus_allocator));
         USB_BUS = Some(
             UsbDeviceBuilder::new(bus_allocator, UsbVidPid(0x16c0, 0x27dd))
-                .manufacturer("Fake company")
-                .product("Serial port")
-                .serial_number("TEST")
+                .strings(&[StringDescriptors::new(LangID::EN)
+                    .manufacturer("Fake company")
+                    .product("Serial port")
+                    .serial_number("TEST")])
+                .expect("Failed to set strings")
                 .device_class(USB_CLASS_CDC)
                 .build(),
         );

diff --git a/boards/feather_m4/examples/pukcc_test.rs b/boards/feather_m4/examples/pukcc_test.rs
@@ -53,9 +53,11 @@ fn main() -> ! {
         USB_SERIAL = Some(SerialPort::new(bus_allocator));
         USB_BUS = Some(
             UsbDeviceBuilder::new(bus_allocator, UsbVidPid(0x16c0, 0x27dd))
-                .manufacturer("Fake company")
-                .product("Serial port")
-                .serial_number("TEST")
+                .strings(&[StringDescriptors::new(LangID::EN)
+                    .manufacturer("Fake company")
+                    .product("Serial port")
+                    .serial_number("TEST")])
+                .expect("Failed to set strings")
                 .device_class(USB_CLASS_CDC)
                 .build(),
         );

diff --git a/boards/feather_m4/examples/smart_eeprom.rs b/boards/feather_m4/examples/smart_eeprom.rs
@@ -57,9 +57,11 @@ fn main() -> ! {
         USB_SERIAL = Some(SerialPort::new(bus_allocator));
         USB_BUS = Some(
             UsbDeviceBuilder::new(bus_allocator, UsbVidPid(0x16c0, 0x27dd))
-                .manufacturer("Fake company")
-                .product("Serial port")
-                .serial_number("TEST")
+                .strings(&[StringDescriptors::new(LangID::EN)
+                    .manufacturer("Fake company")
+                    .product("Serial port")
+                    .serial_number("TEST")])
+                .expect("Failed to set strings")
                 .device_class(USB_CLASS_CDC)
                 .build(),
         );

diff --git a/boards/feather_m4/examples/usb_echo.rs b/boards/feather_m4/examples/usb_echo.rs
@@ -51,9 +51,11 @@ fn main() -> ! {
         USB_SERIAL = Some(SerialPort::new(bus_allocator));
         USB_BUS = Some(
             UsbDeviceBuilder::new(bus_allocator, UsbVidPid(0x16c0, 0x27dd))
-                .manufacturer("Fake company")
-                .product("Serial port")
-                .serial_number("TEST")
+                .strings(&[StringDescriptors::new(LangID::EN)
+                    .manufacturer("Fake company")
+                    .product("Serial port")
+                    .serial_number("TEST")])
+                .expect("Failed to set strings")
                 .device_class(USB_CLASS_CDC)
                 .build(),
         );
@@ -70,7 +72,9 @@ fn main() -> ! {
 
     loop {
         cycle_delay(5 * 1024 * 1024);
-        red_led.toggle().unwrap();
+        red_led.set_high().unwrap();
+        cycle_delay(5 * 1024 * 1024);
+        red_led.set_low().unwrap();
     }
 }
 

diff --git a/boards/metro_m0/Cargo.toml b/boards/metro_m0/Cargo.toml
@@ -28,12 +28,12 @@ version = "0.16.0"
 default-features = false
 
 [dependencies.usb-device]
-version = "0.2"
+version = "0.3.1"
 optional = true
 
 [dev-dependencies]
 cortex-m = "0.7"
-usbd-serial = "0.1"
+usbd-serial = "0.2"
 panic-halt = "0.2"
 panic-semihosting = "0.5"
 cortex-m-rtic = "1.0"

diff --git a/boards/metro_m0/examples/usb_echo.rs b/boards/metro_m0/examples/usb_echo.rs
@@ -47,9 +47,11 @@ fn main() -> ! {
         USB_SERIAL = Some(SerialPort::new(bus_allocator));
         USB_BUS = Some(
             UsbDeviceBuilder::new(bus_allocator, UsbVidPid(0x16c0, 0x27dd))
-                .manufacturer("Fake company")
-                .product("Serial port")
-                .serial_number("TEST")
+                .strings(&[StringDescriptors::new(LangID::EN)
+                    .manufacturer("Fake company")
+                    .product("Serial port")
+                    .serial_number("TEST")])
+                .expect("Failed to set strings")
                 .device_class(USB_CLASS_CDC)
                 .build(),
         );

diff --git a/boards/metro_m4/Cargo.toml b/boards/metro_m4/Cargo.toml
@@ -24,7 +24,7 @@ version = "0.16.0"
 default-features = false
 
 [dependencies.usb-device]
-version = "0.2"
+version = "0.3.1"
 optional = true
 
 [dependencies.cortex-m]
@@ -33,7 +33,7 @@ features = ["critical-section-single-core"]
 
 [dev-dependencies]
 cortex-m = "0.7"
-usbd-serial = "0.1"
+usbd-serial = "0.2"
 panic-probe = "0.3"
 panic-halt = "0.2"
 panic-semihosting = "0.5"

diff --git a/boards/metro_m4/examples/usb_logging.rs b/boards/metro_m4/examples/usb_logging.rs
@@ -54,9 +54,11 @@ fn main() -> ! {
         USB_SERIAL = Some(SerialPort::new(bus_allocator));
         USB_BUS = Some(
             UsbDeviceBuilder::new(bus_allocator, UsbVidPid(0x2222, 0x3333))
-                .manufacturer("Fake company")
-                .product("Serial port")
-                .serial_number("TEST")
+                .strings(&[StringDescriptors::new(LangID::EN)
+                    .manufacturer("Fake company")
+                    .product("Serial port")
+                    .serial_number("TEST")])
+                .expect("Failed to set strings")
                 .device_class(USB_CLASS_CDC)
                 .build(),
         );

diff --git a/hal/CHANGELOG.md b/hal/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Update README.md - moves some content to wiki
 - Remove pin `pa28` from the `d21el` target (#717)
 - Fix a pwm configuration for the `tc4` on `D5x` targets (#720)
+- Update to usb-device 0.3.1
 
 # v0.16.0
 

diff --git a/hal/Cargo.toml b/hal/Cargo.toml
@@ -56,7 +56,7 @@ embedded-sdmmc = {version = "0.3", optional = true}
 jlink_rtt = {version = "0.2", optional = true}
 mcan-core = {version = "0.2", optional = true}
 rtic-monotonic = {version = "1.0", optional = true}
-usb-device = {version = "0.2", optional = true}
+usb-device = {version = "0.3.1", optional = true}
 defmt = {version = "0.3.4", optional = true}
 
 #===============================================================================

diff --git a/hal/src/thumbv6m/usb/bus.rs b/hal/src/thumbv6m/usb/bus.rs
@@ -40,7 +40,7 @@ impl From<EndpointType> for EndpointTypeBits {
     fn from(ep_type: EndpointType) -> EndpointTypeBits {
         match ep_type {
             EndpointType::Control => EndpointTypeBits::Control,
-            EndpointType::Isochronous => EndpointTypeBits::Isochronous,
+            EndpointType::Isochronous { .. } => EndpointTypeBits::Isochronous,
             EndpointType::Bulk => EndpointTypeBits::Bulk,
             EndpointType::Interrupt => EndpointTypeBits::Interrupt,
         }

diff --git a/hal/src/thumbv7em/usb/bus.rs b/hal/src/thumbv7em/usb/bus.rs
@@ -40,7 +40,7 @@ impl From<EndpointType> for EndpointTypeBits {
     fn from(ep_type: EndpointType) -> EndpointTypeBits {
         match ep_type {
             EndpointType::Control => EndpointTypeBits::Control,
-            EndpointType::Isochronous => EndpointTypeBits::Isochronous,
+            EndpointType::Isochronous { .. } => EndpointTypeBits::Isochronous,
             EndpointType::Bulk => EndpointTypeBits::Bulk,
             EndpointType::Interrupt => EndpointTypeBits::Interrupt,
         }