trying proper scsi handling

.gitignore

@@ -2,5 +2,3 @@
 *.uf2
 abi_sys.h
 assets/gif/bad_apple.gif
-picolibc
-user-apps/gboy/Peanut-GB

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "picolibc"]
-	path = picolibc
-	url = https://github.com/picolibc/picolibc
-[submodule "user-apps/gboy/Peanut-GB"]
-	path = user-apps/gboy/Peanut-GB
-	url = https://github.com/deltabeard/Peanut-GB

Cargo.toml

@@ -9,7 +9,6 @@ members = [
   "user-apps/snake",
   "user-apps/gallery",
   "user-apps/gif",
-  "user-apps/gboy",
 ]
 
 [profile.release]
@@ -24,7 +23,7 @@ codegen-units = 1
 lto = true
 debug = false
 opt-level = "z"
-panic = "unwind"
+panic = "abort"
 
 [profile.dev]
 lto = true

abi/src/lib.rs

@@ -3,8 +3,8 @@
 
 extern crate alloc;
 
+pub use abi_sys::{self, keyboard};
 use abi_sys::{RngRequest, alloc, dealloc, keyboard::KeyEvent};
-pub use abi_sys::{keyboard, print};
 pub use alloc::format;
 use core::alloc::{GlobalAlloc, Layout};
 use rand_core::RngCore;
@@ -25,10 +25,10 @@ unsafe impl GlobalAlloc for Alloc {
 }
 
 #[macro_export]
-macro_rules! println {
+macro_rules! print {
     ($($arg:tt)*) => {{
         let s = $crate::format!($($arg)*);
-        $crate::print(s.as_ptr(), s.len());
+        $crate::abi_sys::print(s.as_ptr(), s.len());
     }};
 }
 
@@ -45,8 +45,6 @@ pub fn get_key() -> KeyEvent {
 }
 
 pub mod display {
-    use core::sync::atomic::{AtomicBool, Ordering};
-
     use abi_sys::CPixel;
     use embedded_graphics::{
         Pixel,
@@ -61,28 +59,12 @@ pub mod display {
 
     pub type Pixel565 = Pixel<Rgb565>;
 
-    const BUF_SIZE: usize = 1024;
+    const BUF_SIZE: usize = 15 * 1024; // tune this for performance
     static mut BUF: [CPixel; BUF_SIZE] = [CPixel::new(); BUF_SIZE];
+    // const BUF_SIZE: usize = 250 * 1024; // tune this for performance
+    // static mut BUF: Lazy<Vec<CPixel>> = Lazy::new(|| vec![const { CPixel::new() }; BUF_SIZE]);
 
-    static DISPLAY_TAKEN: AtomicBool = AtomicBool::new(false);
-
-    pub struct Display {
-        _private: (),
-    }
-
-    impl Display {
-        /// Only one instance of Display can be taken
-        pub fn take() -> Option<Display> {
-            if DISPLAY_TAKEN
-                .compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed)
-                .is_ok()
-            {
-                Some(Self { _private: () })
-            } else {
-                None
-            }
-        }
-    }
+    pub struct Display;
 
     impl Dimensions for Display {
         fn bounding_box(&self) -> Rectangle {
@@ -158,30 +140,20 @@ impl RngCore for Rng {
 }
 
 pub mod fs {
-    use alloc::vec::Vec;
     use core::fmt::Display;
 
-    pub fn read_file(file: &str, start_from: usize, buf: &mut [u8]) -> usize {
+    use alloc::{format, vec::Vec};
+
+    pub fn read_file(file: &str, read_from: usize, buf: &mut [u8]) -> usize {
         abi_sys::read_file(
             file.as_ptr(),
             file.len(),
-            start_from,
+            read_from,
             buf.as_mut_ptr(),
             buf.len(),
         )
     }
 
-    pub fn write_file(file: &str, start_from: usize, buf: &[u8]) {
-        abi_sys::write_file(
-            file.as_ptr(),
-            file.len(),
-            start_from,
-            buf.as_ptr(),
-            buf.len(),
-        )
-    }
-
-    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
     pub struct FileName<'a> {
         full: &'a str,
         base: &'a str,
@@ -225,7 +197,7 @@ pub mod fs {
     const MAX_ENTRY_NAME_LEN: usize = 25;
     const MAX_ENTRIES: usize = 25;
 
-    #[derive(Clone, Copy, Debug)]
+    #[derive(Clone, Copy)]
     pub struct Entries([[u8; MAX_ENTRY_NAME_LEN]; MAX_ENTRIES]);
 
     impl Entries {

abi_sys/src/lib.rs

@@ -12,7 +12,7 @@ use strum::{EnumCount, EnumIter};
 
 pub type EntryFn = fn();
 
-pub const ABI_CALL_TABLE_COUNT: usize = 12;
+pub const ABI_CALL_TABLE_COUNT: usize = 11;
 const _: () = assert!(ABI_CALL_TABLE_COUNT == CallTable::COUNT);
 
 #[derive(Clone, Copy, EnumIter, EnumCount)]
@@ -28,8 +28,7 @@ pub enum CallTable {
     GenRand = 7,
     ListDir = 8,
     ReadFile = 9,
-    WriteFile = 10,
-    FileLen = 11,
+    FileLen = 10,
 }
 
 #[unsafe(no_mangle)]
@@ -439,24 +438,6 @@ pub extern "C" fn read_file(
     }
 }
 
-pub type WriteFile =
-    extern "C" fn(str: *const u8, len: usize, write_from: usize, buf: *const u8, buf_len: usize);
-
-#[unsafe(no_mangle)]
-pub extern "C" fn write_file(
-    str: *const u8,
-    len: usize,
-    write_from: usize,
-    buf: *const u8,
-    buf_len: usize,
-) {
-    unsafe {
-        let ptr = CALL_ABI_TABLE[CallTable::WriteFile as usize];
-        let f: WriteFile = core::mem::transmute(ptr);
-        f(str, len, write_from, buf, buf_len)
-    }
-}
-
 pub type FileLen = extern "C" fn(str: *const u8, len: usize) -> usize;
 
 #[unsafe(no_mangle)]

justfile

@@ -1,7 +1,5 @@
 kernel-dev board:
-    cargo run --bin kernel --features {{board}}  --features fps
-kernel-release-probe board:
-    cargo run --bin kernel --profile release --features {{board}}  --features fps
+    cargo run --bin kernel --features {{board}}
 kernel-release board:
     cargo build --bin kernel --release --no-default-features --features {{board}}
     elf2uf2-rs -d target/thumbv8m.main-none-eabihf/release/kernel
@@ -11,26 +9,6 @@ binary-args := "RUSTFLAGS=\"-C link-arg=-pie -C relocation-model=pic\""
 cbindgen:
     cbindgen abi_sys --output abi_sys.h -q
 
-newlib:
-    #!/bin/bash
-    cd picolibc
-    mkdir build
-    cd build
-    CONFIG_PICOLIBC=true ../scripts/do-configure thumbv8m_main_fp-none-eabi \
-        --buildtype=minsize \
-        -Dtests=true \
-        -Dtinystdio=false \
-        -Dsingle-thread=true \
-        -Db_pie=true \
-        -Ddefault_library=static \
-        -Dtinystdio=false \
-        -Dnewlib-nano-malloc=true \
-        -Dmultilib=false \
-        -Dpicolib=true \
-        "$@" 
-    DESTDIR=./install meson install
-    ninja
-
 userapp app:
      {{binary-args}} cargo build --bin {{app}} --profile release-binary
 
@@ -39,19 +17,3 @@ userapps: cbindgen
     just userapp snake
     just userapp gallery
     just userapp gif
-    just userapp gboy
-
-copy-userapp app:
-    cp ./target/thumbv8m.main-none-eabihf/release-binary/{{app}} /run/media/$(whoami)/PICOCALC/{{app}}.bin
-
-copy-userapps:
-    #!/bin/bash
-    just userapps
-    just copy-userapp calculator
-    just copy-userapp snake
-    just copy-userapp gallery
-    just copy-userapp gif
-
-    DEV=$(lsblk -o LABEL,NAME -nr | awk -v L="PICOCALC" '$1==L {print "/dev/" $2}')
-    udisksctl unmount -b "$DEV"
-    udisksctl power-off -b "$DEV"    

kernel/Cargo.toml

@@ -12,13 +12,10 @@ bench = false
 
 [features]
 default = ["rp235x", "defmt"]
-pimoroni2w = ["rp235x", "psram"]
-# rp2040 = ["embassy-rp/rp2040"] # unsupported, ram too small for fb
+pimoroni2w = ["rp235x"]
+rp2040 = ["embassy-rp/rp2040"]
 rp235x = ["embassy-rp/rp235xb"]
 trouble = ["dep:bt-hci", "dep:cyw43", "dep:cyw43-pio", "dep:trouble-host"]
-psram = ["dep:embedded-alloc"]
-overclock = []
-fps = []
 defmt = [
   "dep:defmt",
   "panic-probe/print-defmt",
@@ -73,14 +70,15 @@ panic-probe = "0.3"
 portable-atomic = { version = "1.11", features = ["critical-section"] }
 assign-resources = "0.5.0"
 
-defmt = { version = "1.0.1", optional = true }
-defmt-rtt = "1.1.0"
+defmt = { version = "0.3", optional = true }
+defmt-rtt = "0.4.2"
 
 embedded-sdmmc = { version = "0.9", default-features = false }
 st7365p-lcd = { git = "https://github.com/legitcamper/st7365p-lcd-rs", rev = "a784b9e6df0769371dfc522528e770cf8fc6403a" } # async branch
 embedded-graphics = { version = "0.8.1" }
 embedded-text = "0.7.2"
 embedded-layout = "0.4.2"
+kolibri-embedded-gui = "0.1.0"
 
 strum = { version = "0.27.2", default-features = false }
 rand = { version = "0.9.0", default-features = false }
@@ -92,9 +90,7 @@ spin = "0.10.0"
 num_enum = { version = "0.7.4", default-features = false }
 goblin = { version = "0.10.1", default-features = false, features = ["elf32"] }
 talc = "4.4.3"
-embedded-alloc = { version = "0.6.0", features = [
-  "allocator_api",
-], optional = true }
+embedded-alloc = { version = "0.6.0", features = ["allocator_api"] }
 bumpalo = "3.19.0"
 
 abi_sys = { path = "../abi_sys" }

kernel/src/abi.rs

@@ -1,21 +1,15 @@
 use abi_sys::{
     AllocAbi, CLayout, CPixel, DeallocAbi, DrawIterAbi, FileLen, GenRand, GetMsAbi, ListDir,
-    PrintAbi, ReadFile, RngRequest, SleepMsAbi, WriteFile, keyboard::*,
+    PrintAbi, ReadFile, RngRequest, SleepMsAbi, keyboard::*,
 };
 use alloc::{string::ToString, vec::Vec};
-use core::{ffi::c_char, ptr, sync::atomic::Ordering};
+use core::{alloc::GlobalAlloc, ffi::c_char, ptr, sync::atomic::Ordering};
 use embassy_rp::clocks::{RoscRng, clk_sys_freq};
 use embassy_time::Instant;
 use embedded_graphics::draw_target::DrawTarget;
 use embedded_sdmmc::LfnBuffer;
 use heapless::spsc::Queue;
 
-#[cfg(feature = "psram")]
-use crate::heap::HEAP;
-
-#[cfg(feature = "psram")]
-use core::alloc::GlobalAlloc;
-
 use crate::{
     display::FRAMEBUFFER,
     framebuffer::FB_PAUSED,
@@ -26,14 +20,10 @@ const _: AllocAbi = alloc;
 pub extern "C" fn alloc(layout: CLayout) -> *mut u8 {
     // SAFETY: caller guarantees layout is valid
     unsafe {
-        #[cfg(feature = "psram")]
-        {
-            return HEAP.alloc(layout.into());
-        }
-
-        #[cfg(not(feature = "psram"))]
-        {
-            return alloc::alloc::alloc(layout.into());
+        if cfg!(feature = "pimoroni2w") {
+            crate::heap::HEAP.alloc(layout.into())
+        } else {
+            alloc::alloc::alloc(layout.into())
         }
     }
 }
@@ -41,14 +31,12 @@ pub extern "C" fn alloc(layout: CLayout) -> *mut u8 {
 const _: DeallocAbi = dealloc;
 pub extern "C" fn dealloc(ptr: *mut u8, layout: CLayout) {
     // SAFETY: caller guarantees ptr and layout are valid
-    #[cfg(feature = "psram")]
-    {
-        unsafe { HEAP.dealloc(ptr, layout.into()) }
+    unsafe {
+        if cfg!(feature = "pimoroni2w") {
+            crate::heap::HEAP.dealloc(ptr, layout.into())
+        } else {
+            alloc::alloc::dealloc(ptr, layout.into())
         }
-
-    #[cfg(not(feature = "psram"))]
-    {
-        unsafe { alloc::alloc::dealloc(ptr, layout.into()) }
     }
 }
 
@@ -207,7 +195,6 @@ fn recurse_file<T>(
     dirs: &[&str],
     mut access: impl FnMut(&mut File) -> T,
 ) -> Result<T, ()> {
-    defmt::info!("dir: {}, dirs: {}", dir, dirs);
     if dirs.len() == 1 {
         let mut b = [0_u8; 50];
         let mut buf = LfnBuffer::new(&mut b);
@@ -219,8 +206,7 @@ fn recurse_file<T>(
                 }
             }
         })
-        .expect("Failed to iterate dir");
-
+        .unwrap();
         if let Some(name) = short_name {
             let mut file = dir
                 .open_file_in_dir(name, embedded_sdmmc::Mode::ReadWriteAppend)
@@ -244,17 +230,7 @@ pub extern "C" fn read_file(
 ) -> usize {
     // SAFETY: caller guarantees `ptr` is valid for `len` bytes
     let file = unsafe { core::str::from_raw_parts(str, len) };
-
-    let mut components: [&str; 8] = [""; 8];
-    let mut count = 0;
-    for part in file.split('/') {
-        if count >= components.len() {
-            break;
-        }
-        components[count] = part;
-        count += 1;
-    }
-
+    let file: Vec<&str> = file.split('/').collect();
     // SAFETY: caller guarantees `ptr` is valid for `len` bytes
     let mut buf = unsafe { core::slice::from_raw_parts_mut(buf, buf_len) };
 
@@ -264,8 +240,8 @@ pub extern "C" fn read_file(
     let sd = guard.as_mut().unwrap();
     if !file.is_empty() {
         sd.access_root_dir(|root| {
-            if let Ok(result) = recurse_file(&root, &components[1..count], |file| {
-                file.seek_from_start(start_from as u32).unwrap_or(());
+            if let Ok(result) = recurse_file(&root, &file[1..], |file| {
+                file.seek_from_start(start_from as u32).unwrap();
                 file.read(&mut buf).unwrap()
             }) {
                 read = result
@@ -275,46 +251,9 @@ pub extern "C" fn read_file(
     read
 }
 
-const _: WriteFile = write_file;
-pub extern "C" fn write_file(
-    str: *const u8,
-    len: usize,
-    start_from: usize,
-    buf: *const u8,
-    buf_len: usize,
-) {
-    // SAFETY: caller guarantees str ptr is valid for `len` bytes
-    let file = unsafe { core::str::from_raw_parts(str, len) };
-
-    let mut components: [&str; 8] = [""; 8];
-    let mut count = 0;
-    for part in file.split('/') {
-        if count >= components.len() {
-            break;
-        }
-        components[count] = part;
-        count += 1;
-    }
-
-    // SAFETY: caller guarantees buf ptr is valid for `buf_len` bytes
-    let buf = unsafe { core::slice::from_raw_parts(buf, buf_len) };
-
-    let mut guard = SDCARD.get().try_lock().expect("Failed to get sdcard");
-    let sd = guard.as_mut().unwrap();
-    if !file.is_empty() {
-        sd.access_root_dir(|root| {
-            recurse_file(&root, &components[1..count], |file| {
-                file.seek_from_start(start_from as u32).unwrap();
-                file.write(&buf).unwrap()
-            })
-            .unwrap_or(())
-        });
-    };
-}
-
 const _: FileLen = file_len;
 pub extern "C" fn file_len(str: *const u8, len: usize) -> usize {
-    // SAFETY: caller guarantees str ptr is valid for `len` bytes
+    // SAFETY: caller guarantees `ptr` is valid for `len` bytes
     let file = unsafe { core::str::from_raw_parts(str, len) };
     let file: Vec<&str> = file.split('/').collect();
 

kernel/src/display.rs

@@ -15,12 +15,6 @@ use embedded_graphics::{
 use embedded_hal_bus::spi::ExclusiveDevice;
 use st7365p_lcd::ST7365P;
 
-#[cfg(feature = "psram")]
-use crate::heap::HEAP;
-
-#[cfg(feature = "fps")]
-pub use framebuffer::fps::{FPS_CANVAS, FPS_COUNTER};
-
 type DISPLAY = ST7365P<
     ExclusiveDevice<Spi<'static, SPI1, Async>, Output<'static>, Delay>,
     Output<'static>,
@@ -35,21 +29,18 @@ pub static mut FRAMEBUFFER: Option<AtomicFrameBuffer> = None;
 
 fn init_fb() {
     unsafe {
-        #[cfg(feature = "psram")]
-        {
-            let slab = HEAP.alloc(Layout::array::<u16>(framebuffer::SIZE).unwrap()) as *mut u16;
+        FRAMEBUFFER = Some(if cfg!(not(feature = "pimoroni2w")) {
+            static mut BUF: [u16; framebuffer::SIZE] = [0; framebuffer::SIZE];
+            AtomicFrameBuffer::new(&mut BUF)
+        } else {
+            let slab = crate::heap::HEAP.alloc(Layout::array::<u16>(framebuffer::SIZE).unwrap())
+                as *mut u16;
             let buf = core::slice::from_raw_parts_mut(slab, framebuffer::SIZE);
 
             let mut fb = AtomicFrameBuffer::new(buf);
             fb.clear(Rgb565::BLACK).unwrap();
-            FRAMEBUFFER = Some(fb);
-        }
-
-        #[cfg(not(feature = "psram"))]
-        {
-            static mut BUF: [u16; framebuffer::SIZE] = [0; framebuffer::SIZE];
-            FRAMEBUFFER = Some(AtomicFrameBuffer::new(&mut BUF));
-        }
+            fb
+        });
     }
 }
 
@@ -87,21 +78,7 @@ pub async fn init_display(
 
 #[embassy_executor::task]
 pub async fn display_handler(mut display: DISPLAY) {
-    use embassy_time::{Instant, Timer};
-
-    // Target ~60 Hz refresh (≈16.67 ms per frame)
-    const FRAME_TIME_MS: u64 = 1000 / 60;
-
     loop {
-        let start = Instant::now();
-
-        #[cfg(feature = "fps")]
-        unsafe {
-            if FPS_COUNTER.should_draw() {
-                FPS_CANVAS.draw_fps().await;
-            }
-        }
-
         if !FB_PAUSED.load(Ordering::Acquire) {
             unsafe {
                 FRAMEBUFFER
@@ -109,15 +86,11 @@ pub async fn display_handler(mut display: DISPLAY) {
                     .unwrap()
                     .partial_draw(&mut display)
                     .await
-                    .unwrap();
-            }
+                    .unwrap()
+            };
         }
 
-        let elapsed = start.elapsed().as_millis() as u64;
-        if elapsed < FRAME_TIME_MS {
-            Timer::after_millis(FRAME_TIME_MS - elapsed).await;
-        } else {
-            Timer::after_millis(1).await;
-        }
+        // small yield to allow other tasks to run
+        Timer::after_nanos(500).await;
     }
 }

kernel/src/elf.rs

@@ -206,7 +206,6 @@ fn patch_abi(
                             CallTable::GenRand => abi::gen_rand as usize,
                             CallTable::ListDir => abi::list_dir as usize,
                             CallTable::ReadFile => abi::read_file as usize,
-                            CallTable::WriteFile => abi::write_file as usize,
                             CallTable::FileLen => abi::file_len as usize,
                         };
                         unsafe {

kernel/src/framebuffer.rs

@@ -13,9 +13,6 @@ use embedded_hal_2::digital::OutputPin;
 use embedded_hal_async::{delay::DelayNs, spi::SpiDevice};
 use st7365p_lcd::ST7365P;
 
-#[cfg(feature = "fps")]
-use fps::{FPS_CANVAS, FPS_CANVAS_HEIGHT, FPS_CANVAS_WIDTH, FPS_CANVAS_X, FPS_CANVAS_Y};
-
 const TILE_SIZE: usize = 16; // 16x16 tile
 const TILE_COUNT: usize = (SCREEN_WIDTH / TILE_SIZE) * (SCREEN_HEIGHT / TILE_SIZE); // 400 tiles
 const NUM_TILE_ROWS: usize = SCREEN_WIDTH / TILE_SIZE;
@@ -133,34 +130,9 @@ impl<'a> AtomicFrameBuffer<'a> {
             tile.store(false, Ordering::Release);
         }
 
-        #[cfg(feature = "fps")]
-        unsafe {
-            crate::display::FPS_COUNTER.measure()
-        }
-
         Ok(())
     }
 
-    // used when doing a full screen refresh fps must be drawn into fb
-    // unfortunately it is not garenteed to not be drawn over before
-    // being pushed to the display
-    #[cfg(feature = "fps")]
-    pub fn draw_fps_into_fb(&mut self) {
-        unsafe {
-            let canvas = &FPS_CANVAS.canvas;
-
-            for y in 0..FPS_CANVAS_HEIGHT {
-                let fb_y = FPS_CANVAS_Y + y;
-                let fb_row_start = fb_y * SCREEN_WIDTH + FPS_CANVAS_X;
-                let canvas_row_start = y * FPS_CANVAS_WIDTH;
-
-                self.fb[fb_row_start..fb_row_start + FPS_CANVAS_WIDTH].copy_from_slice(
-                    &canvas[canvas_row_start..canvas_row_start + FPS_CANVAS_WIDTH],
-                );
-            }
-        }
-    }
-
     // copy N tiles horizontally to the right into batch tile buf
     fn append_tiles_to_batch(
         &mut self,
@@ -180,45 +152,6 @@ impl<'a> AtomicFrameBuffer<'a> {
                 &self.fb[fb_row_offset..fb_row_offset + (total_tiles as usize * TILE_SIZE)];
 
             batch_row.copy_from_slice(fb_row);
-
-            // override fps pixel region with fps
-            // avoids writing to fps, and having it overridden before draw
-            #[cfg(feature = "fps")]
-            {
-                let global_y = tile_y as usize * TILE_SIZE + batch_row_num;
-
-                if global_y >= FPS_CANVAS_Y && global_y < FPS_CANVAS_Y + FPS_CANVAS_HEIGHT {
-                    let start_x = tile_x as usize * TILE_SIZE;
-                    let end_x = start_x + (total_tiles as usize * TILE_SIZE);
-
-                    // horizontal overlap check
-                    let fps_x0 = FPS_CANVAS_X;
-                    let fps_x1 = FPS_CANVAS_X + FPS_CANVAS_WIDTH;
-
-                    let x0 = start_x.max(fps_x0);
-                    let x1 = end_x.min(fps_x1);
-
-                    if x1 > x0 {
-                        let row_in_fps = global_y - FPS_CANVAS_Y;
-                        let fps_off = row_in_fps
-                            .checked_mul(FPS_CANVAS_WIDTH)
-                            .and_then(|v| v.checked_add(x0 - fps_x0));
-                        let batch_off = x0 - start_x;
-                        let len = x1 - x0;
-
-                        if let Some(fps_off) = fps_off {
-                            let fps_len_ok = fps_off + len <= unsafe { FPS_CANVAS.canvas.len() };
-                            let batch_len_ok = batch_off + len <= batch_row.len();
-
-                            if fps_len_ok && batch_len_ok {
-                                batch_row[batch_off..batch_off + len].copy_from_slice(unsafe {
-                                    &FPS_CANVAS.canvas[fps_off..fps_off + len]
-                                });
-                            }
-                        }
-                    }
-                }
-            }
         }
     }
 
@@ -234,25 +167,9 @@ impl<'a> AtomicFrameBuffer<'a> {
         DELAY: DelayNs,
     {
         if self.should_full_draw() {
-            #[cfg(feature = "fps")]
-            self.draw_fps_into_fb();
             return self.draw(display).await;
         }
 
-        #[cfg(feature = "fps")]
-        {
-            let fps_tile_x = FPS_CANVAS_X / TILE_SIZE;
-            let fps_tile_y = FPS_CANVAS_Y / TILE_SIZE;
-            let fps_tile_w = (FPS_CANVAS_WIDTH + TILE_SIZE - 1) / TILE_SIZE;
-            let fps_tile_h = (FPS_CANVAS_HEIGHT + TILE_SIZE - 1) / TILE_SIZE;
-
-            for ty in fps_tile_y..fps_tile_y + fps_tile_h {
-                for tx in fps_tile_x..fps_tile_x + fps_tile_w {
-                    self.dirty_tiles[ty * NUM_TILE_COLS + tx].store(true, Ordering::Release);
-                }
-            }
-        }
-
         for tile_row in 0..NUM_TILE_ROWS {
             let row_start_idx = tile_row * NUM_TILE_COLS;
             let mut col = 0;
@@ -299,11 +216,6 @@ impl<'a> AtomicFrameBuffer<'a> {
             }
         }
 
-        #[cfg(feature = "fps")]
-        unsafe {
-            crate::display::FPS_COUNTER.measure()
-        }
-
         Ok(())
     }
 }
@@ -429,146 +341,3 @@ impl<'a> OriginDimensions for AtomicFrameBuffer<'a> {
         Size::new(SCREEN_WIDTH as u32, SCREEN_HEIGHT as u32)
     }
 }
-
-#[cfg(feature = "fps")]
-pub mod fps {
-    use crate::display::SCREEN_WIDTH;
-    use core::fmt::Write;
-    use embassy_time::{Duration, Instant};
-    use embedded_graphics::{
-        Drawable, Pixel,
-        draw_target::DrawTarget,
-        geometry::Point,
-        mono_font::{MonoTextStyle, ascii::FONT_8X13},
-        pixelcolor::Rgb565,
-        prelude::{IntoStorage, OriginDimensions, RgbColor, Size},
-        text::{Alignment, Text},
-    };
-
-    pub static mut FPS_COUNTER: FpsCounter = FpsCounter::new();
-    pub static mut FPS_CANVAS: FpsCanvas = FpsCanvas::new();
-
-    // "FPS: 120" = 8 len
-    const FPS_LEN: usize = 8;
-    pub const FPS_CANVAS_WIDTH: usize = (FONT_8X13.character_size.width + 4) as usize * FPS_LEN;
-    pub const FPS_CANVAS_HEIGHT: usize = FONT_8X13.character_size.height as usize;
-
-    // puts canvas in the top right of the display
-    // top left point of canvas
-    pub const FPS_CANVAS_X: usize = SCREEN_WIDTH - FPS_CANVAS_WIDTH;
-    pub const FPS_CANVAS_Y: usize = 0;
-
-    pub struct FpsCanvas {
-        pub canvas: [u16; FPS_CANVAS_HEIGHT * FPS_CANVAS_WIDTH],
-    }
-
-    impl FpsCanvas {
-        const fn new() -> Self {
-            Self {
-                canvas: [0; FPS_CANVAS_HEIGHT * FPS_CANVAS_WIDTH],
-            }
-        }
-
-        fn clear(&mut self) {
-            for p in &mut self.canvas {
-                *p = 0;
-            }
-        }
-
-        pub async fn draw_fps(&mut self) {
-            let mut buf: heapless::String<FPS_LEN> = heapless::String::new();
-            let fps = unsafe { FPS_COUNTER.smoothed };
-            let _ = write!(buf, "FPS: {}", fps as u8);
-
-            self.clear();
-            let text_style = MonoTextStyle::new(&FONT_8X13, Rgb565::WHITE);
-            Text::with_alignment(
-                buf.as_str(),
-                Point::new(
-                    FPS_CANVAS_WIDTH as i32 / 2,
-                    (FPS_CANVAS_HEIGHT as i32 + 8) / 2,
-                ),
-                text_style,
-                Alignment::Center,
-            )
-            .draw(self)
-            .unwrap();
-        }
-    }
-
-    impl DrawTarget for FpsCanvas {
-        type Error = ();
-        type Color = Rgb565;
-
-        fn draw_iter<I>(&mut self, pixels: I) -> Result<(), Self::Error>
-        where
-            I: IntoIterator<Item = Pixel<Self::Color>>,
-        {
-            for Pixel(point, color) in pixels {
-                if point.x < 0
-                    || point.x >= FPS_CANVAS_WIDTH as i32
-                    || point.y < 0
-                    || point.y >= FPS_CANVAS_HEIGHT as i32
-                {
-                    continue;
-                }
-
-                let index = (point.y as usize) * FPS_CANVAS_WIDTH + point.x as usize;
-                self.canvas[index] = color.into_storage();
-            }
-            Ok(())
-        }
-    }
-
-    impl OriginDimensions for FpsCanvas {
-        fn size(&self) -> Size {
-            Size::new(FPS_CANVAS_WIDTH as u32, FPS_CANVAS_HEIGHT as u32)
-        }
-    }
-
-    pub struct FpsCounter {
-        last_frame: Option<Instant>,
-        smoothed: f32,
-        last_draw: Option<Instant>,
-    }
-
-    impl FpsCounter {
-        pub const fn new() -> Self {
-            Self {
-                last_frame: None,
-                smoothed: 0.0,
-                last_draw: None,
-            }
-        }
-
-        // Is called once per frame or partial frame to update FPS
-        pub fn measure(&mut self) {
-            let now = Instant::now();
-
-            if let Some(last) = self.last_frame {
-                let dt_us = (now - last).as_micros() as f32;
-                if dt_us > 0.0 {
-                    let current = 1_000_000.0 / dt_us;
-                    self.smoothed = if self.smoothed == 0.0 {
-                        current
-                    } else {
-                        0.9 * self.smoothed + 0.1 * current
-                    };
-                }
-            }
-
-            self.last_frame = Some(now);
-        }
-
-        pub fn should_draw(&mut self) -> bool {
-            let now = Instant::now();
-            match self.last_draw {
-                Some(last) if now - last < Duration::from_millis(200) => false,
-                _ => {
-                    self.last_draw = Some(now);
-                    true
-                }
-            }
-        }
-    }
-}

kernel/src/main.rs

@@ -12,43 +12,36 @@ mod abi;
 mod display;
 mod elf;
 mod framebuffer;
+#[allow(unused)]
+mod heap;
 mod peripherals;
+#[allow(unused)]
+mod psram;
 mod scsi;
 mod storage;
 mod ui;
 mod usb;
 mod utils;
 
-#[cfg(feature = "psram")]
-#[allow(unused)]
-mod heap;
-#[cfg(feature = "psram")]
-#[allow(unused)]
-mod psram;
-
-#[cfg(feature = "psram")]
-use crate::{heap::HEAP, heap::init_qmi_psram_heap, psram::init_psram, psram::init_psram_qmi};
+#[cfg(feature = "pimoroni2w")]
+use crate::{heap::HEAP, heap::init_qmi_psram_heap, psram::init_psram_qmi};
 
 use crate::{
     abi::{KEY_CACHE, MS_SINCE_LAUNCH},
-    display::{FRAMEBUFFER, display_handler, init_display},
+    display::{display_handler, init_display},
+    elf::load_binary,
     peripherals::{
         conf_peripherals,
         keyboard::{KeyState, read_keyboard_fifo},
     },
-    scsi::MSC_SHUTDOWN,
+    psram::init_psram,
     storage::{SDCARD, SdCard},
-    ui::{SELECTIONS, clear_selection, ui_handler},
+    ui::{clear_screen, ui_handler},
+    usb::usb_handler,
 };
-use abi_sys::EntryFn;
-use bumpalo::Bump;
-use core::sync::atomic::{AtomicBool, Ordering};
 use embassy_executor::{Executor, Spawner};
-use embassy_futures::{join::join, select::select};
 use embassy_rp::{
     Peri,
-    clocks::ClockConfig,
-    config::Config,
     gpio::{Input, Level, Output, Pull},
     i2c::{self, I2c},
     multicore::{Stack, spawn_core1},
@@ -66,12 +59,8 @@ use embassy_sync::{
     blocking_mutex::raw::CriticalSectionRawMutex, channel::Channel, signal::Signal,
 };
 use embassy_time::{Delay, Duration, Instant, Ticker, Timer};
-use embedded_graphics::{
-    pixelcolor::Rgb565,
-    prelude::{DrawTarget, RgbColor},
-};
 use embedded_hal_bus::spi::ExclusiveDevice;
-use embedded_sdmmc::SdCard as SdmmcSdCard;
+use embedded_sdmmc::{SdCard as SdmmcSdCard, ShortFileName};
 use static_cell::StaticCell;
 use talc::*;
 use {defmt_rtt as _, panic_probe as _};
@@ -116,18 +105,9 @@ async fn watchdog_task(mut watchdog: Watchdog) {
     }
 }
 
-static ENABLE_UI: AtomicBool = AtomicBool::new(true);
-static UI_CHANGE: Signal<CriticalSectionRawMutex, ()> = Signal::new();
-
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) {
-    let p = if cfg!(feature = "overclock") {
-        let clocks = ClockConfig::system_freq(300_000_000).unwrap();
-        let config = Config::new(clocks);
-        embassy_rp::init(config)
-    } else {
-        embassy_rp::init(Default::default())
-    };
+    let p = embassy_rp::init(Default::default());
 
     spawn_core1(
         p.CORE1,
@@ -182,39 +162,25 @@ async fn main(_spawner: Spawner) {
 }
 
 // One-slot channel to pass EntryFn from core1
-static BINARY_CH: Channel<CriticalSectionRawMutex, (EntryFn, Bump), 1> = Channel::new();
+static BINARY_CH: Channel<CriticalSectionRawMutex, ShortFileName, 1> = Channel::new();
 
 // runs dynamically loaded elf files
 #[embassy_executor::task]
 async fn userland_task() {
     let recv = BINARY_CH.receiver();
     loop {
-        let (entry, _bump) = recv.receive().await;
+        let name = recv.receive().await;
+        let (entry, _bump) = unsafe { load_binary(&name).await.expect("unable to load binary") };
 
-        // disable kernel ui
-        {
-            ENABLE_UI.store(false, Ordering::Release);
-            UI_CHANGE.signal(());
-
-            clear_selection().await;
-
-            MSC_SHUTDOWN.signal(());
-        }
+        clear_screen().await;
 
         unsafe { MS_SINCE_LAUNCH = Some(Instant::now()) };
         #[cfg(feature = "defmt")]
         defmt::info!("Executing Binary");
         entry();
 
-        // enable kernel ui
-        {
-            ENABLE_UI.store(true, Ordering::Release);
-            UI_CHANGE.signal(());
-            unsafe { FRAMEBUFFER.as_mut().unwrap().clear(Rgb565::BLACK).unwrap() };
-
-            let mut selections = SELECTIONS.lock().await;
-            selections.set_changed(true);
-        }
+        STOP_KEY_HANDLER.signal(());
+        clear_screen().await;
     }
 }
 
@@ -263,7 +229,7 @@ async fn setup_mcu(mcu: Mcu) {
 
 async fn setup_display(display: Display, spawner: Spawner) {
     let mut config = spi::Config::default();
-    config.frequency = 192_000_000;
+    config.frequency = 64_000_000;
     let spi = Spi::new(
         display.spi,
         display.clk,
@@ -279,22 +245,23 @@ async fn setup_display(display: Display, spawner: Spawner) {
 
 // psram is kind of useless on the pico calc
 // ive opted to use the pimoroni with on onboard xip psram instead
-// async fn setup_psram(psram: Psram) {
-//     let psram = init_psram(
-//         psram.pio, psram.sclk, psram.mosi, psram.miso, psram.cs, psram.dma1, psram.dma2,
-//     )
-//     .await;
+#[allow(unused)]
+async fn setup_psram(psram: Psram) {
+    let psram = init_psram(
+        psram.pio, psram.sclk, psram.mosi, psram.miso, psram.cs, psram.dma1, psram.dma2,
+    )
+    .await;
 
-//     #[cfg(feature = "defmt")]
-//     defmt::info!("psram size: {}", psram.size);
+    #[cfg(feature = "defmt")]
+    defmt::info!("psram size: {}", psram.size);
 
-//     if psram.size == 0 {
-//         #[cfg(feature = "defmt")]
-//         defmt::info!("\u{1b}[1mExternal PSRAM was NOT found!\u{1b}[0m");
-//     }
-// }
+    if psram.size == 0 {
+        #[cfg(feature = "defmt")]
+        defmt::info!("\u{1b}[1mExternal PSRAM was NOT found!\u{1b}[0m");
+    }
+}
 
-#[cfg(feature = "psram")]
+#[cfg(feature = "pimoroni2w")]
 async fn setup_qmi_psram() {
     Timer::after_millis(250).await;
     let psram_qmi_size = init_psram_qmi(&embassy_rp::pac::QMI, &embassy_rp::pac::XIP_CTRL);
@@ -320,7 +287,7 @@ async fn setup_sd(sd: Sd) {
     let device = ExclusiveDevice::new(spi, cs, Delay).unwrap();
     let sdcard = SdmmcSdCard::new(device, Delay);
 
-    config.frequency = 32_000_000;
+    config.frequency = 64_000_000;
     sdcard.spi(|dev| dev.bus_mut().set_config(&config));
     SDCARD.get().lock().await.replace(SdCard::new(sdcard, det));
 }
@@ -339,62 +306,48 @@ async fn kernel_task(
         .spawn(watchdog_task(Watchdog::new(watchdog)))
         .unwrap();
 
-    #[cfg(feature = "debug")]
-    defmt::info!("Clock: {}", embassy_rp::clocks::clk_sys_freq());
-
     setup_mcu(mcu).await;
 
-    #[cfg(feature = "defmt")]
     defmt::info!("setting up psram");
     Timer::after_millis(100).await;
 
     // setup_psram(psram).await;
-    #[cfg(feature = "psram")]
+    #[cfg(feature = "pimoroni2w")]
     setup_qmi_psram().await;
 
     Timer::after_millis(100).await;
     setup_display(display, spawner).await;
     setup_sd(sd).await;
 
-    let _usb = embassy_rp_usb::Driver::new(usb, Irqs);
-    // spawner.spawn(usb_handler(usb)).unwrap();
+    let usb_driver = embassy_rp_usb::Driver::new(usb, Irqs);
+    spawner.spawn(usb_handler(usb_driver)).unwrap();
 
+    let mut ui_enabled = true;
     loop {
-        let ui_enabled = ENABLE_UI.load(Ordering::Relaxed);
         if ui_enabled {
-            select(join(ui_handler(), prog_search_handler()), UI_CHANGE.wait()).await;
+            ui_handler().await;
         } else {
-            select(key_handler(), UI_CHANGE.wait()).await;
+            key_handler().await;
         }
+        ui_enabled ^= true // flip bool
     }
 }
 
-async fn prog_search_handler() {
-    loop {
-        {
-            let mut guard = SDCARD.get().lock().await;
-            let sd = guard.as_mut().unwrap();
-
-            let mut files = sd.list_files_by_extension(".bin").unwrap();
-            files.sort();
-            let mut select = SELECTIONS.lock().await;
-
-            if *select.selections() != files {
-                select.update_selections(files);
-                select.reset();
-            }
-        }
-        Timer::after_secs(5).await;
-    }
-}
+static STOP_KEY_HANDLER: Signal<CriticalSectionRawMutex, ()> = Signal::new();
 
 async fn key_handler() {
     loop {
+        if STOP_KEY_HANDLER.try_take().is_some() {
+            break;
+        }
+
         if let Some(event) = read_keyboard_fifo().await {
+            if let KeyState::Pressed = event.state {
                 unsafe {
                     let _ = KEY_CACHE.enqueue(event);
                 }
             }
+        }
         Timer::after_millis(50).await;
     }
 }

kernel/src/scsi/error.rs

@@ -0,0 +1,100 @@
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
+#[derive(Clone, Copy, Debug)]
+pub struct ScsiSense {
+    pub key: u8,
+    pub asc: u8,
+    pub ascq: u8,
+}
+
+impl ScsiSense {
+    pub const fn new(key: u8, asc: u8, ascq: u8) -> Self {
+        Self { key, asc, ascq }
+    }
+
+    // --- Sense Key constants ---
+    pub const KEY_NO_SENSE: u8 = 0x00;
+    pub const KEY_RECOVERED_ERROR: u8 = 0x01;
+    pub const KEY_NOT_READY: u8 = 0x02;
+    pub const KEY_MEDIUM_ERROR: u8 = 0x03;
+    pub const KEY_HARDWARE_ERROR: u8 = 0x04;
+    pub const KEY_ILLEGAL_REQUEST: u8 = 0x05;
+    pub const KEY_UNIT_ATTENTION: u8 = 0x06;
+    pub const KEY_DATA_PROTECT: u8 = 0x07;
+    pub const KEY_BLANK_CHECK: u8 = 0x08;
+    pub const KEY_VENDOR_SPECIFIC: u8 = 0x09;
+    pub const KEY_COPY_ABORTED: u8 = 0x0A;
+    pub const KEY_ABORTED_COMMAND: u8 = 0x0B;
+    pub const KEY_VOLUME_OVERFLOW: u8 = 0x0D;
+    pub const KEY_MISCOMPARE: u8 = 0x0E;
+
+    // --- Common ASC/ASCQ pairs (subset of most-used codes) ---
+    pub const ASC_NO_ADDITIONAL_SENSE: u8 = 0x00;
+
+    // Medium errors
+    pub const ASC_UNRECOVERED_READ_ERROR: u8 = 0x11;
+    pub const ASCQ_UNRECOVERED_READ_ERROR: u8 = 0x00;
+    pub const ASC_UNRECOVERED_WRITE_ERROR: u8 = 0x03;
+    pub const ASCQ_UNRECOVERED_WRITE_ERROR: u8 = 0x01;
+    pub const ASC_WRITE_FAULT: u8 = 0x03;
+    pub const ASC_ID_CRC_ERROR: u8 = 0x10;
+
+    // Illegal requests
+    pub const ASC_INVALID_COMMAND_OPERATION_CODE: u8 = 0x20;
+    pub const ASC_LBA_OUT_OF_RANGE: u8 = 0x21;
+    pub const ASC_INVALID_FIELD_IN_CDB: u8 = 0x24;
+
+    // Not ready
+    pub const ASC_LOGICAL_UNIT_NOT_READY: u8 = 0x04;
+    pub const ASC_MEDIUM_NOT_PRESENT: u8 = 0x3A;
+
+    // Unit attention
+    pub const ASC_POWER_ON_RESET_OCCURRED: u8 = 0x29;
+    pub const ASC_MEDIUM_CHANGED: u8 = 0x28;
+
+    // Data protect
+    pub const ASC_WRITE_PROTECTED: u8 = 0x27;
+
+    // Aborted command
+    pub const ASC_COMMAND_ABORTED: u8 = 0x47;
+
+    // --- Helpers for common conditions ---
+    pub const fn no_sense() -> Self {
+        Self::new(Self::KEY_NO_SENSE, Self::ASC_NO_ADDITIONAL_SENSE, 0x00)
+    }
+
+    pub const fn invalid_cdb() -> Self {
+        Self::new(
+            Self::KEY_ILLEGAL_REQUEST,
+            Self::ASC_INVALID_FIELD_IN_CDB,
+            0x00,
+        )
+    }
+
+    pub const fn lba_out_of_range() -> Self {
+        Self::new(Self::KEY_ILLEGAL_REQUEST, Self::ASC_LBA_OUT_OF_RANGE, 0x00)
+    }
+
+    pub const fn medium_not_present() -> Self {
+        Self::new(Self::KEY_NOT_READY, Self::ASC_MEDIUM_NOT_PRESENT, 0x00)
+    }
+
+    pub const fn unrecovered_read_error() -> Self {
+        Self::new(
+            Self::KEY_MEDIUM_ERROR,
+            Self::ASC_UNRECOVERED_READ_ERROR,
+            Self::ASCQ_UNRECOVERED_READ_ERROR,
+        )
+    }
+
+    pub const fn unrecovered_write_error() -> Self {
+        Self::new(
+            Self::KEY_MEDIUM_ERROR,
+            Self::ASC_UNRECOVERED_WRITE_ERROR,
+            Self::ASCQ_UNRECOVERED_WRITE_ERROR,
+        )
+    }
+
+    pub const fn write_protected() -> Self {
+        Self::new(Self::KEY_DATA_PROTECT, Self::ASC_WRITE_PROTECTED, 0x00)
+    }
+}

kernel/src/scsi/mod.rs

@@ -1,7 +1,6 @@
-use embassy_futures::select::select;
-use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
-use embassy_sync::lazy_lock::LazyLock;
-use embassy_sync::signal::Signal;
+use crate::storage::{SDCARD, SdCard};
+use core::sync::atomic::{AtomicBool, Ordering};
+use embassy_time::Timer;
 use embassy_usb::Builder;
 use embassy_usb::driver::{Driver, EndpointIn, EndpointOut};
 use embedded_sdmmc::{Block, BlockIdx};
@@ -9,29 +8,32 @@ use heapless::Vec;
 
 mod scsi_types;
 use scsi_types::*;
-
-use crate::storage::{SDCARD, SdCard};
+#[allow(unused)]
+mod error;
+use error::ScsiSense;
 
 const BULK_ENDPOINT_PACKET_SIZE: usize = 64;
 
-pub static MSC_SHUTDOWN: Signal<CriticalSectionRawMutex, ()> = Signal::new();
+// indicates that a scsi transaction is occurring and is
+// NOT safe to disable usb, or acquire sdcard
+pub static SCSI_BUSY: AtomicBool = AtomicBool::new(false);
 
-// number of blocks to read from sd at once
-// higher is better, but is larger. Size is BLOCKS * 512 bytes
-const BLOCKS: usize = 32;
-static mut BLOCK_BUF: LazyLock<[Block; BLOCKS]> =
-    LazyLock::new(|| core::array::from_fn(|_| Block::new()));
+// stop scsi and return sdcard when safe to do so
+pub static SCSI_HALT: AtomicBool = AtomicBool::new(false);
+
+pub static SCSI_EJECTED: AtomicBool = AtomicBool::new(false);
 
 pub struct MassStorageClass<'d, D: Driver<'d>> {
     temp_sd: Option<SdCard>, // temporary owns sdcard when scsi is running
-    ejected: bool,
-    pending_eject: bool,
     bulk_out: D::EndpointOut,
     bulk_in: D::EndpointIn,
+    last_sense: ScsiSense,
+    prevent_removal: bool,
+    pending_eject: bool,
 }
 
 impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
-    pub fn new(builder: &mut Builder<'d, D>, temp_sd: Option<SdCard>) -> Self {
+    pub fn new(builder: &mut Builder<'d, D>) -> Self {
         let mut function = builder.function(0x08, SUBCLASS_SCSI, 0x50); // Mass Storage class
         let mut interface = function.interface();
         let mut alt = interface.alt_setting(0x08, SUBCLASS_SCSI, 0x50, None);
@@ -40,32 +42,56 @@ impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
         let bulk_in = alt.endpoint_bulk_in(None, BULK_ENDPOINT_PACKET_SIZE as u16);
 
         Self {
-            temp_sd,
-            pending_eject: false,
-            ejected: false,
+            temp_sd: None,
             bulk_out,
             bulk_in,
+            last_sense: ScsiSense::no_sense(),
+            prevent_removal: false,
+            pending_eject: false,
+        }
+    }
+
+    // Take sdcard to increase speed
+    pub async fn take_sdcard(&mut self) {
+        if self.temp_sd.is_none() {
+            let mut guard = SDCARD.get().lock().await;
+            if let Some(sd) = guard.take() {
+                self.temp_sd = Some(sd);
+            } else {
+                panic!("Tried to take SDCARD but it was already taken");
+            }
+        }
+    }
+
+    // return sdcard to global, so other tasks can use it
+    pub async fn return_sdcard(&mut self) {
+        if let Some(card) = self.temp_sd.take() {
+            let mut guard = SDCARD.get().lock().await;
+            *guard = Some(card);
         }
     }
 
     pub async fn poll(&mut self) {
         loop {
-            if !self.ejected {
-                select(self.handle_cbw(), MSC_SHUTDOWN.wait()).await;
-
-                if MSC_SHUTDOWN.signaled() {
-                    #[cfg(feature = "defmt")]
-                    defmt::info!("MSC shutting down");
-
+            if !self.prevent_removal && (SCSI_HALT.load(Ordering::Acquire) || self.pending_eject) {
                 if self.temp_sd.is_some() {
-                        let mut guard = SDCARD.get().lock().await;
-                        guard.replace(self.temp_sd.take().unwrap()).unwrap();
+                    self.return_sdcard().await;
+                    SCSI_BUSY.store(false, Ordering::Release);
+                    self.pending_eject = false;
+                }
+            } else {
+                self.handle_cbw().await;
             }
 
-                    self.ejected = true;
-
-                    return;
+            if SCSI_EJECTED.load(Ordering::Acquire) {
+                Timer::after_millis(100).await;
+                continue;
             }
+
+            if SCSI_BUSY.load(Ordering::Relaxed) {
+                Timer::after_millis(1).await;
+            } else {
+                Timer::after_millis(100).await;
             }
         }
     }
@@ -75,31 +101,19 @@ impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
         if let Ok(n) = self.bulk_out.read(&mut cbw_buf).await {
             if n == 31 {
                 if let Some(cbw) = CommandBlockWrapper::parse(&cbw_buf[..n]) {
-                    // Take sdcard to increase speed
-                    if self.temp_sd.is_none() {
-                        let mut guard = SDCARD.get().lock().await;
-                        if let Some(sd) = guard.take() {
-                            self.temp_sd = Some(sd);
-                        } else {
-                            #[cfg(feature = "defmt")]
-                            defmt::warn!("Tried to take SDCARD but it was already taken");
-                            return;
-                        }
-                    }
-
                     let command = parse_cb(&cbw.CBWCB);
                     if self.handle_command(command).await.is_ok() {
                         self.send_csw_success(cbw.dCBWTag).await
                     } else {
                         self.send_csw_fail(cbw.dCBWTag).await
                     }
-
-                    if self.pending_eject {
-                        if let ScsiCommand::Write { lba: _, len: _ } = command {
-                            MSC_SHUTDOWN.signal(());
-                        }
-                    }
+                } else {
+                    self.last_sense = ScsiSense::invalid_cdb();
+                    self.send_csw_fail(0).await;
                 }
+            } else {
+                self.last_sense = ScsiSense::invalid_cdb();
+                self.send_csw_fail(0).await;
             }
         }
     }
@@ -107,6 +121,12 @@ impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
     async fn handle_command(&mut self, command: ScsiCommand) -> Result<(), ()> {
         let mut response: Vec<u8, BULK_ENDPOINT_PACKET_SIZE> = Vec::new();
 
+        const BLOCK_SIZE: usize = 512;
+        // number of blocks to read from sd at once
+        // higher is better, but is larger. Size is BLOCKS * 512 bytes
+        const BLOCKS: usize = 10;
+        let mut block_buf: [Block; BLOCKS] = core::array::from_fn(|_| Block::new());
+
         match command {
             ScsiCommand::Unknown => Err(()),
             ScsiCommand::Inquiry {
@@ -186,16 +206,41 @@ impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
                 self.bulk_in.write(&response[..len]).await.map_err(|_| ())
             }
             ScsiCommand::TestUnitReady => {
-                if self.temp_sd.as_ref().unwrap().is_attached() {
+                if !SCSI_EJECTED.load(Ordering::Acquire) && self.temp_sd.is_none() {
+                    SCSI_BUSY.store(true, Ordering::Release);
+                    self.take_sdcard().await;
+                }
+
+                match &self.temp_sd {
+                    Some(sd) => {
+                        if sd.is_attached() {
                             Ok(())
                         } else {
+                            self.last_sense = ScsiSense::medium_not_present();
                             Err(())
                         }
                     }
-            ScsiCommand::RequestSense {
-                desc: _,
-                alloc_len: _,
-            } => Ok(()),
+                    None => {
+                        self.last_sense = ScsiSense::medium_not_present();
+                        Err(())
+                    }
+                }
+            }
+            ScsiCommand::RequestSense { desc: _, alloc_len } => {
+                // Prepare the buffer
+                let mut buf = [0u8; 18];
+
+                // Fixed format sense data
+                buf[0] = 0x70; // Response code, current errors
+                buf[2] = self.last_sense.key; // Sense Key
+                buf[7] = 0x0A; // Additional sense length (n-8)
+                buf[12] = self.last_sense.asc; // Additional Sense Code
+                buf[13] = self.last_sense.ascq; // Additional Sense Code Qualifier
+
+                let len = core::cmp::min(buf.len(), alloc_len as usize);
+                self.last_sense = ScsiSense::no_sense();
+                self.bulk_in.write(&buf[..len]).await.map_err(|_| ())
+            }
             ScsiCommand::ModeSense6 {
                 dbd: _,
                 page_control: _,
@@ -234,55 +279,74 @@ impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
 
                 self.bulk_in.write(&response[..len]).await.map_err(|_| ())
             }
-            ScsiCommand::ReadCapacity10 => {
-                let block_size = SdCard::BLOCK_SIZE as u64;
-                let total_blocks = self.temp_sd.as_ref().unwrap().size() / block_size;
+            ScsiCommand::ReadCapacity10 => match self.temp_sd.as_ref() {
+                Some(sd) => {
+                    let total_blocks = sd.size() / BLOCK_SIZE as u64;
 
                     let last_lba = total_blocks.checked_sub(1).unwrap_or(0);
 
                     response.extend_from_slice(&(last_lba as u32).to_be_bytes())?;
-                response.extend_from_slice(&(block_size as u32).to_be_bytes())?;
+                    response.extend_from_slice(&(BLOCK_SIZE as u32).to_be_bytes())?;
 
                     self.bulk_in.write(&response).await.map_err(|_| ())
                 }
-            ScsiCommand::ReadCapacity16 { alloc_len } => {
-                let block_size = SdCard::BLOCK_SIZE as u64;
-                let total_blocks = self.temp_sd.as_ref().unwrap().size() / block_size;
+                None => {
+                    self.last_sense = ScsiSense::medium_not_present();
+                    Err(())
+                }
+            },
+            ScsiCommand::ReadCapacity16 { alloc_len } => match self.temp_sd.as_ref() {
+                Some(sd) => {
+                    let total_blocks = sd.size() / BLOCK_SIZE as u64;
 
                     let last_lba = total_blocks.checked_sub(1).unwrap_or(0);
 
                     response.extend_from_slice(&last_lba.to_be_bytes())?; // 8 bytes last LBA
-                response.extend_from_slice(&(block_size as u32).to_be_bytes())?; // 4 bytes block length
+                    response.extend_from_slice(&(BLOCK_SIZE as u32).to_be_bytes())?; // 4 bytes block length
                     response.extend_from_slice(&[0u8; 20])?; // 20 reserved bytes zeroed
 
                     let len = alloc_len.min(response.len() as u32) as usize;
                     self.bulk_in.write(&response[..len]).await.map_err(|_| ())
                 }
-            ScsiCommand::Read { lba, len } => {
-                let sdcard = self.temp_sd.as_ref().unwrap();
-                let block_buf = unsafe { &mut *BLOCK_BUF.get_mut() };
+                None => {
+                    self.last_sense = ScsiSense::medium_not_present();
+                    Err(())
+                }
+            },
+            ScsiCommand::Read { lba, len } => match self.temp_sd.as_ref() {
+                Some(sd) => {
                     let mut blocks = len;
                     let mut idx = lba;
 
+                    let mut error_occurred = false;
+
                     while blocks > 0 {
                         if blocks >= block_buf.len() as u64 {
-                        sdcard.read_blocks(block_buf, BlockIdx(idx as u32))?;
+                            sd.read_blocks(&mut block_buf, BlockIdx(idx as u32))?;
 
-                        for block in &mut *block_buf {
-                            for chunk in block.contents.chunks(BULK_ENDPOINT_PACKET_SIZE.into()) {
-                                self.bulk_in.write(chunk).await.map_err(|_| ())?;
+                            for block in &mut block_buf {
+                                for chunk in block.contents.chunks(BULK_ENDPOINT_PACKET_SIZE.into())
+                                {
+                                    if self.bulk_in.write(chunk).await.map_err(|_| ()).is_err() {
+                                        error_occurred = true
+                                    }
                                 }
                             }
 
                             blocks -= block_buf.len() as u64;
                             idx += block_buf.len() as u64;
                         } else {
-                        sdcard
-                            .read_blocks(&mut block_buf[..blocks as usize], BlockIdx(idx as u32))?;
+                            sd.read_blocks(
+                                &mut block_buf[..blocks as usize],
+                                BlockIdx(idx as u32),
+                            )?;
 
                             for block in &block_buf[..blocks as usize] {
-                            for chunk in block.contents.chunks(BULK_ENDPOINT_PACKET_SIZE.into()) {
-                                self.bulk_in.write(chunk).await.map_err(|_| ())?;
+                                for chunk in block.contents.chunks(BULK_ENDPOINT_PACKET_SIZE.into())
+                                {
+                                    if self.bulk_in.write(chunk).await.map_err(|_| ()).is_err() {
+                                        error_occurred = true
+                                    }
                                 }
                             }
 
@@ -290,36 +354,54 @@ impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
                             blocks = 0;
                         }
                     }
+
+                    if error_occurred {
+                        self.last_sense = ScsiSense::unrecovered_read_error();
+                        return Err(());
+                    }
+
                     Ok(())
                 }
-            ScsiCommand::Write { lba, len } => {
-                let sdcard = self.temp_sd.as_ref().unwrap();
-                let block_buf = unsafe { &mut *BLOCK_BUF.get_mut() };
+                None => {
+                    self.last_sense = ScsiSense::medium_not_present();
+                    Err(())
+                }
+            },
+            ScsiCommand::Write { lba, len } => match self.temp_sd.as_ref() {
+                Some(sd) => {
                     let mut blocks = len;
                     let mut idx = lba;
 
+                    let mut error_occurred = false;
+
                     while blocks > 0 {
                         if blocks >= block_buf.len() as u64 {
                             for block in block_buf.as_mut() {
-                            for chunk in block.contents.chunks_mut(BULK_ENDPOINT_PACKET_SIZE.into())
+                                for chunk in
+                                    block.contents.chunks_mut(BULK_ENDPOINT_PACKET_SIZE.into())
                                 {
-                                self.bulk_out.read(chunk).await.map_err(|_| ())?;
+                                    if self.bulk_out.read(chunk).await.map_err(|_| ()).is_err() {
+                                        error_occurred = true
+                                    }
                                 }
                             }
 
-                        sdcard.read_blocks(block_buf, BlockIdx(idx as u32))?;
+                            sd.read_blocks(&mut block_buf, BlockIdx(idx as u32))?;
 
                             blocks -= block_buf.len() as u64;
                             idx += block_buf.len() as u64;
                         } else {
                             for block in block_buf[..blocks as usize].as_mut() {
-                            for chunk in block.contents.chunks_mut(BULK_ENDPOINT_PACKET_SIZE.into())
+                                for chunk in
+                                    block.contents.chunks_mut(BULK_ENDPOINT_PACKET_SIZE.into())
                                 {
-                                self.bulk_out.read(chunk).await.map_err(|_| ())?;
+                                    if self.bulk_out.read(chunk).await.map_err(|_| ()).is_err() {
+                                        error_occurred = true
+                                    }
                                 }
                             }
 
-                        sdcard.write_blocks(
+                            sd.write_blocks(
                                 &mut block_buf[..blocks as usize],
                                 BlockIdx(idx as u32),
                             )?;
@@ -328,11 +410,23 @@ impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
                             blocks = 0;
                         }
                     }
+
+                    if error_occurred {
+                        self.last_sense = ScsiSense::unrecovered_write_error();
+                        return Err(());
+                    }
+
                     Ok(())
                 }
-            ScsiCommand::ReadFormatCapacities { alloc_len } => {
+                None => {
+                    self.last_sense = ScsiSense::medium_not_present();
+                    Err(())
+                }
+            },
+            ScsiCommand::ReadFormatCapacities { alloc_len } => match self.temp_sd.as_ref() {
+                Some(sd) => {
                     let block_size = SdCard::BLOCK_SIZE as u32;
-                let num_blocks = (self.temp_sd.as_ref().unwrap().size() / block_size as u64) as u32;
+                    let num_blocks = (sd.size() / block_size as u64) as u32;
 
                     let mut response = [0u8; 12];
 
@@ -350,9 +444,18 @@ impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
                         .await
                         .map_err(|_| ())
                 }
-            ScsiCommand::PreventAllowMediumRemoval { prevent: _prevent } => Ok(()),
+                None => {
+                    self.last_sense = ScsiSense::medium_not_present();
+                    Err(())
+                }
+            },
+            ScsiCommand::PreventAllowMediumRemoval { prevent } => {
+                self.prevent_removal = prevent;
+                Ok(())
+            }
             ScsiCommand::StartStopUnit { start, load_eject } => {
                 if !start && load_eject {
+                    SCSI_EJECTED.store(true, Ordering::Release);
                     self.pending_eject = true;
                 }
                 Ok(())
@@ -366,7 +469,9 @@ impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
 
     pub async fn send_csw_fail(&mut self, tag: u32) {
         #[cfg(feature = "defmt")]
+        if tag != 0 {
             defmt::error!("Command Failed: {}", tag);
+        }
         self.send_csw(tag, 0x01, 0).await; // 0x01 = Command Failed
     }
 

kernel/src/storage.rs

@@ -35,24 +35,12 @@ impl TimeSource for DummyTimeSource {
     }
 }
 
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq)]
 pub struct FileName {
     pub long_name: String,
     pub short_name: ShortFileName,
 }
 
-impl PartialOrd for FileName {
-    fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
-        Some(self.long_name.cmp(&other.long_name))
-    }
-}
-
-impl Ord for FileName {
-    fn cmp(&self, other: &Self) -> core::cmp::Ordering {
-        self.long_name.cmp(&other.long_name)
-    }
-}
-
 pub struct SdCard {
     det: Input<'static>,
     volume_mgr: VolMgr,

kernel/src/ui.rs

@@ -1,18 +1,26 @@
 use crate::{
-    BINARY_CH, display::FRAMEBUFFER, elf::load_binary, framebuffer::FB_PAUSED,
-    peripherals::keyboard, storage::FileName,
+    BINARY_CH,
+    display::FRAMEBUFFER,
+    framebuffer::FB_PAUSED,
+    peripherals::keyboard,
+    scsi::SCSI_BUSY,
+    storage::{FileName, SDCARD},
 };
 use abi_sys::keyboard::{KeyCode, KeyState};
 use alloc::{str::FromStr, string::String, vec::Vec};
 use core::sync::atomic::Ordering;
 use embassy_sync::{blocking_mutex::raw::CriticalSectionRawMutex, mutex::Mutex};
+use embassy_time::Timer;
 use embedded_graphics::{
     Drawable,
-    mono_font::{MonoTextStyle, ascii::FONT_10X20},
+    mono_font::{
+        MonoTextStyle,
+        ascii::{FONT_4X6, FONT_10X20},
+    },
     pixelcolor::Rgb565,
     prelude::{Dimensions, Point, Primitive, RgbColor, Size},
     primitives::{PrimitiveStyle, Rectangle},
-    text::Text,
+    text::{Alignment, Text},
 };
 use embedded_layout::{
     align::{horizontal, vertical},
@@ -21,61 +29,130 @@ use embedded_layout::{
 };
 use embedded_text::TextBox;
 
-pub static SELECTIONS: Mutex<CriticalSectionRawMutex, SelectionList> =
-    Mutex::new(SelectionList::new());
-
 pub async fn ui_handler() {
-    loop {
-        if let Some(event) = keyboard::read_keyboard_fifo().await {
-            if let KeyState::Pressed = event.state {
-                match event.key {
-                    KeyCode::Up => {
-                        let mut selections = SELECTIONS.lock().await;
-                        selections.up();
-                    }
-                    KeyCode::Down => {
-                        let mut selections = SELECTIONS.lock().await;
-                        selections.down();
-                    }
-                    KeyCode::Enter | KeyCode::Right => {
-                        let selections = SELECTIONS.lock().await;
-                        let selection =
-                            selections.selections[selections.current_selection as usize].clone();
-
-                        let entry = unsafe {
-                            load_binary(&selection.short_name)
-                                .await
-                                .expect("unable to load binary")
+    let mut ui = UiState { page: UiPage::Menu };
+    let mut menu = MenuPage {
+        last_bounds: None,
+        selection: 0,
+        changed: true,
     };
-                        BINARY_CH.send(entry).await;
-                    }
-                    _ => (),
-                }
-            }
+    let mut scsi = ScsiPage { last_bounds: None };
+    update_selections().await;
+
+    loop {
+        // reset page, if usb was disabled internally
+        if ui.page == UiPage::Scsi && !SCSI_BUSY.load(Ordering::Acquire) {
+            scsi.clear().await;
+            ui.page = UiPage::Menu;
+        } else if ui.page == UiPage::Menu && SCSI_BUSY.load(Ordering::Acquire) {
+            menu.clear().await;
+            ui.page = UiPage::Scsi;
         }
 
-        let changed = SELECTIONS.lock().await.changed;
-        if changed {
-            clear_selection().await;
-            draw_selection().await;
+        if input_handler(&mut ui, &mut menu, &mut scsi).await {
+            return;
         }
+        match ui.page {
+            UiPage::Menu => menu.draw().await,
+            UiPage::Scsi => scsi.draw().await,
+        }
+        Timer::after_millis(5).await;
     }
 }
 
-pub async fn clear_selection() {
-    let sel = SELECTIONS.lock().await;
+async fn input_handler(ui: &mut UiState, menu: &mut MenuPage, scsi: &mut ScsiPage) -> bool {
+    if let Some(event) = keyboard::read_keyboard_fifo().await {
+        if event.state == KeyState::Pressed {
+            match (&mut ui.page, event.key) {
+                (UiPage::Menu, _) => return menu.handle_input(event.key).await,
+                (UiPage::Scsi, _) => return scsi.handle_input(event.key).await,
+            }
+        }
+    }
+    false
+}
 
-    if let Some(area) = sel.last_bounds {
-        Rectangle::new(area.top_left, area.size)
-            .into_styled(PrimitiveStyle::with_fill(Rgb565::BLACK))
-            .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
-            .unwrap();
+#[derive(PartialEq)]
+enum UiPage {
+    Menu,
+    Scsi,
+}
+
+struct UiState {
+    page: UiPage,
+}
+
+trait Page {
+    async fn draw(&mut self);
+    async fn handle_input(&mut self, key: KeyCode) -> bool;
+    async fn clear(&mut self);
+}
+
+struct ScsiPage {
+    last_bounds: Option<Rectangle>,
+}
+
+impl Page for ScsiPage {
+    async fn draw(&mut self) {
+        let text_style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
+        let fb = unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() };
+        let bounds = fb.bounding_box();
+
+        let text = Text::with_alignment(
+            "Usb Mass storage enabled",
+            bounds.center(),
+            text_style,
+            Alignment::Center,
+        );
+
+        self.last_bounds = Some(text.bounds());
+        text.draw(fb).unwrap();
+    }
+
+    async fn handle_input(&mut self, _key: KeyCode) -> bool {
+        false
+    }
+
+    async fn clear(&mut self) {
+        if let Some(rect) = self.last_bounds {
+            clear_rect(rect).await;
+        }
+        self.last_bounds = None;
     }
 }
 
-async fn draw_selection() {
-    let mut guard = SELECTIONS.lock().await;
-    let file_names = guard.selections.clone();
+static SELECTIONS: Mutex<CriticalSectionRawMutex, Vec<FileName>> = Mutex::new(Vec::new());
+static mut SELECTIONS_CHANGED: bool = true;
+
+async fn update_selections() {
+    while SCSI_BUSY.load(Ordering::Acquire) {
+        Timer::after_millis(100).await;
+    }
+    let mut guard = SDCARD.get().lock().await;
+    let sd = guard.as_mut().unwrap();
+
+    let files = sd.list_files_by_extension(".bin").unwrap();
+    let mut selections = SELECTIONS.lock().await;
+
+    if *selections != files {
+        *selections = files;
+        unsafe { SELECTIONS_CHANGED = true }
+    }
+}
+struct MenuPage {
+    last_bounds: Option<Rectangle>,
+    selection: usize,
+    changed: bool,
+}
+
+impl Page for MenuPage {
+    async fn draw(&mut self) {
+        if self.changed {
+            self.clear().await;
+        }
+
+        let guard = SELECTIONS.lock().await;
+        let file_names = &guard.clone();
 
         let text_style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
         let display_area = unsafe { FRAMEBUFFER.as_mut().unwrap().bounding_box() };
@@ -99,7 +176,7 @@ async fn draw_selection() {
         } else {
             let mut views: alloc::vec::Vec<Text<MonoTextStyle<Rgb565>>> = Vec::new();
 
-        for i in &file_names {
+            for i in file_names {
                 views.push(Text::new(&i.long_name, Point::zero(), text_style));
             }
 
@@ -114,7 +191,7 @@ async fn draw_selection() {
             // draw selected box
             let selected_bounds = layout
                 .inner()
-            .get(guard.current_selection as usize)
+                .get(self.selection)
                 .expect("Selected binary missing")
                 .bounding_box();
             Rectangle::new(selected_bounds.top_left, selected_bounds.size)
@@ -122,66 +199,70 @@ async fn draw_selection() {
                 .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
                 .unwrap();
 
-        guard.last_bounds = Some(layout.bounds());
+            self.last_bounds = Some(layout.bounds());
 
             layout
                 .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
                 .unwrap();
         }
 
-    guard.changed = false;
+        self.changed = false;
         FB_PAUSED.store(false, Ordering::Release); // ensure all elements show up at once
+    }
+
+    async fn handle_input(&mut self, key: KeyCode) -> bool {
+        match key {
+            KeyCode::Enter | KeyCode::Right => {
+                let selections = SELECTIONS.lock().await;
+                let selection = selections[self.selection].clone();
+
+                self.clear().await;
+                BINARY_CH.send(selection.short_name).await;
+                return true;
+            }
+            KeyCode::Up => {
+                if self.selection > 0 {
+                    self.selection -= 1;
+                } else {
+                    let len = SELECTIONS.lock().await.len();
+                    if len > 0 {
+                        self.selection = len - 1;
+                    }
+                }
+            }
+            KeyCode::Down => {
+                if self.selection + 1 < SELECTIONS.lock().await.len() {
+                    self.selection += 1;
+                } else {
+                    self.selection = 0; // wrap to top
+                }
+            }
+            _ => (),
+        }
+        self.changed = true;
+        false
+    }
+
+    async fn clear(&mut self) {
+        if let Some(rect) = self.last_bounds {
+            clear_rect(rect).await;
+        }
+        self.last_bounds = None;
+    }
 }
 
-#[derive(Clone)]
-pub struct SelectionList {
-    // allows easy clearing of selection ui,
-    // based on previous bounds
-    last_bounds: Option<Rectangle>,
-    current_selection: u16,
-    selections: Vec<FileName>,
-    changed: bool,
+pub async fn clear_screen() {
+    clear_rect(Rectangle {
+        top_left: Point::zero(),
+        size: Size::new(320, 320),
+    })
+    .await
 }
 
-impl SelectionList {
-    pub const fn new() -> Self {
-        Self {
-            last_bounds: None,
-            selections: Vec::new(),
-            current_selection: 0,
-            changed: false,
-        }
-    }
-
-    pub fn set_changed(&mut self, changed: bool) {
-        self.changed = changed
-    }
-
-    pub fn update_selections(&mut self, selections: Vec<FileName>) {
-        self.selections = selections;
-        self.changed = true;
-    }
-
-    pub fn selections(&self) -> &Vec<FileName> {
-        &self.selections
-    }
-
-    pub fn reset(&mut self) {
-        self.current_selection = 0;
-        self.changed = true;
-    }
-
-    fn up(&mut self) {
-        if self.current_selection > 0 {
-            self.current_selection -= 1;
-            self.changed = true;
-        }
-    }
-
-    fn down(&mut self) {
-        if self.current_selection + 1 < self.selections.len() as u16 {
-            self.current_selection += 1;
-            self.changed = true;
-        }
-    }
+async fn clear_rect(rect: Rectangle) {
+    let fb = unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() };
+    Rectangle::new(rect.top_left, rect.size)
+        .into_styled(PrimitiveStyle::with_fill(Rgb565::BLACK))
+        .draw(fb)
+        .unwrap();
 }

kernel/src/usb.rs

@@ -1,10 +1,8 @@
-use crate::{scsi::MassStorageClass, storage::SdCard};
-use core::sync::atomic::{AtomicBool, Ordering};
-use embassy_futures::select::select;
+use crate::scsi::{MassStorageClass, SCSI_EJECTED};
+use core::sync::atomic::Ordering;
+use embassy_futures::join::join;
 use embassy_rp::{peripherals::USB, usb::Driver};
-use embassy_usb::{Builder, Config, UsbDevice};
-
-pub static USB_ACTIVE: AtomicBool = AtomicBool::new(false);
+use embassy_usb::{Builder, Config};
 
 #[embassy_executor::task]
 pub async fn usb_handler(driver: Driver<'static, USB>) {
@@ -28,18 +26,18 @@ pub async fn usb_handler(driver: Driver<'static, USB>) {
         &mut control_buf,
     );
 
-    let temp_sd: Option<SdCard> = None;
-    let mut scsi = MassStorageClass::new(&mut builder, temp_sd);
-    let usb = builder.build();
+    let mut scsi = MassStorageClass::new(&mut builder);
+    let mut usb = builder.build();
 
-    select(run(usb), scsi.poll()).await;
-}
-
-async fn run<'d>(mut usb: UsbDevice<'d, Driver<'d, USB>>) -> ! {
+    join(
+        async {
             loop {
                 usb.wait_resume().await;
-        USB_ACTIVE.store(true, Ordering::Release);
+                SCSI_EJECTED.store(false, Ordering::Release);
                 usb.run_until_suspend().await;
-        USB_ACTIVE.store(false, Ordering::Release);
             }
+        },
+        scsi.poll(),
+    )
+    .await;
 }

selection_ui/src/lib.rs

@@ -6,57 +6,50 @@ use abi::{
     display::Display,
     get_key,
     keyboard::{KeyCode, KeyState},
+    print, sleep,
 };
 use alloc::vec::Vec;
 use embedded_graphics::{
     Drawable,
     mono_font::{MonoTextStyle, ascii::FONT_10X20},
     pixelcolor::Rgb565,
-    prelude::{Dimensions, DrawTarget, Point, Primitive, RgbColor},
+    prelude::{Dimensions, Point, Primitive, RgbColor, Size},
     primitives::{PrimitiveStyle, Rectangle},
-    text::{Alignment, Text, renderer::TextRenderer},
+    text::Text,
 };
 use embedded_layout::{
     align::{horizontal, vertical},
     layout::linear::{FixedMargin, LinearLayout},
     prelude::*,
 };
-
-#[derive(Debug)]
-pub enum SelectionUiError<DisplayError> {
-    SelectionListEmpty,
-    DisplayError(DisplayError),
-}
+use embedded_text::TextBox;
 
 pub struct SelectionUi<'a> {
     selection: usize,
     items: &'a [&'a str],
+    error: &'a str,
     last_bounds: Option<Rectangle>,
 }
 
 impl<'a> SelectionUi<'a> {
-    pub fn new(items: &'a [&'a str]) -> Self {
+    pub fn new(items: &'a [&'a str], error: &'a str) -> Self {
         Self {
             selection: 0,
             items,
+            error,
             last_bounds: None,
         }
     }
 
-    pub fn run_selection_ui(
-        &mut self,
-        display: &mut Display,
-    ) -> Result<Option<usize>, SelectionUiError<<Display as DrawTarget>::Error>> {
+    pub fn run_selection_ui(&mut self, display: &mut Display) -> Result<Option<usize>, ()> {
         self.draw(display)?;
         let selection;
         loop {
             let key = get_key();
             if key.state == KeyState::Pressed {
+                print!("Got Key press: {:?}", key.key);
                 if let Some(s) = self.update(display, key.key)? {
                     selection = Some(s);
-                    display
-                        .clear(Rgb565::BLACK)
-                        .map_err(|e| SelectionUiError::DisplayError(e))?;
                     break;
                 }
             }
@@ -66,41 +59,36 @@ impl<'a> SelectionUi<'a> {
 
     /// updates the display with a new keypress.
     /// returns selection idx if selected
-    pub fn update(
-        &mut self,
-        display: &mut Display,
-        key: KeyCode,
-    ) -> Result<Option<usize>, SelectionUiError<<Display as DrawTarget>::Error>> {
+    pub fn update(&mut self, display: &mut Display, key: KeyCode) -> Result<Option<usize>, ()> {
         match key {
-            KeyCode::Down => {
-                self.selection = (self.selection + 1).min(self.items.len() - 1);
-            }
-            KeyCode::Up => {
+            KeyCode::JoyUp => {
                 self.selection = self.selection.saturating_sub(1);
             }
-            KeyCode::Enter | KeyCode::Right => return Ok(Some(self.selection)),
-            _ => return Ok(None),
+            KeyCode::JoyDown => {
+                self.selection = self.selection.saturating_add(1);
+            }
+            KeyCode::Enter | KeyCode::JoyRight => return Ok(Some(self.selection)),
+            _ => return Ok(Some(self.selection)),
         };
         self.draw(display)?;
         Ok(None)
     }
 
-    fn draw(
-        &mut self,
-        display: &mut Display,
-    ) -> Result<(), SelectionUiError<<Display as DrawTarget>::Error>> {
+    fn draw(&mut self, display: &mut Display) -> Result<(), ()> {
         let text_style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
         let display_area = display.bounding_box();
 
         if self.items.is_empty() {
-            return Err(SelectionUiError::SelectionListEmpty);
-        }
-
-        if let Some(bounds) = self.last_bounds {
-            Rectangle::new(bounds.top_left, bounds.size)
-                .into_styled(PrimitiveStyle::with_fill(Rgb565::BLACK))
+            TextBox::new(
+                &self.error,
+                Rectangle::new(
+                    Point::new(25, 25),
+                    Size::new(display_area.size.width - 50, display_area.size.width - 50),
+                ),
+                text_style,
+            )
             .draw(display)
-                .map_err(|e| SelectionUiError::DisplayError(e))?;
+            .unwrap();
         }
 
         let mut views: Vec<Text<MonoTextStyle<Rgb565>>> = Vec::new();
@@ -117,32 +105,15 @@ impl<'a> SelectionUi<'a> {
             .arrange()
             .align_to(&display_area, horizontal::Center, vertical::Center);
 
-        layout
-            .draw(display)
-            .map_err(|e| SelectionUiError::DisplayError(e))?;
-
         // draw selected box
-        if let Some(selected_bounds) = layout.inner().get(self.selection) {
-            let selected_bounds = selected_bounds.bounding_box();
+        let selected_bounds = layout.inner().get(self.selection).ok_or(())?.bounding_box();
         Rectangle::new(selected_bounds.top_left, selected_bounds.size)
             .into_styled(PrimitiveStyle::with_stroke(Rgb565::WHITE, 1))
-                .draw(display)
-                .map_err(|e| SelectionUiError::DisplayError(e))?;
+            .draw(display)?;
 
-            self.last_bounds = Some(selected_bounds);
-        }
+        self.last_bounds = Some(layout.bounds());
 
+        layout.draw(display)?;
         Ok(())
     }
 }
-
-pub fn draw_text_center<'a, S>(
-    display: &mut Display,
-    text: &'a str,
-    style: S,
-) -> Result<Point, <Display as DrawTarget>::Error>
-where
-    S: TextRenderer<Color = <Display as DrawTarget>::Color>,
-{
-    Text::with_alignment(text, Point::zero(), style, Alignment::Center).draw(display)
-}

user-apps/calculator/src/main.rs

@@ -6,7 +6,7 @@ use abi::{
     display::Display,
     get_key,
     keyboard::{KeyCode, KeyState},
-    println,
+    print,
 };
 use alloc::{format, string::String, vec, vec::Vec};
 use core::panic::PanicInfo;
@@ -28,7 +28,7 @@ use embedded_layout::{
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    println!("user panic: {} @ {:?}", info.message(), info.location(),);
+    print!("user panic: {} @ {:?}", info.message(), info.location(),);
     loop {}
 }
 
@@ -38,8 +38,8 @@ pub extern "Rust" fn _start() {
 }
 
 pub fn main() {
-    println!("Starting Calculator app");
-    let mut display = Display::take().unwrap();
+    print!("Starting Calculator app");
+    let mut display = Display;
 
     let mut input = vec!['e', 'x', 'p', 'r', ':', ' '];
     let input_min = input.len();
@@ -104,7 +104,7 @@ pub fn main() {
         }
 
         let event = get_key();
-        if event.state == KeyState::Released {
+        if event.state != KeyState::Idle {
             match event.key {
                 KeyCode::Char(ch) => {
                     input.push(ch);

user-apps/gallery/src/main.rs

@@ -8,7 +8,7 @@ use abi::{
     fs::{Entries, list_dir, read_file},
     get_key,
     keyboard::{KeyCode, KeyState},
-    println,
+    print,
 };
 use alloc::{format, vec};
 use core::panic::PanicInfo;
@@ -20,7 +20,7 @@ use tinybmp::Bmp;
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    println!("user panic: {} @ {:?}", info.message(), info.location());
+    print!("user panic: {} @ {:?}", info.message(), info.location());
     loop {}
 }
 
@@ -30,9 +30,9 @@ pub extern "Rust" fn _start() {
 }
 
 pub fn main() {
-    println!("Starting Gallery app");
+    print!("Starting Gallery app");
     let mut bmp_buf = vec![0_u8; 100_000];
-    let mut display = Display::take().unwrap();
+    let mut display = Display;
 
     let grid_cols = 3;
     let grid_rows = 3;
@@ -49,7 +49,7 @@ pub fn main() {
             break; // only draw 3x3
         }
 
-        println!("file: {}", file);
+        print!("file: {}", file);
         if file.extension().unwrap_or("") == "bmp" || file.extension().unwrap_or("") == "BMP" {
             let file_path = format!("/images/{}", file);
 

user-apps/gboy/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-name = "gboy"
-version = "0.1.0"
-edition = "2024"
-
-[build-dependencies]
-bindgen = "0.71.0"
-cc = "1.2.44"
-
-[dependencies]
-abi = { path = "../../abi" }
-selection_ui = { path = "../../selection_ui" }
-embedded-graphics = "0.8.1"

user-apps/gboy/build.rs

@@ -1,64 +0,0 @@
-//! This build script copies the `memory.x` file from the crate root into
-//! a directory where the linker can always find it at build time.
-//! For many projects this is optional, as the linker always searches the
-//! project root directory -- wherever `Cargo.toml` is. However, if you
-//! are using a workspace or have a more complicated build setup, this
-//! build script becomes required. Additionally, by requesting that
-//! Cargo re-run the build script whenever `memory.x` is changed,
-//! updating `memory.x` ensures a rebuild of the application with the
-//! new memory settings.
-
-use std::env;
-use std::fs::File;
-use std::io::Write;
-use std::path::PathBuf;
-
-fn main() {
-    bindgen();
-
-    // Put `memory.x` in our output directory and ensure it's
-    // on the linker search path.
-    let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
-    File::create(out.join("memory.x"))
-        .unwrap()
-        .write_all(include_bytes!("../memory.x"))
-        .unwrap();
-    println!("cargo:rustc-link-search={}", out.display());
-
-    println!("cargo:rerun-if-changed=memory.x");
-    println!("cargo:rustc-link-arg-bins=-Tmemory.x");
-}
-
-fn bindgen() {
-    let bindings = bindgen::Builder::default()
-        .header("Peanut-GB/peanut_gb.h")
-        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
-        .disable_nested_struct_naming()
-        .clang_arg("-I../../picolibc/newlib/libc/include/")
-        .clang_arg("-I../../picolibc/build/")
-        .use_core()
-        .generate()
-        .expect("Unable to generate bindings");
-
-    let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
-    bindings
-        .write_to_file(out_path.join("bindings.rs"))
-        .expect("Couldn't write bindings!");
-
-    cc::Build::new()
-        .define("PEANUT_GB_IS_LITTLE_ENDIAN", None)
-        .define("ENABLE_LCD", None)
-        .file("peanut_gb_stub.c")
-        .include("Peanut-GB")
-        // optimization flags
-        .flag("-Ofast")
-        .flag("-fdata-sections")
-        .flag("-ffunction-sections")
-        .flag("-mcpu=cortex-m33")
-        .flag("-mthumb")
-        .flag("-g0")
-        .compile("peanut_gb");
-
-    println!("cargo:rustc-link-search=Peanut-GB");
-    println!("cargo:rustc-link-lib=peanut_gb");
-}

user-apps/gboy/peanut_gb_stub.c

@@ -1 +0,0 @@
-#include <peanut_gb.h>

user-apps/gboy/src/main.rs

@@ -1,206 +0,0 @@
-#![no_std]
-#![no_main]
-#![allow(static_mut_refs)]
-
-extern crate alloc;
-use abi::{
-    display::Display,
-    format,
-    fs::{Entries, file_len, list_dir, read_file, write_file},
-    get_key,
-    keyboard::{KeyCode, KeyState},
-    println,
-};
-use alloc::{vec, vec::Vec};
-use core::{cell::LazyCell, mem::MaybeUninit, panic::PanicInfo};
-use embedded_graphics::{
-    mono_font::{MonoTextStyle, ascii::FONT_6X10},
-    pixelcolor::Rgb565,
-    prelude::RgbColor,
-};
-use selection_ui::{SelectionUi, SelectionUiError, draw_text_center};
-
-mod peanut;
-use peanut::gb_run_frame;
-
-use crate::peanut::{
-    JOYPAD_A, JOYPAD_B, JOYPAD_DOWN, JOYPAD_LEFT, JOYPAD_RIGHT, JOYPAD_SELECT, JOYPAD_START,
-    JOYPAD_UP, gb_cart_ram_read, gb_cart_ram_write, gb_error, gb_get_rom_name, gb_get_save_size,
-    gb_init, gb_init_lcd, gb_reset, gb_rom_read, gb_s, lcd_draw_line,
-};
-
-static mut DISPLAY: LazyCell<Display> = LazyCell::new(|| Display::take().unwrap());
-
-const RAM_SIZE: usize = 32 * 1024; // largest ram size is 32k
-static mut RAM: [u8; RAM_SIZE] = [0; RAM_SIZE];
-
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    println!("user panic: {} @ {:?}", info.message(), info.location(),);
-    loop {}
-}
-
-#[unsafe(no_mangle)]
-pub extern "Rust" fn _start() {
-    main()
-}
-
-const GAME_PATH: &'static str = "/games/gameboy";
-
-static mut GAME_ROM: Option<Vec<u8>> = None;
-
-pub fn main() {
-    println!("Starting Gameboy app");
-
-    let mut entries = Entries::new();
-    list_dir(GAME_PATH, &mut entries);
-
-    let mut files = entries.entries();
-    files.retain(|e| {
-        let ext = e.extension().unwrap_or("");
-        ext == "gb" || ext == "GB"
-    });
-    let mut roms = files.iter().map(|e| e.full_name()).collect::<Vec<&str>>();
-    roms.sort();
-
-    let selection = {
-        let display = unsafe { &mut *DISPLAY };
-        let mut selection_ui = SelectionUi::new(&roms);
-        match selection_ui.run_selection_ui(display) {
-            Ok(maybe_sel) => maybe_sel,
-            Err(e) => match e {
-                SelectionUiError::SelectionListEmpty => {
-                    draw_text_center(
-                        display,
-                        &format!("No Roms were found in {}", GAME_PATH),
-                        MonoTextStyle::new(&FONT_6X10, Rgb565::RED),
-                    )
-                    .expect("Display Error");
-                    None
-                }
-                SelectionUiError::DisplayError(_) => panic!("Display Error"),
-            },
-        }
-    };
-
-    assert!(selection.is_some());
-
-    let file_name = format!("{}/{}", GAME_PATH, roms[selection.unwrap()]);
-    let size = file_len(&file_name);
-    unsafe { GAME_ROM = Some(vec![0_u8; size]) };
-    let read = read_file(&file_name, 0, unsafe { GAME_ROM.as_mut().unwrap() });
-    assert!(size == read);
-    println!("Rom size: {}", read);
-
-    let mut gb = MaybeUninit::<gb_s>::uninit();
-
-    let init_status = unsafe {
-        gb_init(
-            gb.as_mut_ptr(),
-            Some(gb_rom_read),
-            Some(gb_cart_ram_read),
-            Some(gb_cart_ram_write),
-            Some(gb_error),
-            core::ptr::null_mut(),
-        )
-    };
-    println!("gb init status: {}", init_status);
-
-    unsafe {
-        load_save(&mut gb.assume_init());
-    }
-
-    unsafe {
-        gb_init_lcd(gb.as_mut_ptr(), Some(lcd_draw_line));
-
-        // enable frame skip
-        // gb.assume_init().direct.set_frame_skip(!true); // active low
-    };
-
-    loop {
-        let event = get_key();
-        let button = match event.key {
-            KeyCode::Esc => {
-                unsafe { write_save(&mut gb.assume_init()) };
-                break;
-            }
-            KeyCode::Char('r') => {
-                unsafe { gb_reset(gb.as_mut_ptr()) };
-                continue;
-            }
-            KeyCode::Tab => JOYPAD_START as u8,
-            KeyCode::Del => JOYPAD_SELECT as u8,
-            KeyCode::Enter => JOYPAD_A as u8,
-            KeyCode::Backspace => JOYPAD_B as u8,
-            KeyCode::Up => JOYPAD_UP as u8,
-            KeyCode::Down => JOYPAD_DOWN as u8,
-            KeyCode::Left => JOYPAD_LEFT as u8,
-            KeyCode::Right => JOYPAD_RIGHT as u8,
-            _ => 0,
-        };
-
-        if button != 0 {
-            unsafe {
-                // bindgen incorrectly generates direct so manual manipulation is required :(
-                let direct_ptr = &mut gb.assume_init().direct as *mut _ as *mut u8;
-                let joypad_ptr = direct_ptr.add(2); // this is the joypad bitfield byte
-
-                if let KeyState::Pressed = event.state {
-                    *joypad_ptr &= !button;
-                } else if let KeyState::Released = event.state {
-                    *joypad_ptr |= button;
-                }
-
-                println!("joypad: {:b}", *joypad_ptr);
-            }
-        }
-
-        unsafe {
-            gb_run_frame(gb.as_mut_ptr());
-        }
-    }
-}
-
-unsafe fn load_save(gb: &mut gb_s) {
-    let mut buf = [0; 16];
-
-    unsafe {
-        gb_get_rom_name(gb, buf.as_mut_ptr());
-
-        let save_size = gb_get_save_size(gb);
-
-        if save_size > 0 {
-            read_file(
-                &format!(
-                    "{}/saves/{}.sav",
-                    GAME_PATH,
-                    str::from_utf8(&buf).expect("bad rom name")
-                ),
-                0,
-                &mut RAM,
-            );
-        }
-    }
-}
-
-unsafe fn write_save(gb: &mut gb_s) {
-    let mut buf = [0; 16];
-
-    unsafe {
-        gb_get_rom_name(gb, buf.as_mut_ptr());
-
-        let save_size = gb_get_save_size(gb);
-
-        if save_size > 0 {
-            write_file(
-                &format!(
-                    "{}/saves/{}.sav",
-                    GAME_PATH,
-                    str::from_utf8(&buf).expect("bad rom name")
-                ),
-                0,
-                &mut RAM,
-            );
-        }
-    }
-}

user-apps/gboy/src/peanut.rs

@@ -1,102 +0,0 @@
-#![allow(non_upper_case_globals)]
-#![allow(non_camel_case_types)]
-#![allow(non_snake_case)]
-
-use crate::{DISPLAY, GAME_ROM, RAM};
-
-#[allow(unused)]
-include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
-
-use abi::{display::Pixel565, println};
-use embedded_graphics::{Drawable, pixelcolor::Rgb565, prelude::Point};
-
-pub const GBOY_WIDTH: usize = 160;
-pub const GBOY_HEIGHT: usize = 144;
-
-pub unsafe extern "C" fn gb_rom_read(_gb: *mut gb_s, addr: u32) -> u8 {
-    unsafe { GAME_ROM.as_ref().unwrap()[addr as usize] }
-}
-
-pub unsafe extern "C" fn gb_cart_ram_read(_gb: *mut gb_s, addr: u32) -> u8 {
-    unsafe { RAM[addr as usize] }
-}
-
-pub unsafe extern "C" fn gb_cart_ram_write(_gb: *mut gb_s, addr: u32, val: u8) {
-    unsafe { RAM[addr as usize] = val }
-}
-
-pub unsafe extern "C" fn gb_error(_gb: *mut gb_s, err: gb_error_e, addr: u16) {
-    let e = match err {
-        0 => "UNKNOWN ERROR",
-        1 => "INVALID OPCODE",
-        2 => "INVALID READ",
-        3 => "INVALID WRITE",
-        4 => "HALT FOREVER",
-        5 => "INVALID MAX",
-        _ => unreachable!(),
-    };
-
-    println!("PeanutGB error: {}, addr: {}", e, addr);
-}
-
-const NUM_PALETTES: usize = 3;
-const SHADES_PER_PALETTE: usize = 4;
-
-const PALETTES: [[Rgb565; SHADES_PER_PALETTE]; NUM_PALETTES] = [
-    [
-        Rgb565::new(8, 24, 32),
-        Rgb565::new(52, 104, 86),
-        Rgb565::new(136, 192, 112),
-        Rgb565::new(224, 248, 208),
-    ], // BG
-    [
-        Rgb565::new(8, 24, 32),
-        Rgb565::new(52, 104, 86),
-        Rgb565::new(136, 192, 112),
-        Rgb565::new(224, 248, 208),
-    ], // OBJ0
-    [
-        Rgb565::new(8, 24, 32),
-        Rgb565::new(52, 104, 86),
-        Rgb565::new(136, 192, 112),
-        Rgb565::new(224, 248, 208),
-    ], // OBJ1
-];
-
-pub unsafe extern "C" fn lcd_draw_line(_gb: *mut gb_s, pixels: *const u8, line: u8) {
-    if line < GBOY_HEIGHT as u8 {
-        let pixels = unsafe { core::slice::from_raw_parts(pixels, GBOY_WIDTH) };
-        let y = line as u16;
-
-        for (x, &p) in pixels.iter().enumerate() {
-            let palette_idx = ((p & 0xF0) >> 4) as usize;
-            let shade_idx = (p & 0x03) as usize;
-
-            let color = PALETTES
-                .get(palette_idx)
-                .and_then(|pal| pal.get(shade_idx))
-                .copied()
-                .unwrap_or(Rgb565::new(0, 0, 0));
-
-            // let sx = (x as u16) * 2;
-            // let sy = y * 2;
-
-            // draw_color(color, sx, sy);
-            // draw_color(color, sx + 1, sy);
-            // draw_color(color, sx, sy + 1);
-            // draw_color(color, sx + 1, sy + 1);
-            //
-            draw_color(color, x as u16, y as u16);
-        }
-    }
-}
-
-fn draw_color(color: Rgb565, x: u16, y: u16) {
-    let mut pixel = Pixel565::default();
-    pixel.0 = Point::new(x.into(), y.into());
-    pixel.1 = color;
-
-    unsafe {
-        pixel.draw(&mut *DISPLAY).unwrap();
-    }
-}

user-apps/gif/Cargo.toml

@@ -5,6 +5,6 @@ edition = "2024"
 
 [dependencies]
 abi = { path = "../../abi" }
-selection_ui = { path = "../../selection_ui" }
 embedded-graphics = "0.8.1"
+selection_ui = { path = "../../selection_ui" }
 tinygif = { git = "https://github.com/LegitCamper/tinygif" }

user-apps/gif/src/main.rs

@@ -3,27 +3,23 @@
 
 extern crate alloc;
 use abi::{
-    display::{Display, SCREEN_HEIGHT, SCREEN_WIDTH},
+    display::Display,
     fs::{Entries, file_len, list_dir, read_file},
     get_key, get_ms,
     keyboard::{KeyCode, KeyState},
-    println, sleep,
+    print, sleep,
 };
 use alloc::{format, vec, vec::Vec};
 use core::panic::PanicInfo;
 use embedded_graphics::{
-    image::ImageDrawable,
-    mono_font::{MonoTextStyle, ascii::FONT_6X10},
-    pixelcolor::Rgb565,
-    prelude::{Point, RgbColor},
-    transform::Transform,
+    image::ImageDrawable, pixelcolor::Rgb565, prelude::Point, transform::Transform,
 };
-use selection_ui::{SelectionUi, SelectionUiError, draw_text_center};
+use selection_ui::SelectionUi;
 use tinygif::Gif;
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    println!("user panic: {} @ {:?}", info.message(), info.location(),);
+    print!("user panic: {} @ {:?}", info.message(), info.location(),);
     loop {}
 }
 
@@ -33,56 +29,41 @@ pub extern "Rust" fn _start() {
 }
 
 pub fn main() {
-    println!("Starting Gif app");
-    let mut display = Display::take().unwrap();
+    print!("Starting Gif app");
+    let mut display = Display;
 
     let mut entries = Entries::new();
     list_dir("/gifs", &mut entries);
 
     let mut files = entries.entries();
     files.retain(|e| e.extension().unwrap_or("") == "gif");
-    let mut gifs = files.iter().map(|e| e.full_name()).collect::<Vec<&str>>();
-    gifs.sort();
+    let gifs = &files.iter().map(|e| e.full_name()).collect::<Vec<&str>>();
 
-    let mut selection_ui = SelectionUi::new(&mut gifs);
-    let selection = match selection_ui.run_selection_ui(&mut display) {
-        Ok(maybe_sel) => maybe_sel,
-        Err(e) => match e {
-            SelectionUiError::SelectionListEmpty => {
-                draw_text_center(
-                    &mut display,
-                    "No Gifs were found in /gifs",
-                    MonoTextStyle::new(&FONT_6X10, Rgb565::RED),
-                )
-                .expect("Display Error");
-                None
-            }
-            SelectionUiError::DisplayError(_) => panic!("Display Error"),
-        },
-    };
+    let mut selection_ui = SelectionUi::new(&gifs, "No Gif files found in /gifs");
+    let selection = selection_ui
+        .run_selection_ui(&mut display)
+        .expect("failed to draw")
+        .expect("Failed to get user selection");
 
-    assert!(selection.is_some());
-
-    let file_name = format!("/gifs/{}", gifs[selection.unwrap()]);
+    let file_name = format!("/gifs/{}", gifs[selection]);
     let size = file_len(&file_name);
     let mut buf = vec![0_u8; size];
     let read = read_file(&file_name, 0, &mut buf);
-    println!("read: {}, file size: {}", read, size);
+    print!("read: {}, file size: {}", read, size);
     assert!(read == size);
 
     let gif = Gif::<Rgb565>::from_slice(&buf).expect("Failed to parse gif");
-
-    let translation = Point::new(
-        (SCREEN_WIDTH as i32 - gif.width() as i32) / 2,
-        (SCREEN_HEIGHT as i32 - gif.height() as i32) / 2,
-    );
+    let height = gif.height();
 
     let mut frame_num = 0;
     loop {
         for mut frame in gif.frames() {
             let start = get_ms();
 
-            frame.translate_mut(translation).draw(&mut display).unwrap();
+            frame
+                .translate_mut(Point::new(0, (320 - height as i32) / 2))
+                .draw(&mut display)
+                .unwrap();
             frame_num += 1;
 
             if frame_num % 5 == 0 {

user-apps/snake/src/main.rs

@@ -7,7 +7,7 @@ use abi::{
     display::{Display, SCREEN_HEIGHT, SCREEN_WIDTH},
     get_key,
     keyboard::{KeyCode, KeyState},
-    println, sleep,
+    print, sleep,
 };
 use core::panic::PanicInfo;
 use embedded_graphics::{pixelcolor::Rgb565, prelude::RgbColor};
@@ -15,7 +15,7 @@ use embedded_snake::{Direction, SnakeGame};
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    println!("user panic: {} @ {:?}", info.message(), info.location(),);
+    print!("user panic: {} @ {:?}", info.message(), info.location(),);
     loop {}
 }
 
@@ -27,8 +27,8 @@ pub extern "Rust" fn _start() {
 const CELL_SIZE: usize = 8;
 
 pub fn main() {
-    println!("Starting Snake app");
-    let mut display = Display::take().unwrap();
+    print!("Starting Snake app");
+    let mut display = Display;
 
     let mut game = SnakeGame::<100, Rgb565, Rng>::new(
         SCREEN_WIDTH as u16,