From 92e501ec01cc90161092324a1d3a55272a67d641 Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Thu, 1 Feb 2024 13:41:49 +0800
Subject: [PATCH] harmonize around a single xous-usb-hid spec

otherwise we get weird conflicts on builds
---
 Cargo.lock                   | 20 +++-----------------
 apps/vault/Cargo.toml        |  2 +-
 services/usb-test/Cargo.toml |  4 ++--
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9131dc65a..10488ead8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5354,7 +5354,7 @@ dependencies = [
  "xous-api-ticktimer",
  "xous-ipc 0.9.57 (registry+https://github.com/rust-lang/crates.io-index)",
  "xous-semver",
- "xous-usb-hid 0.4.3 (git+https://github.com/betrusted-io/xous-usb-hid.git?branch=main)",
+ "xous-usb-hid",
 ]
 
 [[package]]
@@ -5377,7 +5377,7 @@ dependencies = [
  "xous-api-names",
  "xous-api-susres",
  "xous-api-ticktimer",
- "xous-usb-hid 0.4.3 (git+https://github.com/betrusted-io/xous-usb-hid.git)",
+ "xous-usb-hid",
 ]
 
 [[package]]
@@ -5560,7 +5560,7 @@ dependencies = [
  "xous-api-susres",
  "xous-api-ticktimer",
  "xous-ipc 0.9.57 (registry+https://github.com/rust-lang/crates.io-index)",
- "xous-usb-hid 0.4.3 (git+https://github.com/betrusted-io/xous-usb-hid.git)",
+ "xous-usb-hid",
 ]
 
 [[package]]
@@ -6351,20 +6351,6 @@ dependencies = [
  "usb-device",
 ]
 
-[[package]]
-name = "xous-usb-hid"
-version = "0.4.3"
-source = "git+https://github.com/betrusted-io/xous-usb-hid.git#eba35e886d08e504cf10026221aec0fbfc63e201"
-dependencies = [
- "frunk",
- "fugit",
- "heapless 0.7.16",
- "num_enum 0.6.1",
- "option-block",
- "packed_struct",
- "usb-device",
-]
-
 [[package]]
 name = "xtask"
 version = "0.1.0"
diff --git a/apps/vault/Cargo.toml b/apps/vault/Cargo.toml
index 898488659..0619c8642 100644
--- a/apps/vault/Cargo.toml
+++ b/apps/vault/Cargo.toml
@@ -19,7 +19,7 @@ graphics-server = { path = "../../services/graphics-server" }
 locales = { path = "../../locales" }
 tts-frontend = { path = "../../services/tts" }
 usb-device-xous = { path = "../../services/usb-device-xous" }
-xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git" }
+xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git", branch = "main" }
 pddb = { path = "../../services/pddb" }
 modals = { path = "../../services/modals" }
 trng = { path = "../../services/trng" }
diff --git a/services/usb-test/Cargo.toml b/services/usb-test/Cargo.toml
index c4bccf8ed..ef8581779 100644
--- a/services/usb-test/Cargo.toml
+++ b/services/usb-test/Cargo.toml
@@ -20,8 +20,8 @@ bitfield = "0.13.2"
 vcell = "0.1.3"
 utralib = { version = "0.1.24", optional = true, default-features = false }
 
-xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git" }
-embedded-time = "0.12.1"                                                    # required by the keyboard interface
+xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git", branch = "main" }
+embedded-time = "0.12.1"                                                                     # required by the keyboard interface
 
 [dependencies.usb-device]
 # see top level Cargo.toml for patch.crates-io directive to help with dev work