mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
first commit, compiles but panics on device
This commit is contained in:
parent
46ca14e2f9
commit
4d51dd5aab
5 changed files with 76 additions and 3 deletions
9
Cargo.lock
generated
9
Cargo.lock
generated
|
|
@ -4168,6 +4168,7 @@ dependencies = [
|
||||||
"rkyv",
|
"rkyv",
|
||||||
"usb-device",
|
"usb-device",
|
||||||
"usbd-human-interface-device 0.2.1",
|
"usbd-human-interface-device 0.2.1",
|
||||||
|
"usbd-mass-storage",
|
||||||
"utralib",
|
"utralib",
|
||||||
"vcell",
|
"vcell",
|
||||||
"xous 0.9.29 (registry+https://github.com/rust-lang/crates.io-index)",
|
"xous 0.9.29 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
|
@ -4236,6 +4237,14 @@ dependencies = [
|
||||||
"usb-device",
|
"usb-device",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "usbd-mass-storage"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"log",
|
||||||
|
"usb-device",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "userprefs"
|
name = "userprefs"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,9 @@ impl<'a> ShellCmdApi<'a> for Usb {
|
||||||
self.usb_dev.ensure_core(usb_device_xous::UsbDeviceType::FidoKbd).unwrap();
|
self.usb_dev.ensure_core(usb_device_xous::UsbDeviceType::FidoKbd).unwrap();
|
||||||
write!(ret, "USB connected to HID (FIDO + keyboard) core").unwrap();
|
write!(ret, "USB connected to HID (FIDO + keyboard) core").unwrap();
|
||||||
}
|
}
|
||||||
|
"ms" => {
|
||||||
|
self.usb_dev.ensure_core(usb_device_xous::UsbDeviceType::MassStorage).unwrap();
|
||||||
|
write!(ret, "USB connected to mass storage core").unwrap(); }
|
||||||
"fido" => {
|
"fido" => {
|
||||||
self.usb_dev.ensure_core(usb_device_xous::UsbDeviceType::Fido).unwrap();
|
self.usb_dev.ensure_core(usb_device_xous::UsbDeviceType::Fido).unwrap();
|
||||||
write!(ret, "USB connected to FIDO-only core").unwrap();
|
write!(ret, "USB connected to FIDO-only core").unwrap();
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,9 @@ embedded-time = "0.12.1" # required by the keyboard interface
|
||||||
packed_struct = { version = "0.10", default-features = false } # used by the usbd-human-interface-device crate
|
packed_struct = { version = "0.10", default-features = false } # used by the usbd-human-interface-device crate
|
||||||
num_enum = { version = "0.5", default-features = false } # used by the usbd-human-interface-device crate
|
num_enum = { version = "0.5", default-features = false } # used by the usbd-human-interface-device crate
|
||||||
|
|
||||||
|
[dependencies.usbd-mass-storage]
|
||||||
|
path = "../../../usbd-mass-storage"
|
||||||
|
|
||||||
[dependencies.usb-device]
|
[dependencies.usb-device]
|
||||||
# see top level Cargo.toml for patch.crates-io directive to help with dev work
|
# see top level Cargo.toml for patch.crates-io directive to help with dev work
|
||||||
version = "0.2.8"
|
version = "0.2.8"
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,7 @@ pub enum UsbDeviceType {
|
||||||
Debug = 0,
|
Debug = 0,
|
||||||
FidoKbd = 1,
|
FidoKbd = 1,
|
||||||
Fido = 2,
|
Fido = 2,
|
||||||
|
MassStorage = 3,
|
||||||
}
|
}
|
||||||
use std::convert::TryFrom;
|
use std::convert::TryFrom;
|
||||||
impl TryFrom<usize> for UsbDeviceType {
|
impl TryFrom<usize> for UsbDeviceType {
|
||||||
|
|
@ -79,6 +80,7 @@ impl TryFrom<usize> for UsbDeviceType {
|
||||||
0 => Ok(UsbDeviceType::Debug),
|
0 => Ok(UsbDeviceType::Debug),
|
||||||
1 => Ok(UsbDeviceType::FidoKbd),
|
1 => Ok(UsbDeviceType::FidoKbd),
|
||||||
2 => Ok(UsbDeviceType::Fido),
|
2 => Ok(UsbDeviceType::Fido),
|
||||||
|
3 => Ok(UsbDeviceType::MassStorage),
|
||||||
_ => Err("Invalid UsbDeviceType specifier"),
|
_ => Err("Invalid UsbDeviceType specifier"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@ const EXTENDED_CORE_RESET_MS: usize = 4000;
|
||||||
enum Views {
|
enum Views {
|
||||||
FidoWithKbd = 0,
|
FidoWithKbd = 0,
|
||||||
FidoOnly = 1,
|
FidoOnly = 1,
|
||||||
|
MassStorage = 2,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn main_hw() -> ! {
|
pub(crate) fn main_hw() -> ! {
|
||||||
|
|
@ -118,6 +119,10 @@ pub(crate) fn main_hw() -> ! {
|
||||||
// before doing any allocs, clone a copy of the hardware access structure so we can build a second
|
// before doing any allocs, clone a copy of the hardware access structure so we can build a second
|
||||||
// view into the hardware with only FIDO descriptors
|
// view into the hardware with only FIDO descriptors
|
||||||
let usb_fido_dev = usb_fidokbd_dev.clone_unalloc();
|
let usb_fido_dev = usb_fidokbd_dev.clone_unalloc();
|
||||||
|
|
||||||
|
// do the same thing for mass storage
|
||||||
|
let ums_dev = usb_fidokbd_dev.clone_unalloc();
|
||||||
|
|
||||||
// track which view is visible on the device core
|
// track which view is visible on the device core
|
||||||
let mut view = Views::FidoWithKbd;
|
let mut view = Views::FidoWithKbd;
|
||||||
|
|
||||||
|
|
@ -164,6 +169,15 @@ pub(crate) fn main_hw() -> ! {
|
||||||
.serial_number(&serial_number)
|
.serial_number(&serial_number)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
let ums_alloc = UsbBusAllocator::new(ums_dev);
|
||||||
|
let mut ums_device = UsbDeviceBuilder::new(&ums_alloc, UsbVidPid(0x1209, 0x3613))
|
||||||
|
.manufacturer("Kosagi")
|
||||||
|
.product("Precursor")
|
||||||
|
.serial_number(&serial_number)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
let mut ums = usbd_mass_storage::UMSClass::new(&ums_alloc);
|
||||||
|
|
||||||
let mut led_state: KeyboardLedsReport = KeyboardLedsReport::default();
|
let mut led_state: KeyboardLedsReport = KeyboardLedsReport::default();
|
||||||
let mut fido_listener: Option<xous::MessageEnvelope> = None;
|
let mut fido_listener: Option<xous::MessageEnvelope> = None;
|
||||||
// under the theory that PIDs are unforgeable. TODO: check that PIDs are unforgeable.
|
// under the theory that PIDs are unforgeable. TODO: check that PIDs are unforgeable.
|
||||||
|
|
@ -197,6 +211,9 @@ pub(crate) fn main_hw() -> ! {
|
||||||
_ => ()
|
_ => ()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Views::MassStorage => {
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// resume2 brings us to our last application state
|
// resume2 brings us to our last application state
|
||||||
usbmgmt.xous_resume2();
|
usbmgmt.xous_resume2();
|
||||||
|
|
@ -251,6 +268,7 @@ pub(crate) fn main_hw() -> ! {
|
||||||
let u2f = match view {
|
let u2f = match view {
|
||||||
Views::FidoWithKbd => composite.interface::<RawFidoInterface<'_, _>, _>(),
|
Views::FidoWithKbd => composite.interface::<RawFidoInterface<'_, _>, _>(),
|
||||||
Views::FidoOnly => fido_class.interface::<RawFidoInterface<'_, _>, _>(),
|
Views::FidoOnly => fido_class.interface::<RawFidoInterface<'_, _>, _>(),
|
||||||
|
Views::MassStorage => panic!("expected u2f tx when in mass storage mode!"),
|
||||||
};
|
};
|
||||||
u2f.write_report(&u2f_msg).ok();
|
u2f.write_report(&u2f_msg).ok();
|
||||||
log::debug!("sent U2F packet {:x?}", u2f_ipc.data);
|
log::debug!("sent U2F packet {:x?}", u2f_ipc.data);
|
||||||
|
|
@ -283,6 +301,10 @@ pub(crate) fn main_hw() -> ! {
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
Views::MassStorage => {
|
||||||
|
//ums.poll(); // TODO(gsora): wire ums poll
|
||||||
|
None
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
if let Some(u2f) = maybe_u2f {
|
if let Some(u2f) = maybe_u2f {
|
||||||
|
|
@ -310,6 +332,7 @@ pub(crate) fn main_hw() -> ! {
|
||||||
let is_suspend = match view {
|
let is_suspend = match view {
|
||||||
Views::FidoWithKbd => usb_dev.state() == UsbDeviceState::Suspend,
|
Views::FidoWithKbd => usb_dev.state() == UsbDeviceState::Suspend,
|
||||||
Views::FidoOnly => fido_dev.state() == UsbDeviceState::Suspend,
|
Views::FidoOnly => fido_dev.state() == UsbDeviceState::Suspend,
|
||||||
|
Views::MassStorage => ums_device.state() == UsbDeviceState::Suspend,
|
||||||
};
|
};
|
||||||
if is_suspend {
|
if is_suspend {
|
||||||
log::info!("suspend detected");
|
log::info!("suspend detected");
|
||||||
|
|
@ -343,7 +366,7 @@ pub(crate) fn main_hw() -> ! {
|
||||||
log::info!("Connecting USB device core; disconnecting debug USB core");
|
log::info!("Connecting USB device core; disconnecting debug USB core");
|
||||||
match view {
|
match view {
|
||||||
Views::FidoWithKbd => usbmgmt.connect_device_core(true),
|
Views::FidoWithKbd => usbmgmt.connect_device_core(true),
|
||||||
Views::FidoOnly => {
|
Views::FidoOnly | Views::MassStorage => {
|
||||||
view = Views::FidoWithKbd;
|
view = Views::FidoWithKbd;
|
||||||
usbmgmt.ll_reset(true);
|
usbmgmt.ll_reset(true);
|
||||||
tt.sleep_ms(1000).ok();
|
tt.sleep_ms(1000).ok();
|
||||||
|
|
@ -356,7 +379,7 @@ pub(crate) fn main_hw() -> ! {
|
||||||
UsbDeviceType::Fido => {
|
UsbDeviceType::Fido => {
|
||||||
match view {
|
match view {
|
||||||
Views::FidoOnly => usbmgmt.connect_device_core(true),
|
Views::FidoOnly => usbmgmt.connect_device_core(true),
|
||||||
Views::FidoWithKbd => {
|
Views::FidoWithKbd | Views::MassStorage => {
|
||||||
view = Views::FidoOnly;
|
view = Views::FidoOnly;
|
||||||
usbmgmt.ll_reset(true);
|
usbmgmt.ll_reset(true);
|
||||||
tt.sleep_ms(1000).ok();
|
tt.sleep_ms(1000).ok();
|
||||||
|
|
@ -366,6 +389,19 @@ pub(crate) fn main_hw() -> ! {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
UsbDeviceType::MassStorage => {
|
||||||
|
match view {
|
||||||
|
Views::MassStorage => usbmgmt.connect_device_core(true),
|
||||||
|
Views::FidoWithKbd | Views::FidoOnly => {
|
||||||
|
view = Views::MassStorage;
|
||||||
|
usbmgmt.ll_reset(true);
|
||||||
|
tt.sleep_ms(1000).ok();
|
||||||
|
usbmgmt.ll_connect_device_core(true);
|
||||||
|
tt.sleep_ms(EXTENDED_CORE_RESET_MS).ok();
|
||||||
|
usbmgmt.ll_reset(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
xous::return_scalar(msg.sender, 0).unwrap();
|
xous::return_scalar(msg.sender, 0).unwrap();
|
||||||
}),
|
}),
|
||||||
|
|
@ -414,6 +450,24 @@ pub(crate) fn main_hw() -> ! {
|
||||||
// type matches, do nothing
|
// type matches, do nothing
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
UsbDeviceType::MassStorage => {
|
||||||
|
if !usbmgmt.is_device_connected() {
|
||||||
|
log::info!("Connecting USB device core; disconnecting debug USB core");
|
||||||
|
view = Views::MassStorage;
|
||||||
|
usbmgmt.connect_device_core(true);
|
||||||
|
} else {
|
||||||
|
if view != Views::MassStorage {
|
||||||
|
view = Views::MassStorage;
|
||||||
|
usbmgmt.ll_reset(true);
|
||||||
|
tt.sleep_ms(1000).ok();
|
||||||
|
usbmgmt.ll_connect_device_core(true);
|
||||||
|
tt.sleep_ms(EXTENDED_CORE_RESET_MS).ok();
|
||||||
|
usbmgmt.ll_reset(false);
|
||||||
|
} else {
|
||||||
|
// type matches, do nothing
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
xous::return_scalar(msg.sender, 0).unwrap();
|
xous::return_scalar(msg.sender, 0).unwrap();
|
||||||
|
|
@ -423,6 +477,7 @@ pub(crate) fn main_hw() -> ! {
|
||||||
match view {
|
match view {
|
||||||
Views::FidoWithKbd => xous::return_scalar(msg.sender, UsbDeviceType::FidoKbd as usize).unwrap(),
|
Views::FidoWithKbd => xous::return_scalar(msg.sender, UsbDeviceType::FidoKbd as usize).unwrap(),
|
||||||
Views::FidoOnly => xous::return_scalar(msg.sender, UsbDeviceType::Fido as usize).unwrap(),
|
Views::FidoOnly => xous::return_scalar(msg.sender, UsbDeviceType::Fido as usize).unwrap(),
|
||||||
|
Views::MassStorage => xous::return_scalar(msg.sender, UsbDeviceType::MassStorage as usize).unwrap(),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
xous::return_scalar(msg.sender, UsbDeviceType::Debug as usize).unwrap();
|
xous::return_scalar(msg.sender, UsbDeviceType::Debug as usize).unwrap();
|
||||||
|
|
@ -476,6 +531,7 @@ pub(crate) fn main_hw() -> ! {
|
||||||
match view {
|
match view {
|
||||||
Views::FidoWithKbd => xous::return_scalar(msg.sender, usb_dev.state() as usize).unwrap(),
|
Views::FidoWithKbd => xous::return_scalar(msg.sender, usb_dev.state() as usize).unwrap(),
|
||||||
Views::FidoOnly => xous::return_scalar(msg.sender, fido_dev.state() as usize).unwrap(),
|
Views::FidoOnly => xous::return_scalar(msg.sender, fido_dev.state() as usize).unwrap(),
|
||||||
|
Views::MassStorage => xous::return_scalar(msg.sender, ums_device.state() as usize).unwrap(),
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
Some(Opcode::SendKeyCode) => msg_blocking_scalar_unpack!(msg, code0, code1, code2, autoup, {
|
Some(Opcode::SendKeyCode) => msg_blocking_scalar_unpack!(msg, code0, code1, code2, autoup, {
|
||||||
|
|
@ -507,7 +563,7 @@ pub(crate) fn main_hw() -> ! {
|
||||||
xous::return_scalar(msg.sender, 1).unwrap();
|
xous::return_scalar(msg.sender, 1).unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Views::FidoOnly => {
|
Views::FidoOnly | Views::MassStorage => {
|
||||||
xous::return_scalar(msg.sender, 1).unwrap();
|
xous::return_scalar(msg.sender, 1).unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue