diff --git a/Cargo.toml b/Cargo.toml index ff33518..b922306 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ description = "usb-device driver for CTAPHID" categories = ["embedded", "no-std"] [dependencies] -ctaphid-dispatch = "0.1.0" +ctaphid-dispatch = "0.2" embedded-time = "0.12" delog = "0.1.0" heapless-bytes = "0.3" @@ -18,7 +18,7 @@ interchange = "0.3.0" serde = { version = "1.0", default-features = false } usb-device = "0.2.3" ref-swap = "0.1.2" -trussed-core = "0.1.0-rc.1" +trussed-core = "0.1" [features] @@ -32,4 +32,5 @@ log-warn = [] log-error = [] [patch.crates-io] -ctaphid-dispatch = { git = "https://github.com/trussed-dev/ctaphid-dispatch.git", rev = "5a2864c76fea6785d9ffe4c7b6596237d8378755" } +ctaphid-app = { git = "https://github.com/trussed-dev/ctaphid-dispatch.git", branch = "release-dispatch-v0.2.0" } +ctaphid-dispatch = { git = "https://github.com/trussed-dev/ctaphid-dispatch.git", branch = "release-dispatch-v0.2.0" } diff --git a/src/class.rs b/src/class.rs index 1809dd7..54af77f 100644 --- a/src/class.rs +++ b/src/class.rs @@ -11,7 +11,7 @@ use crate::{ types::Status, }; -use ctaphid_dispatch::types::Requester; +use ctaphid_dispatch::Requester; use usb_device::{ bus::{InterfaceNumber, UsbBus, UsbBusAllocator}, class::{ControlIn, ControlOut, UsbClass}, diff --git a/src/pipe.rs b/src/pipe.rs index 69547aa..0ed7361 100644 --- a/src/pipe.rs +++ b/src/pipe.rs @@ -18,8 +18,7 @@ use core::sync::atomic::Ordering; // pub type ContactInterchange = usbd_ccid::types::ApduInterchange; // pub type ContactlessInterchange = iso14443::types::ApduInterchange; -use ctaphid_dispatch::command::Command; -use ctaphid_dispatch::types::Requester; +use ctaphid_dispatch::{app::Command, Requester}; use heapless_bytes::Bytes; use ref_swap::OptionRefSwap; use trussed_core::InterruptFlag; @@ -98,7 +97,7 @@ impl Response { pub fn error_on_channel(channel: u32) -> Self { Self { channel, - command: ctaphid_dispatch::command::Command::Error, + command: ctaphid_dispatch::app::Command::Error, length: 1, } }