mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
transientdisk: move flash drive implementation in a separate file
Also encapsulate the entire MemoryMessage handling.
This commit is contained in:
parent
14679efb0b
commit
dca88da039
2 changed files with 92 additions and 78 deletions
86
apps/transientdisk/src/flash_drive.rs
Normal file
86
apps/transientdisk/src/flash_drive.rs
Normal file
|
|
@ -0,0 +1,86 @@
|
||||||
|
use xous::MessageEnvelope;
|
||||||
|
|
||||||
|
pub struct FlashDrive {
|
||||||
|
capacity: usize,
|
||||||
|
block_size: usize,
|
||||||
|
memory: xous::MemoryRange,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum FlashDriveError {
|
||||||
|
CapacityNotPageAligned,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FlashDrive {
|
||||||
|
pub fn new(capacity: usize, block_size: usize) -> Result<Self, FlashDriveError> {
|
||||||
|
if (capacity % 1024) != 0 {
|
||||||
|
return Err(FlashDriveError::CapacityNotPageAligned);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut backing = xous::syscall::map_memory(
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
capacity,
|
||||||
|
xous::MemoryFlags::R | xous::MemoryFlags::W,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
// initialize backing slice with bogus data
|
||||||
|
let backing_slice: &mut [u32] = backing.as_slice_mut();
|
||||||
|
for (index, d) in backing_slice.iter_mut().enumerate() {
|
||||||
|
*d = index as u32;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
capacity,
|
||||||
|
block_size,
|
||||||
|
memory: backing,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn read(&mut self, msg: &mut MessageEnvelope) {
|
||||||
|
let body = msg
|
||||||
|
.body
|
||||||
|
.memory_message_mut()
|
||||||
|
.expect("incorrect message type received");
|
||||||
|
let lba = body.offset.map(|v| v.get()).unwrap_or_default();
|
||||||
|
let data = body.buf.as_slice_mut::<u8>();
|
||||||
|
|
||||||
|
self.read_inner(lba, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn write(&mut self, msg: &mut MessageEnvelope) {
|
||||||
|
let body = msg
|
||||||
|
.body
|
||||||
|
.memory_message_mut()
|
||||||
|
.expect("incorrect message type received");
|
||||||
|
let lba = body.offset.map(|v| v.get()).unwrap_or_default();
|
||||||
|
let data = body.buf.as_slice_mut::<u8>();
|
||||||
|
|
||||||
|
self.write_inner(lba, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn max_lba(&self, msg: &mut MessageEnvelope) {
|
||||||
|
xous::return_scalar(msg.sender, self.max_lba_inner() as usize).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FlashDrive {
|
||||||
|
fn read_inner(&mut self, lba: usize, data: &mut [u8]) {
|
||||||
|
let backing_slice: &[u8] = self.memory.as_slice();
|
||||||
|
|
||||||
|
let rawdata = &backing_slice[lba * self.block_size..(lba + 1) * self.block_size];
|
||||||
|
|
||||||
|
data[..self.block_size].copy_from_slice(rawdata);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_inner(&mut self, lba: usize, data: &mut [u8]) {
|
||||||
|
let backing_slice: &mut [u8] = self.memory.as_slice_mut();
|
||||||
|
backing_slice[lba * self.block_size..(lba + 1) * self.block_size]
|
||||||
|
.copy_from_slice(&data[..self.block_size]);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn max_lba_inner(&self) -> u32 {
|
||||||
|
(self.capacity as u32 / 512) - 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
#![cfg_attr(target_os = "none", no_std)]
|
#![cfg_attr(target_os = "none", no_std)]
|
||||||
#![cfg_attr(target_os = "none", no_main)]
|
#![cfg_attr(target_os = "none", no_main)]
|
||||||
|
|
||||||
use core::fmt::Write;
|
use core::fmt::Write;
|
||||||
use graphics_server::api::GlyphStyle;
|
use graphics_server::api::GlyphStyle;
|
||||||
use graphics_server::{DrawStyle, Gid, PixelColor, Point, Rectangle, TextBounds, TextView};
|
use graphics_server::{DrawStyle, Gid, PixelColor, Point, Rectangle, TextBounds, TextView};
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
|
mod flash_drive;
|
||||||
|
|
||||||
pub(crate) const SERVER_NAME_TRANSIENTDISK: &str = "_Transient Disk_";
|
pub(crate) const SERVER_NAME_TRANSIENTDISK: &str = "_Transient Disk_";
|
||||||
|
|
||||||
|
|
@ -115,63 +115,6 @@ impl UI {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct FlashDrive {
|
|
||||||
capacity: usize,
|
|
||||||
block_size: usize,
|
|
||||||
memory: xous::MemoryRange,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
enum FlashDriveError {
|
|
||||||
CapacityNotPageAligned,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl FlashDrive {
|
|
||||||
fn new(capacity: usize, block_size: usize) -> Result<Self, FlashDriveError> {
|
|
||||||
if (capacity % 1024) != 0 {
|
|
||||||
return Err(FlashDriveError::CapacityNotPageAligned);
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut backing = xous::syscall::map_memory(
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
capacity,
|
|
||||||
xous::MemoryFlags::R | xous::MemoryFlags::W,
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
// initialize backing slice with bogus data
|
|
||||||
let backing_slice: &mut [u32] = backing.as_slice_mut();
|
|
||||||
for (index, d) in backing_slice.iter_mut().enumerate() {
|
|
||||||
*d = index as u32;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
capacity,
|
|
||||||
block_size,
|
|
||||||
memory: backing,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn read(&mut self, lba: usize, data: &mut [u8]) {
|
|
||||||
let backing_slice: &[u8] = self.memory.as_slice();
|
|
||||||
|
|
||||||
let rawdata = &backing_slice[lba * self.block_size..(lba + 1) * self.block_size];
|
|
||||||
|
|
||||||
data[..self.block_size].copy_from_slice(rawdata);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn write(&mut self, lba: usize, data: &mut [u8]) {
|
|
||||||
let backing_slice: &mut [u8] = self.memory.as_slice_mut();
|
|
||||||
backing_slice[lba * self.block_size..(lba + 1) * self.block_size]
|
|
||||||
.copy_from_slice(&data[..self.block_size]);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn max_lba(&self) -> u32 {
|
|
||||||
(self.capacity as u32 / 512) - 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn main() -> ! {
|
fn main() -> ! {
|
||||||
log_server::init_wait().unwrap();
|
log_server::init_wait().unwrap();
|
||||||
log::set_max_level(log::LevelFilter::Info);
|
log::set_max_level(log::LevelFilter::Info);
|
||||||
|
|
@ -189,7 +132,8 @@ fn main() -> ! {
|
||||||
|
|
||||||
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 =
|
||||||
|
flash_drive::FlashDrive::new(1445888, 512).expect("cannot create flash drive instance");
|
||||||
|
|
||||||
#[cfg(feature = "mass-storage")]
|
#[cfg(feature = "mass-storage")]
|
||||||
let usb = usb_device_xous::UsbHid::new();
|
let usb = usb_device_xous::UsbHid::new();
|
||||||
|
|
@ -245,28 +189,12 @@ fn main() -> ! {
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
Some(TradOp::Read) => {
|
Some(TradOp::Read) => {
|
||||||
let body = msg
|
fd.read(&mut msg);
|
||||||
.body
|
|
||||||
.memory_message_mut()
|
|
||||||
.expect("incorrect message type received");
|
|
||||||
let lba = body.offset.map(|v| v.get()).unwrap_or_default();
|
|
||||||
let data = body.buf.as_slice_mut::<u8>();
|
|
||||||
|
|
||||||
fd.read(lba, data);
|
|
||||||
}
|
}
|
||||||
Some(TradOp::Write) => {
|
Some(TradOp::Write) => {
|
||||||
let body = msg
|
fd.write(&mut msg);
|
||||||
.body
|
|
||||||
.memory_message_mut()
|
|
||||||
.expect("incorrect message type received");
|
|
||||||
let lba = body.offset.map(|v| v.get()).unwrap_or_default();
|
|
||||||
let data = body.buf.as_slice_mut::<u8>();
|
|
||||||
|
|
||||||
fd.write(lba, data);
|
|
||||||
}
|
|
||||||
Some(TradOp::MaxLba) => {
|
|
||||||
xous::return_scalar(msg.sender, fd.max_lba() as usize).unwrap();
|
|
||||||
}
|
}
|
||||||
|
Some(TradOp::MaxLba) => fd.max_lba(&mut msg),
|
||||||
_ => {
|
_ => {
|
||||||
log::error!("Got unknown message");
|
log::error!("Got unknown message");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue