kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vendor HID for libtock-drivers (#452)

Browse Source 
* multi HID interface for libtock-drivers

* proper u8 print
This commit is contained in:
kaczmarczyck
2022-04-05 05:52:33 +02:00
committed by GitHub
parent 742e5f149f
commit b33ffb7979
5 changed files with 86 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main.rs
View File

@@ -89,15 +89,15 @@ fn main() {
}
let mut pkt_request = [0; 64];
let has_packet =
let usb_interface =
match usb_ctap_hid::recv_with_timeout(&mut pkt_request, KEEPALIVE_DELAY_TOCK) {
Some(usb_ctap_hid::SendOrRecvStatus::Received) => {
Some(usb_ctap_hid::SendOrRecvStatus::Received(interface)) => {
#[cfg(feature = "debug_ctap")]
print_packet_notice("Received packet", &clock);
true
Some(interface)
}
Some(_) => panic!("Error receiving packet"),
None => false,
None => None,
};
let now = clock.try_now().unwrap();
@@ -120,11 +120,20 @@ fn main() {
// don't cause problems with timers.
ctap.update_timeouts(now);
if has_packet {
let reply = ctap.process_hid_packet(&pkt_request, Transport::MainHid, now);
if let Some(interface) = usb_interface {
let transport = match interface {
usb_ctap_hid::UsbInterface::MainHid => Transport::MainHid,
#[cfg(feature = "vendor_hid")]
usb_ctap_hid::UsbInterface::VendorHid => Transport::VendorHid,
};
let reply = ctap.process_hid_packet(&pkt_request, transport, now);
// This block handles sending packets.
for mut pkt_reply in reply {
let status = usb_ctap_hid::send_or_recv_with_timeout(&mut pkt_reply, SEND_TIMEOUT);
let status = usb_ctap_hid::send_or_recv_with_timeout(
&mut pkt_reply,
SEND_TIMEOUT,
interface,
);
match status {
None => {
#[cfg(feature = "debug_ctap")]
@@ -138,7 +147,7 @@ fn main() {
#[cfg(feature = "debug_ctap")]
print_packet_notice("Sent packet", &clock);
}
Some(usb_ctap_hid::SendOrRecvStatus::Received) => {
Some(usb_ctap_hid::SendOrRecvStatus::Received(_)) => {
#[cfg(feature = "debug_ctap")]
print_packet_notice("Received an UNEXPECTED packet", &clock);
// TODO: handle this unexpected packet.