Skip to content

Add usb-device v0.3 behind feature flag #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daringer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add usb-device v0.3 behind feature flag #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,18 @@ delog = "0.1.0"
heapless-bytes = "0.5"
interchange = "0.3.0"
serde = { version = "1.0", default-features = false }
usb-device = "0.2.3"
# Selects the usb-device version; see the `usb_device` alias in src/lib.rs.
usb-device-0-2 = { package = "usb-device", version = "0.2.3", optional = true }
usb-device-0-3 = { package = "usb-device", version = "0.3.2", optional = true }
ref-swap = "0.1.2"
trussed-core = "0.2"


[features]
default = []
default = ["usb-device-0-2"]

"usb-device-0-2" = ["dep:usb-device-0-2"]
"usb-device-0-3" = ["dep:usb-device-0-3"]

log-all = []
log-none = []
Expand Down
4 changes: 2 additions & 2 deletions src/class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ use crate::{
types::Status,
};

use ctaphid_dispatch::Requester;
use usb_device::{
use crate::usb_device::{
bus::{InterfaceNumber, UsbBus, UsbBusAllocator},
class::{ControlIn, ControlOut, UsbClass},
control,
descriptor::DescriptorWriter,
endpoint::{EndpointAddress, EndpointIn, EndpointOut},
Result as UsbResult,
};
use ctaphid_dispatch::Requester;

/// Packet-level implementation of the CTAPHID protocol.
pub struct CtapHid<'alloc, 'pipe, 'interrupt, Bus: UsbBus, const N: usize> {
Expand Down
9 changes: 9 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ See "proposed standard":
extern crate delog;
generate_macros!();

#[cfg(all(feature = "usb-device-0-2", not(feature = "usb-device-0-3")))]
pub use usb_device_0_2 as usb_device;
/// The selected `usb-device` version; 0.3 wins if both features are enabled.
#[cfg(feature = "usb-device-0-3")]
pub use usb_device_0_3 as usb_device;

#[cfg(not(any(feature = "usb-device-0-2", feature = "usb-device-0-3")))]

@sosthene-nitrokey sosthene-nitrokey Jul 30, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as ccid we should just do a major version bump

compile_error!("No usb-device version chosen! Enable `usb-device-0-2` or `usb-device-0-3`.");

// use heapless_bytes as bytes;

// pub mod authenticator;
Expand Down
2 changes: 1 addition & 1 deletion src/pipe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use heapless_bytes::Bytes;
use ref_swap::OptionRefSwap;
use trussed_core::InterruptFlag;
// use serde::Serialize;
use usb_device::{
use crate::usb_device::{
bus::UsbBus,
endpoint::{EndpointAddress, EndpointIn, EndpointOut},
UsbError,
Expand Down