saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-08 04:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

transientdisk: clean up us fence macros

Browse source 
Just use "mass-storage", and add a log message to inform the user they
compiled a kernel image without `--feature mass-storage`.
This commit is contained in:
Gianguido Sorà 2023-01-31 22:37:46 +01:00
parent 981abbf503
commit 14679efb0b
No known key found for this signature in database
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/transientdisk/src/main.rs
View file

@ -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(),