Better virtual file system, keyboard through MMIO&VirtIO

crates/bffs/src/file.rs

@@ -1,10 +1,11 @@
 use crate::{
+    Fat32FileSystem, ReadSeek, ReadWriteSeek,
     consts::{FAT32_BAD_CLUSTER, FAT32_END_OF_CHAIN},
     error::Error,
-    io::{self, IoBase, Read, Seek, Write},
-    Fat32FileSystem, ReadSeek, ReadWriteSeek,
 };
 
+use io::{self, IoBase, Read, Seek, Write};
+
 #[derive(Debug, Clone)]
 pub struct RawFile<'a, T> {
     pub(crate) fs: &'a Fat32FileSystem<T>,
@@ -30,11 +31,11 @@ impl<'a, T> RawFile<'a, T> {
 }
 
 impl<'a, T: IoBase> IoBase for RawFile<'a, T> {
-    type Error = T::Error;
+    type Error = Error<T::Error>;
 }
 
 impl<'a, T: ReadSeek> Seek for RawFile<'a, T> {
-    fn seek(&mut self, pos: io::SeekFrom) -> Result<u64, Error<Self::Error>> {
+    fn seek(&mut self, pos: io::SeekFrom) -> Result<u64, Self::Error> {
         let new_pos = match pos {
             io::SeekFrom::Start(s) => s,
             io::SeekFrom::Current(c) => (self.pos as i64 + c) as u64,
@@ -66,7 +67,7 @@ impl<'a, T: ReadSeek> Seek for RawFile<'a, T> {
 }
 
 impl<'a, T: ReadSeek> Read for RawFile<'a, T> {
-    fn read(&mut self, buf: &mut [u8]) -> Result<usize, Error<Self::Error>> {
+    fn read(&mut self, buf: &mut [u8]) -> Result<usize, Self::Error> {
         let max_len = self
             .size
             .map(|size| core::cmp::min(buf.len(), size as usize - self.pos as usize))
@@ -115,40 +116,41 @@ impl<'a, T: ReadSeek> Read for RawFile<'a, T> {
     }
 }
 impl<'a, T: ReadWriteSeek> Write for RawFile<'a, T> {
-    fn write(&mut self, _buf: &[u8]) -> Result<usize, Error<Self::Error>> {
+    fn write(&mut self, _buf: &[u8]) -> Result<usize, Self::Error> {
         todo!()
     }
 
-    fn flush(&mut self) -> Result<(), Error<Self::Error>> {
+    fn flush(&mut self) -> Result<(), Self::Error> {
         todo!()
     }
 }
 
 #[allow(unused)]
+#[derive(Debug)]
 pub struct File<'a, T> {
     raw: RawFile<'a, T>,
     fs: &'a Fat32FileSystem<T>,
 }
 
 impl<'a, T: IoBase> IoBase for File<'a, T> {
-    type Error = T::Error;
+    type Error = Error<T::Error>;
 }
 impl<'a, T: ReadSeek> Seek for File<'a, T> {
-    fn seek(&mut self, pos: io::SeekFrom) -> Result<u64, Error<Self::Error>> {
+    fn seek(&mut self, pos: io::SeekFrom) -> Result<u64, Self::Error> {
         self.raw.seek(pos)
     }
 }
 impl<'a, T: ReadSeek> Read for File<'a, T> {
-    fn read(&mut self, buf: &mut [u8]) -> Result<usize, Error<Self::Error>> {
+    fn read(&mut self, buf: &mut [u8]) -> Result<usize, Self::Error> {
         self.raw.read(buf)
     }
 }
 impl<'a, T: ReadWriteSeek> Write for File<'a, T> {
-    fn write(&mut self, buf: &[u8]) -> Result<usize, Error<Self::Error>> {
+    fn write(&mut self, buf: &[u8]) -> Result<usize, Self::Error> {
         self.raw.write(buf)
     }
 
-    fn flush(&mut self) -> Result<(), Error<Self::Error>> {
+    fn flush(&mut self) -> Result<(), Self::Error> {
         self.raw.flush()
     }
 }