From 079d2a89b922a0466d50a9c8597a47b1f0a12af4 Mon Sep 17 00:00:00 2001 From: Markus Meissner Date: Thu, 20 Aug 2026 11:50:47 +0200 Subject: [PATCH 1/2] Bump usb-device to v0.3 --- CHANGELOG.md | 6 +++++- Cargo.lock | 36 ++++++++++++++++++++++++++++-------- Cargo.toml | 8 ++++---- src/lib.rs | 18 +++++++++++++----- 4 files changed, 50 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87d3961..1229fcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ ## Unreleased -- +- Update dependencies: + - `usb-device` v0.3 + - `usbip-device` v0.2 + - `usbd-ctaphid` v0.5 + - `usbd-ccid` v0.5 [All Changes](https://github.com/trussed-dev/pc-usbip-runner/compare/v0.1.0...HEAD) diff --git a/Cargo.lock b/Cargo.lock index 1851c6f..bd4bef0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -624,6 +624,16 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32 0.3.1", + "stable_deref_trait", +] + [[package]] name = "heapless" version = "0.9.1" @@ -999,6 +1009,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" + [[package]] name = "postcard" version = "0.7.3" @@ -1573,15 +1589,19 @@ dependencies = [ [[package]] name = "usb-device" -version = "0.2.9" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6cc3adc849b5292b4075fc0d5fdcf2f24866e88e336dd27a8943090a520508" +checksum = "98816b1accafbb09085168b90f27e93d790b4bfa19d883466b5e53315b5f06a6" +dependencies = [ + "heapless 0.8.0", + "portable-atomic", +] [[package]] name = "usbd-ccid" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acbc8d41fe1b6dc92347f5988a44252fc9e2511f7cb312fa23e9eee186bfdd3" +checksum = "58fb96f99caab23718dbb9ef7aaea53e5f890fafe0e4af802c78e7b91fc95c46" dependencies = [ "delog", "embedded-time", @@ -1592,9 +1612,9 @@ dependencies = [ [[package]] name = "usbd-ctaphid" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c527a4840bcb38299924c7a6b0c31f95a89172bdfb4577c515315ce9b097f15a" +checksum = "35793a1b9c6ae908defdef01fab01a4192e5415ca0609b56c778e5751cf64adb" dependencies = [ "ctaphid-dispatch", "delog", @@ -1609,9 +1629,9 @@ dependencies = [ [[package]] name = "usbip-device" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7a0b57d68d666cc85d8bfe8a32fb4196e8eb89b611658a0624af6428e7a2fd" +checksum = "6b2d89f80e9ecc1c37503b9c67be21f5c16d5205b2a6134470f67668207140aa" dependencies = [ "bitflags 1.3.2", "log", diff --git a/Cargo.toml b/Cargo.toml index 538981d..627f753 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,16 +14,16 @@ log = { version = "0.4.14", default-features = false } rand_chacha = { version = "0.3", default-features = false } rand_core = { version = "0.6", features = ["getrandom"] } trussed = { version = "0.2", default-features = false, features = ["log-all", "virt"] } -usb-device = { version = "0.2.7", default-features = false } -usbip-device = "0.1.5" +usb-device = { version = "0.3.2", default-features = false } +usbip-device = "0.2" # ctaphid ctaphid-dispatch = { version = "0.4", features = ["log-all"], optional = true } -usbd-ctaphid = { version = "0.4", features = ["log-all"], optional = true } +usbd-ctaphid = { version = "0.5", features = ["log-all"], optional = true } # ccid apdu-dispatch = { version = "0.4", optional = true } -usbd-ccid = { version = "0.4", features = ["log-all"], optional = true } +usbd-ccid = { version = "0.5", features = ["log-all"], optional = true } [dev-dependencies] clap = { version = "3.0.0", features = ["derive"] } diff --git a/src/lib.rs b/src/lib.rs index b61622c..fc94c29 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -273,17 +273,25 @@ fn build_device<'a, B: UsbBus>( bus_allocator: &'a UsbBusAllocator, options: &'a Options, ) -> UsbDevice<'a, B> { - let mut usb_builder = UsbDeviceBuilder::new(bus_allocator, options.vid_pid()); + use usb_device::prelude::{LangID, StringDescriptors}; + + let mut strings = StringDescriptors::new(LangID::EN); if let Some(manufacturer) = &options.manufacturer { - usb_builder = usb_builder.manufacturer(manufacturer); + strings = strings.manufacturer(manufacturer); } if let Some(product) = &options.product { - usb_builder = usb_builder.product(product); + strings = strings.product(product); } if let Some(serial_number) = &options.serial_number { - usb_builder = usb_builder.serial_number(serial_number); + strings = strings.serial_number(serial_number); } - usb_builder.device_class(0x03).device_sub_class(0).build() + + UsbDeviceBuilder::new(bus_allocator, options.vid_pid()) + .strings(&[strings]) + .expect("failed to set USB string descriptors") + .device_class(0x03) + .device_sub_class(0) + .build() } #[derive(Default)] From 82776c7e0a95f7d2c518ab11508d014b6916645c Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Wed, 9 Sep 2026 15:45:57 +0200 Subject: [PATCH 2/2] Release v0.2.0 --- CHANGELOG.md | 8 +++++++- Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1229fcc..0e67de2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,19 @@ ## Unreleased +- + +[All Changes](https://github.com/trussed-dev/pc-usbip-runner/compare/v0.2.0...HEAD) + +## [v0.2.0](https://github.com/trussed-dev/pc-usbip-runner/releases/tag/v0.2.0) (2026-09-09) + - Update dependencies: - `usb-device` v0.3 - `usbip-device` v0.2 - `usbd-ctaphid` v0.5 - `usbd-ccid` v0.5 -[All Changes](https://github.com/trussed-dev/pc-usbip-runner/compare/v0.1.0...HEAD) +[All Changes](https://github.com/trussed-dev/pc-usbip-runner/compare/v0.1.0...v0.2.0) ## [v0.1.0](https://github.com/trussed-dev/pc-usbip-runner/releases/tag/v0.1.0) (2026-06-22) diff --git a/Cargo.lock b/Cargo.lock index bd4bef0..9b3d02a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,7 +1536,7 @@ dependencies = [ [[package]] name = "trussed-usbip" -version = "0.1.0" +version = "0.2.0" dependencies = [ "apdu-dispatch", "clap", diff --git a/Cargo.toml b/Cargo.toml index 627f753..03d879a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trussed-usbip" -version = "0.1.0" +version = "0.2.0" description = "USBIP runner for trussed applications" authors = ["The Trussed developers", "Nicolas Stalder ", "Conor Patrick ", "Szczepan Zalega "] repository = "https://github.com/trussed-dev/pc-usbip-runner"