From 14679efb0be4fb8a7246c8e55c878431cd9b4126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gianguido=20Sor=C3=A0?= Date: Tue, 31 Jan 2023 22:37:46 +0100 Subject: [PATCH] transientdisk: clean up us fence macros Just use "mass-storage", and add a log message to inform the user they compiled a kernel image without `--feature mass-storage`. --- apps/transientdisk/src/main.rs | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/apps/transientdisk/src/main.rs b/apps/transientdisk/src/main.rs index 0f72628a9..047d3a5df 100644 --- a/apps/transientdisk/src/main.rs +++ b/apps/transientdisk/src/main.rs @@ -184,20 +184,17 @@ fn main() -> ! { .register_name(SERVER_NAME_TRANSIENTDISK, None) .expect("can't register server"); + #[cfg(not(feature = "mass-storage"))] + log::warn!("transientdisk has been compiled without the mass-storage feature, needed to make the USB subsystem behave like a mass-storage device."); + let mut ui = UI::new(&xns, sid); let mut fd = FlashDrive::new(1445888, 512).expect("cannot create flash drive instance"); - #[cfg(all( - any(feature = "precursor", feature = "renode"), - feature = "mass-storage" - ))] + #[cfg(feature = "mass-storage")] let usb = usb_device_xous::UsbHid::new(); - #[cfg(all( - any(feature = "precursor", feature = "renode"), - feature = "mass-storage" - ))] + #[cfg(feature = "mass-storage")] let core_before_ms = usb.get_current_core().unwrap(); let mut usb_setup = false; @@ -219,10 +216,7 @@ fn main() -> ! { let new_state = gam::FocusState::convert_focus_change(new_state_code); match new_state { gam::FocusState::Background => { - #[cfg(all( - any(feature = "precursor", feature = "renode"), - feature = "mass-storage" - ))] + #[cfg(feature = "mass-storage")] { usb.reset_block_device(); usb.switch_to_core(core_before_ms).unwrap(); @@ -233,10 +227,7 @@ fn main() -> ! { continue; } - #[cfg(all( - any(feature = "precursor", feature = "renode"), - feature = "mass-storage" - ))] + #[cfg(feature = "mass-storage")] { usb.set_block_device( TradOp::Read.to_usize().unwrap(),