From c7f9688b5f5e65f984fc8289c247f1d9549155a1 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 17 May 2022 02:25:44 +0800 Subject: [PATCH] have status point to the USB crate for USB checkup --- services/status/Cargo.toml | 1 + services/status/src/main.rs | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/status/Cargo.toml b/services/status/Cargo.toml index 746f82300..92aefdb7e 100644 --- a/services/status/Cargo.toml +++ b/services/status/Cargo.toml @@ -26,6 +26,7 @@ modals = {path = "../modals"} pddb = {path = "../pddb"} net = {path = "../net"} keyboard = {path = "../keyboard"} +usb-device-xous = {path="../usb-device-xous"} num-derive = {version = "0.3.3", default-features = false} num-traits = {version = "0.2.14", default-features = false} diff --git a/services/status/src/main.rs b/services/status/src/main.rs index 168e41a6c..e90684025 100644 --- a/services/status/src/main.rs +++ b/services/status/src/main.rs @@ -217,9 +217,10 @@ fn xmain() -> ! { }; let llio = llio::Llio::new(&xns); + let usb_hid = usb_device_xous::UsbHid::new(); log::debug!("usb unlock notice..."); - let (dl, _) = llio.debug_usb(None).unwrap(); + let (dl, _) = usb_hid.debug_usb(None).unwrap(); let mut debug_locked = dl; // build security status textview let mut security_tv = TextView::new( @@ -444,7 +445,7 @@ fn xmain() -> ! { } // update the security status, if any - let (is_locked, force_update) = llio.debug_usb(None).unwrap(); + let (is_locked, force_update) = usb_hid.debug_usb(None).unwrap(); if (debug_locked != is_locked) || force_update || secnotes_force_redraw || sec_notes.lock().unwrap().len() != last_sec_note_size