diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2019-02-18 12:07:26 +0000 |
---|---|---|
committer | Robin Krahl <robin.krahl@ireas.org> | 2019-02-18 15:30:52 +0100 |
commit | ccbbf657743eb656f4e49b0204092b4450ffa7ba (patch) | |
tree | b0bec9a81a5f03743581ffb08585277dddafc3e3 /src/main.rs | |
parent | a954a23e52a28cda7af669303f5e9404641b3b6c (diff) | |
download | ntw-ccbbf657743eb656f4e49b0204092b4450ffa7ba.tar.gz ntw-ccbbf657743eb656f4e49b0204092b4450ffa7ba.tar.bz2 |
Add HidDevice trait for device-specific information
The HID USB class needs device-specific information – currently, the
subclass and the protocol of the device, but also the report descriptors
and request handlers once we support these functions. Therefore, this
patch introduces the HidDevice trait that provides this data. It also
adds a Nitrokey struct that implements this trait for the Nitrokey Pro
device.
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.rs b/src/main.rs index 3857967..e10f4d2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,7 +17,8 @@ use hal::prelude::*; use stm32f103xx_usb::UsbBus; use usb_device::class::UsbClass; -use crate::hid::{HidClass, Protocol, Subclass}; +use crate::device::Nitrokey; +use crate::hid::HidClass; #[entry] fn main() -> ! { @@ -38,7 +39,7 @@ fn main() -> ! { let mut gpioa = p.GPIOA.split(&mut rcc.apb2); let usb_bus = UsbBus::usb_with_reset(p.USB, &mut rcc.apb1, &clocks, &mut gpioa.crh, gpioa.pa12); - let mut usb_class = HidClass::new(&usb_bus, Subclass::BootInterface, Protocol::Keyboard); + let mut usb_class = HidClass::new(Nitrokey::new(), &usb_bus); let mut usb_dev = device::create_usb_device(&usb_bus); usb_dev.force_reset().expect("USB reset failed"); |