Fix CI

google · Aug 9, 2024 · 1959942 · 1959942
1 parent 78dc509
commit 1959942
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 316 deletions.
diff --git a/crates/api-desc/src/usb.rs b/crates/api-desc/src/usb.rs
@@ -17,9 +17,6 @@ use crate::*;
 #[cfg(feature = "api-usb-serial")]
 mod serial;
 
-#[cfg(feature = "api-usb-ctap")]
-mod ctap;
-
 pub(crate) fn new() -> Item {
     let docs = docs! {
         /// USB operations.
@@ -28,8 +25,6 @@ pub(crate) fn new() -> Item {
     let items = vec![
         #[cfg(feature = "api-usb-serial")]
         serial::new(),
-        #[cfg(feature = "api-usb-ctap")]
-        ctap::new(),
     ];
     Item::Mod(Mod { docs, name, items })
 }
diff --git a/crates/prelude/Cargo.toml b/crates/prelude/Cargo.toml
@@ -24,7 +24,6 @@ digest = { version = "0.10.7", default-features = false, features = ["mac"], opt
 rlsf = { version = "0.2.1", default-features = false, optional = true }
 sealed = { version = "0.5.0", default-features = false, optional = true }
 typenum = { version = "1.17.0", default-features = false, optional = true }
-usbd-ctaphid = "0.1.0"
 wasefire-applet-api = { version = "0.6.1", path = "../api", features = ["wasm"] }
 wasefire-error = { version = "0.1.1", path = "../error" }
 wasefire-sync = { version = "0.1.1", path = "../sync" }

diff --git a/crates/runner-host/Cargo.toml b/crates/runner-host/Cargo.toml
@@ -53,7 +53,6 @@ usb = [
   "dep:usbip-device",
   "dep:wasefire-protocol-usb",
   "wasefire-scheduler/board-api-platform-protocol",
-  "wasefire-scheduler/board-api-usb-ctap",
   "wasefire-scheduler/board-api-usb-serial",
 ]
 web = ["dep:web-server"]

diff --git a/crates/runner-nordic/Cargo.toml b/crates/runner-nordic/Cargo.toml
@@ -57,7 +57,6 @@ features = [
   "board-api-storage",
   "board-api-timer",
   "board-api-uart",
-  "board-api-usb-ctap",
   "board-api-usb-serial",
 ]
 

diff --git a/crates/scheduler/Cargo.toml b/crates/scheduler/Cargo.toml
@@ -84,7 +84,6 @@ applet-api-store = ["internal-applet-api-store", "wasefire-applet-api/api-store"
 applet-api-store-fragment = ["internal-applet-api-store", "wasefire-applet-api/api-store-fragment"]
 applet-api-timer = ["wasefire-applet-api/api-timer"]
 applet-api-uart = ["wasefire-applet-api/api-uart"]
-applet-api-usb-ctap = ["internal-applet-api-usb", "wasefire-applet-api/api-usb-ctap"]
 applet-api-usb-serial = ["internal-applet-api-usb", "wasefire-applet-api/api-usb-serial"]
 # Board API features. Enabling a board API feature automatically enables all
 # applet API features that would be implemented.
@@ -154,11 +153,6 @@ board-api-storage = [
 ]
 board-api-timer = ["applet-api-timer", "wasefire-board-api/api-timer"]
 board-api-uart = ["applet-api-uart", "wasefire-board-api/api-uart"]
-board-api-usb-ctap = [
-  "applet-api-usb-ctap",
-  "internal-board-api-usb",
-  "wasefire-board-api/api-usb-ctap",
-]
 board-api-usb-serial = [
   "applet-api-usb-serial",
   "internal-board-api-usb",
@@ -186,7 +180,6 @@ full-applet-api = [
   "applet-api-store-fragment",
   "applet-api-timer",
   "applet-api-uart",
-  "applet-api-usb-ctap",
   "applet-api-usb-serial",
 ]
 # Enables all board API features (unstable).
@@ -210,7 +203,6 @@ full-board-api = [
   "board-api-storage",
   "board-api-timer",
   "board-api-uart",
-  "board-api-usb-ctap",
   "board-api-usb-serial",
 ]
 # Software crypto features. Enabling a software crypto feature automatically

diff --git a/crates/scheduler/src/call/usb.rs b/crates/scheduler/src/call/usb.rs
@@ -19,14 +19,10 @@ use crate::DispatchSchedulerCall;
 
 #[cfg(feature = "applet-api-usb-ctap")]
 mod ctap;
-#[cfg(feature = "applet-api-usb-serial")]
-mod serial;
 
 pub fn process<B: Board>(call: Api<DispatchSchedulerCall<B>>) {
     match call {
         #[cfg(feature = "applet-api-usb-serial")]
         Api::Serial(call) => serial::process(call),
-        #[cfg(feature = "applet-api-usb-ctap")]
-        Api::Ctap(call) => ctap::process(call),
     }
 }