convert usbd-human-interface-device to xous-usb-hid

This commit is contained in:
bunnie 2023-11-16 17:27:00 +08:00
parent 498b898964
commit 367ede62b1
13 changed files with 41 additions and 43 deletions

35
Cargo.lock generated
View file

@ -5254,7 +5254,6 @@ dependencies = [
"rkyv",
"trng",
"usb-device",
"usbd-human-interface-device",
"usbd-serial",
"usbd_mass_storage 0.1.0",
"usbd_scsi 0.1.1",
@ -5267,6 +5266,7 @@ dependencies = [
"xous-api-ticktimer",
"xous-ipc 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
"xous-usb-hid",
]
[[package]]
@ -5282,7 +5282,6 @@ dependencies = [
"rand 0.8.5",
"rand_chacha 0.3.1",
"usb-device",
"usbd-human-interface-device",
"utralib",
"vcell",
"xous 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
@ -5290,21 +5289,7 @@ dependencies = [
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
]
[[package]]
name = "usbd-human-interface-device"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "809d98d59a6fccbdcf27026101e9a753c5a98d66898061eee7dd8bfd4eff1d03"
dependencies = [
"frunk",
"fugit",
"heapless 0.7.16",
"num_enum 0.6.1",
"option-block",
"packed_struct",
"usb-device",
"xous-usb-hid",
]
[[package]]
@ -5479,7 +5464,6 @@ dependencies = [
"trng",
"tts-frontend",
"usb-device-xous",
"usbd-human-interface-device",
"userprefs",
"utralib",
"xous 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
@ -5488,6 +5472,7 @@ dependencies = [
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-usb-hid",
]
[[package]]
@ -6261,6 +6246,20 @@ dependencies = [
"xous-ipc 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[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"

View file

@ -151,8 +151,6 @@ git="https://github.com/betrusted-io/usb-device.git"
branch="main"
# local dev shortcuts
#path = "../usb-device"
#[patch.crates-io.usbd-human-interface-device]
#path = "../usbd-human-interface-device"
[patch.crates-io.getrandom]
path = "imports/getrandom"

View file

@ -418,6 +418,7 @@ perform the Xous firmware upgrade. This requires running manual update commands,
- sigchat skeleton added thanks to @nhoj
- usbd-human-interface-device bumped to latest in preparation for a fork
- Fix #446 - add support for numeric-only passwords in `vault`
- Fork usbd-human-interface-device to xous-usb-hid
## Roadmap
- Lots of testing and bug fixes

View file

@ -17,7 +17,7 @@ graphics-server = {path = "../../services/graphics-server" }
locales = {path = "../../locales"}
tts-frontend = {path="../../services/tts"}
usb-device-xous = {path="../../services/usb-device-xous"}
usbd-human-interface-device = "0.4.3"
xous-usb-hid = {git = "https://github.com/betrusted-io/xous-usb-hid.git"}
pddb = {path = "../../services/pddb" }
modals = {path = "../../services/modals" }
trng = {path="../../services/trng"}

View file

@ -16,7 +16,7 @@ use ctap_crypto::rng256::XousRng256;
use xous::try_send_message;
use xous_names::XousNames;
use crate::env::xous::storage::XousUpgradeStorage;
use usbd_human_interface_device::device::fido::*;
use xous_usb_hid::device::fido::*;
use modals::Modals;
use locales::t;
use std::io::{Read, Write};

View file

@ -29,7 +29,7 @@ use crate::vendor_commands::VendorSession;
use ux::framework::{VaultUx, DEFAULT_FONT, FONT_LIST, name_to_style};
use xous_ipc::Buffer;
use xous::{send_message, Message, msg_blocking_scalar_unpack, msg_scalar_unpack};
use usbd_human_interface_device::device::fido::*;
use xous_usb_hid::device::fido::*;
use num_traits::*;
use std::thread;

View file

@ -26,10 +26,10 @@ xous-semver = "0.1.2"
utralib = { version = "0.1.23", optional = true, default-features = false }
trng = {path="../trng"}
usbd-human-interface-device = "0.4.3"
xous-usb-hid = {git = "https://github.com/betrusted-io/xous-usb-hid.git"}
embedded-time = "0.12.1" # required by the keyboard interface
packed_struct = { version = "0.10", default-features = false } # used by the usbd-human-interface-device crate
num_enum = { version = "0.5", default-features = false } # used by the usbd-human-interface-device crate
packed_struct = { version = "0.10", default-features = false } # used by the xous-usb-hid crate
num_enum = { version = "0.5", default-features = false } # used by the xous-usb-hid crate
# Mass storage support
usbd_scsi = { path = "../../libs/mass-storage/usbd_scsi", optional = true }

View file

@ -6,11 +6,11 @@ use trng::api::TrngTestMode;
use xous::{CID, send_message, Message};
use num_traits::*;
pub use usb_device::device::UsbDeviceState;
pub use usbd_human_interface_device::device::keyboard::KeyboardLedsReport;
pub use usbd_human_interface_device::page::Keyboard as UsbKeyCode;
pub use xous_usb_hid::device::keyboard::KeyboardLedsReport;
pub use xous_usb_hid::page::Keyboard as UsbKeyCode;
use packed_struct::PackedStruct;
use xous_ipc::Buffer;
pub use usbd_human_interface_device::device::fido::RawFidoReport;
pub use xous_usb_hid::device::fido::RawFidoReport;
#[derive(Debug)]
pub struct UsbHid {

View file

@ -1,7 +1,7 @@
use crate::*;
use num_traits::*;
use usbd_human_interface_device::device::fido::RawFidoReport;
use xous_usb_hid::device::fido::RawFidoReport;
use xous::{msg_scalar_unpack, msg_blocking_scalar_unpack};
use xous_semver::SemVer;
use core::num::NonZeroU8;

View file

@ -3,10 +3,10 @@ use crate::*;
use num_traits::*;
use usb_device_xous::KeyboardLedsReport;
use usb_device_xous::UsbDeviceType;
use usbd_human_interface_device::device::fido::RawFidoReport;
use usbd_human_interface_device::device::fido::RawFidoConfig;
use usbd_human_interface_device::device::fido::RawFido;
use usbd_human_interface_device::device::DeviceClass;
use xous_usb_hid::device::fido::RawFidoReport;
use xous_usb_hid::device::fido::RawFidoConfig;
use xous_usb_hid::device::fido::RawFido;
use xous_usb_hid::device::DeviceClass;
use xous::{msg_scalar_unpack, msg_blocking_scalar_unpack};
#[cfg(not(feature="minimal"))]
use xous_semver::SemVer;
@ -17,9 +17,9 @@ use utralib::generated::*;
use usb_device::prelude::*;
use usb_device::class_prelude::*;
use usbd_human_interface_device::page::Keyboard;
use usbd_human_interface_device::device::keyboard::{NKROBootKeyboard, NKROBootKeyboardConfig};
use usbd_human_interface_device::prelude::*;
use xous_usb_hid::page::Keyboard;
use xous_usb_hid::device::keyboard::{NKROBootKeyboard, NKROBootKeyboardConfig};
use xous_usb_hid::prelude::*;
use std::convert::TryInto;
#[cfg(not(feature="minimal"))]

View file

@ -1,5 +1,5 @@
#![allow(dead_code)]
pub use usbd_human_interface_device::page::Keyboard as UsbKeyCode;
pub use xous_usb_hid::page::Keyboard as UsbKeyCode;
#[cfg(any(feature="precursor", feature="renode"))]
pub fn char_to_hid_code_us101(key: char) -> Vec<UsbKeyCode> {

View file

@ -20,7 +20,7 @@ bitfield = "0.13.2"
vcell = "0.1.3"
utralib = { version = "0.1.23", optional = true, default-features = false }
usbd-human-interface-device = "0.4.3"
xous-usb-hid = {git = "https://github.com/betrusted-io/xous-usb-hid.git"}
embedded-time = "0.12.1" # required by the keyboard interface
[dependencies.usb-device]

View file

@ -27,9 +27,9 @@ use std::collections::BTreeMap;
use usb_device::prelude::*;
use usb_device::class_prelude::*;
use usbd_human_interface_device::page::Keyboard;
use usbd_human_interface_device::device::keyboard::NKROBootKeyboard;
use usbd_human_interface_device::prelude::*;
use xous_usb_hid::page::Keyboard;
use xous_usb_hid::device::keyboard::NKROBootKeyboard;
use xous_usb_hid::prelude::*;
use embedded_time::Clock;
use std::convert::TryInto;
@ -100,7 +100,7 @@ fn main() -> ! {
)
.build(&usb_alloc);
let mut usb_dev = UsbDeviceBuilder::new(&usb_alloc, UsbVidPid(0x1209, 0x3613))
.manufacturer("usbd-human-interface-device")
.manufacturer("xous-usb-hid")
.product("NKRO Keyboard")
.serial_number("PRECURSOR")
.build();