mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
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`.
This commit is contained in:
parent
981abbf503
commit
14679efb0b
1 changed files with 7 additions and 16 deletions
|
|
@ -184,20 +184,17 @@ fn main() -> ! {
|
||||||
.register_name(SERVER_NAME_TRANSIENTDISK, None)
|
.register_name(SERVER_NAME_TRANSIENTDISK, None)
|
||||||
.expect("can't register server");
|
.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 ui = UI::new(&xns, sid);
|
||||||
|
|
||||||
let mut fd = FlashDrive::new(1445888, 512).expect("cannot create flash drive instance");
|
let mut fd = FlashDrive::new(1445888, 512).expect("cannot create flash drive instance");
|
||||||
|
|
||||||
#[cfg(all(
|
#[cfg(feature = "mass-storage")]
|
||||||
any(feature = "precursor", feature = "renode"),
|
|
||||||
feature = "mass-storage"
|
|
||||||
))]
|
|
||||||
let usb = usb_device_xous::UsbHid::new();
|
let usb = usb_device_xous::UsbHid::new();
|
||||||
|
|
||||||
#[cfg(all(
|
#[cfg(feature = "mass-storage")]
|
||||||
any(feature = "precursor", feature = "renode"),
|
|
||||||
feature = "mass-storage"
|
|
||||||
))]
|
|
||||||
let core_before_ms = usb.get_current_core().unwrap();
|
let core_before_ms = usb.get_current_core().unwrap();
|
||||||
|
|
||||||
let mut usb_setup = false;
|
let mut usb_setup = false;
|
||||||
|
|
@ -219,10 +216,7 @@ fn main() -> ! {
|
||||||
let new_state = gam::FocusState::convert_focus_change(new_state_code);
|
let new_state = gam::FocusState::convert_focus_change(new_state_code);
|
||||||
match new_state {
|
match new_state {
|
||||||
gam::FocusState::Background => {
|
gam::FocusState::Background => {
|
||||||
#[cfg(all(
|
#[cfg(feature = "mass-storage")]
|
||||||
any(feature = "precursor", feature = "renode"),
|
|
||||||
feature = "mass-storage"
|
|
||||||
))]
|
|
||||||
{
|
{
|
||||||
usb.reset_block_device();
|
usb.reset_block_device();
|
||||||
usb.switch_to_core(core_before_ms).unwrap();
|
usb.switch_to_core(core_before_ms).unwrap();
|
||||||
|
|
@ -233,10 +227,7 @@ fn main() -> ! {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(all(
|
#[cfg(feature = "mass-storage")]
|
||||||
any(feature = "precursor", feature = "renode"),
|
|
||||||
feature = "mass-storage"
|
|
||||||
))]
|
|
||||||
{
|
{
|
||||||
usb.set_block_device(
|
usb.set_block_device(
|
||||||
TradOp::Read.to_usize().unwrap(),
|
TradOp::Read.to_usize().unwrap(),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue