macros and improvements

Cargo.lock

@@ -18,6 +18,8 @@ version = "0.1.0"
 dependencies = [
  "abi_sys",
  "embedded-graphics",
+ "embedded-sdmmc",
+ "main_proc_macro",
  "once_cell",
  "rand_core 0.9.3",
 ]
@@ -30,6 +32,7 @@ dependencies = [
  "cbindgen",
  "defmt 0.3.100",
  "embedded-graphics",
+ "embedded-sdmmc",
  "strum",
 ]
 
@@ -348,7 +351,7 @@ checksum = "e37549a379a9e0e6e576fd208ee60394ccb8be963889eebba3ffe0980364f472"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -445,7 +448,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -456,7 +459,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -494,7 +497,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -643,7 +646,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1017,7 +1020,7 @@ checksum = "4f6e621fe4c7e05b695274b722dc0a60bacd1c8696b58191baa0154713d52400"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1210,7 +1213,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1287,7 +1290,6 @@ version = "0.1.0"
 dependencies = [
  "abi",
  "embedded-graphics",
- "selection_ui",
  "tinygif",
 ]
 
@@ -1647,6 +1649,14 @@ version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
+[[package]]
+name = "main_proc_macro"
+version = "0.1.0"
+dependencies = [
+ "quote",
+ "syn 2.0.108",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.5"
@@ -1727,7 +1737,7 @@ checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1919,7 +1929,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1986,7 +1996,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2000,9 +2010,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
@@ -2190,16 +2200,6 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1257cd4248b4132760d6524d6dda4e053bc648c9070b960929bf50cfb1e7add"
 
-[[package]]
-name = "selection_ui"
-version = "0.1.0"
-dependencies = [
- "abi",
- "embedded-graphics",
- "embedded-layout",
- "embedded-text",
-]
-
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -2242,7 +2242,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2409,7 +2409,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2438,9 +2438,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.104"
+version = "2.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2537,7 +2537,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2548,7 +2548,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2616,7 +2616,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
  "uuid",
 ]
 
@@ -2775,7 +2775,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
  "wasm-bindgen-shared",
 ]
 
@@ -2797,7 +2797,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2947,5 +2947,5 @@ checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]

Cargo.toml

@@ -4,11 +4,11 @@ members = [
   "kernel",
   "abi_sys",
   "abi",
-  "selection_ui",
   "user-apps/calculator",
   "user-apps/snake",
   "user-apps/gallery",
   "user-apps/gif",
+  "main_proc_macro",
 ]
 
 [profile.release]
@@ -27,4 +27,4 @@ panic = "abort"
 
 [profile.dev]
 lto = true
-opt-level = "s"
+opt-level = "z"

abi/Cargo.toml

@@ -5,6 +5,8 @@ edition = "2024"
 
 [dependencies]
 abi_sys = { path = "../abi_sys" }
+main_proc_macro = { path = "../main_proc_macro" }
+embedded-sdmmc = { version = "0.9", default-features = false }
 embedded-graphics = "0.8.1"
 once_cell = { version = "1", default-features = false }
 rand_core = "0.9.3"

abi/src/lib.rs

@@ -5,10 +5,20 @@ extern crate alloc;
 
 pub use abi_sys::{self, keyboard};
 use abi_sys::{RngRequest, alloc, dealloc, keyboard::KeyEvent};
-pub use alloc::format;
-use core::alloc::{GlobalAlloc, Layout};
+use alloc::format;
+use core::{
+    alloc::{GlobalAlloc, Layout},
+    panic::PanicInfo,
+};
+pub use main_proc_macro::main;
 use rand_core::RngCore;
 
+#[panic_handler]
+fn panic(info: &PanicInfo) -> ! {
+    print!("user panic: {} @ {:?}", info.message(), info.location(),);
+    loop {}
+}
+
 #[global_allocator]
 static ALLOC: Alloc = Alloc;
 
@@ -27,7 +37,7 @@ unsafe impl GlobalAlloc for Alloc {
 #[macro_export]
 macro_rules! print {
     ($($arg:tt)*) => {{
-        let s = $crate::format!($($arg)*);
+        let s = format!($($arg)*);
         $crate::abi_sys::print(s.as_ptr(), s.len());
     }};
 }
@@ -140,9 +150,7 @@ impl RngCore for Rng {
 }
 
 pub mod fs {
-    use core::fmt::Display;
-
-    use alloc::{format, vec::Vec};
+    use embedded_sdmmc::DirEntry;
 
     pub fn read_file(file: &str, read_from: usize, buf: &mut [u8]) -> usize {
         abi_sys::read_file(
@@ -154,85 +162,8 @@ pub mod fs {
         )
     }
 
-    pub struct FileName<'a> {
-        full: &'a str,
-        base: &'a str,
-        ext: Option<&'a str>,
-    }
-
-    impl<'a> FileName<'a> {
-        pub fn full_name(&self) -> &str {
-            self.full
-        }
-
-        pub fn base(&self) -> &str {
-            self.base
-        }
-
-        pub fn extension(&self) -> Option<&str> {
-            self.ext
-        }
-    }
-
-    impl<'a> Display for FileName<'a> {
-        fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-            write!(f, "{}", self.full_name())
-        }
-    }
-
-    impl<'a> From<&'a str> for FileName<'a> {
-        fn from(s: &'a str) -> FileName<'a> {
-            let full = s;
-
-            // Split on last dot for extension
-            let (base, ext) = match s.rfind('.') {
-                Some(idx) => (&s[..idx], Some(&s[idx + 1..])),
-                None => (s, None),
-            };
-
-            FileName { full, base, ext }
-        }
-    }
-
-    const MAX_ENTRY_NAME_LEN: usize = 25;
-    const MAX_ENTRIES: usize = 25;
-
-    #[derive(Clone, Copy)]
-    pub struct Entries([[u8; MAX_ENTRY_NAME_LEN]; MAX_ENTRIES]);
-
-    impl Entries {
-        pub fn new() -> Self {
-            Self([[0; MAX_ENTRY_NAME_LEN]; MAX_ENTRIES])
-        }
-
-        /// Get list of file names after listing
-        pub fn entries<'a>(&'a self) -> Vec<FileName<'a>> {
-            self.0
-                .iter()
-                .filter_map(|buf| {
-                    let nul_pos = buf.iter().position(|&b| b == 0).unwrap_or(buf.len());
-                    Some(core::str::from_utf8(&buf[..nul_pos]).ok()?.into())
-                })
-                .collect()
-        }
-
-        fn as_ptrs(&mut self) -> [*mut u8; MAX_ENTRIES] {
-            let mut ptrs: [*mut u8; MAX_ENTRIES] = [core::ptr::null_mut(); MAX_ENTRIES];
-            for (i, buf) in self.0.iter_mut().enumerate() {
-                ptrs[i] = buf.as_mut_ptr();
-            }
-            ptrs
-        }
-    }
-
-    pub fn list_dir(path: &str, entries: &mut Entries) -> usize {
-        abi_sys::list_dir(
-            path.as_ptr(),
-            path.len(),
-            entries.as_ptrs().as_mut_ptr(),
-            MAX_ENTRIES,
-            MAX_ENTRY_NAME_LEN,
-        )
+    pub fn list_dir(path: &str, files: &mut [Option<DirEntry>]) -> usize {
+        abi_sys::list_dir(path.as_ptr(), path.len(), files.as_mut_ptr(), files.len())
     }
 
     pub fn file_len(str: &str) -> usize {

abi_sys/Cargo.toml

@@ -12,6 +12,7 @@ defmt = ["dep:defmt"]
 strum = { version = "0.27.2", default-features = false, features = ["derive"] }
 bitflags = "2.9.4"
 embedded-graphics = "0.8.1"
+embedded-sdmmc = { version = "0.9.0", default-features = false }
 defmt = { version = "0.3", optional = true }
 
 [build-dependencies]

abi_sys/src/lib.rs

@@ -1,13 +1,14 @@
 #![no_std]
+
 #[cfg(feature = "alloc")]
 use core::alloc::Layout;
 
-use core::ffi::c_char;
 use embedded_graphics::{
     Pixel,
     pixelcolor::{Rgb565, raw::RawU16},
     prelude::{IntoStorage, Point},
 };
+use embedded_sdmmc::DirEntry;
 use strum::{EnumCount, EnumIter};
 
 pub type EntryFn = fn();
@@ -395,23 +396,21 @@ pub extern "C" fn gen_rand(req: &mut RngRequest) {
 pub type ListDir = extern "C" fn(
     str: *const u8,
     len: usize,
-    entries: *mut *mut c_char,
+    files: *mut Option<DirEntry>,
     file_len: usize,
-    max_entry_str_len: usize,
 ) -> usize;
 
 #[unsafe(no_mangle)]
 pub extern "C" fn list_dir(
     str: *const u8,
     len: usize,
-    entries: *mut *mut c_char,
-    entry_count: usize,
-    max_entry_str_len: usize,
+    files: *mut Option<DirEntry>,
+    file_len: usize,
 ) -> usize {
     unsafe {
         let ptr = CALL_ABI_TABLE[CallTable::ListDir as usize];
         let f: ListDir = core::mem::transmute(ptr);
-        f(str, len, entries, entry_count, max_entry_str_len)
+        f(str, len, files, file_len)
     }
 }
 

kernel/src/abi.rs

@@ -3,11 +3,11 @@ use abi_sys::{
     PrintAbi, ReadFile, RngRequest, SleepMsAbi, keyboard::*,
 };
 use alloc::{string::ToString, vec::Vec};
-use core::{alloc::GlobalAlloc, ffi::c_char, ptr, sync::atomic::Ordering};
+use core::{alloc::GlobalAlloc, 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 embedded_sdmmc::{DirEntry, LfnBuffer};
 use heapless::spsc::Queue;
 
 use crate::{
@@ -116,27 +116,11 @@ pub extern "C" fn gen_rand(req: &mut RngRequest) {
     }
 }
 
-unsafe fn copy_entry_to_user_buf(name: &[u8], dest: *mut c_char, max_str_len: usize) {
-    if !dest.is_null() {
-        let len = name.len().min(max_str_len - 1);
-        unsafe {
-            ptr::copy_nonoverlapping(name.as_ptr(), dest as *mut u8, len);
-            *dest.add(len) = 0; // nul terminator
-        }
-    }
-}
-
-unsafe fn get_dir_entries(dir: &Dir, entries: &mut [*mut c_char], max_str_len: usize) -> usize {
-    let mut b = [0; 25];
-    let mut buf = LfnBuffer::new(&mut b);
+fn get_dir_entries(dir: &Dir, files: &mut [Option<DirEntry>]) -> usize {
     let mut i = 0;
-    dir.iterate_dir_lfn(&mut buf, |entry, lfn_name| {
-        if i < entries.len() {
-            if let Some(name) = lfn_name {
-                unsafe { copy_entry_to_user_buf(name.as_bytes(), entries[i], max_str_len) };
-            } else {
-                unsafe { copy_entry_to_user_buf(entry.name.base_name(), entries[i], max_str_len) };
-            }
+    dir.iterate_dir(|entry| {
+        if i < files.len() {
+            files[i] = Some(entry.clone());
             i += 1;
         }
     })
@@ -144,30 +128,24 @@ unsafe fn get_dir_entries(dir: &Dir, entries: &mut [*mut c_char], max_str_len: u
     i
 }
 
-unsafe fn recurse_dir(
-    dir: &Dir,
-    dirs: &[&str],
-    entries: &mut [*mut c_char],
-    max_str_len: usize,
-) -> usize {
+fn recurse_dir(dir: &Dir, dirs: &[&str], files: &mut [Option<DirEntry>]) -> usize {
     if dirs.is_empty() {
-        return unsafe { get_dir_entries(dir, entries, max_str_len) };
+        return get_dir_entries(dir, files);
     }
 
     let dir = dir.open_dir(dirs[0]).unwrap();
-    unsafe { recurse_dir(&dir, &dirs[1..], entries, max_str_len) }
+    recurse_dir(&dir, &dirs[1..], files)
 }
 
 const _: ListDir = list_dir;
 pub extern "C" fn list_dir(
     dir: *const u8,
     len: usize,
-    entries: *mut *mut c_char,
+    files: *mut Option<DirEntry>,
     files_len: usize,
-    max_entry_str_len: usize,
 ) -> usize {
     // SAFETY: caller guarantees `ptr` is valid for `len` bytes
-    let files = unsafe { core::slice::from_raw_parts_mut(entries, files_len) };
+    let files = unsafe { core::slice::from_raw_parts_mut(files, files_len) };
     // SAFETY: caller guarantees `ptr` is valid for `len` bytes
     let dir = unsafe { core::str::from_raw_parts(dir, len) };
     let dirs: Vec<&str> = dir.split('/').collect();
@@ -178,12 +156,10 @@ pub extern "C" fn list_dir(
     let mut wrote = 0;
     sd.access_root_dir(|root| {
         if dirs[0] == "" && dirs.len() >= 2 {
-            unsafe {
-                if dir == "/" {
-                    wrote = get_dir_entries(&root, files, max_entry_str_len);
-                } else {
-                    wrote = recurse_dir(&root, &dirs[1..], files, max_entry_str_len);
-                }
+            if dir == "/" {
+                wrote = get_dir_entries(&root, files);
+            } else {
+                wrote = recurse_dir(&root, &dirs[1..], files);
             }
         }
     });

kernel/src/main.rs

@@ -24,22 +24,25 @@ mod usb;
 mod utils;
 
 #[cfg(feature = "pimoroni2w")]
-use crate::{heap::HEAP, heap::init_qmi_psram_heap, psram::init_psram_qmi};
+use crate::{heap::init_qmi_psram_heap, psram::init_psram_qmi};
 
 use crate::{
     abi::{KEY_CACHE, MS_SINCE_LAUNCH},
-    display::{display_handler, init_display},
-    elf::load_binary,
+    display::{FRAMEBUFFER, display_handler, init_display},
     peripherals::{
         conf_peripherals,
         keyboard::{KeyState, read_keyboard_fifo},
     },
     psram::init_psram,
+    scsi::MSC_SHUTDOWN,
     storage::{SDCARD, SdCard},
-    ui::{clear_screen, ui_handler},
-    usb::usb_handler,
+    ui::{SELECTIONS, clear_selection, ui_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,
     gpio::{Input, Level, Output, Pull},
@@ -59,8 +62,12 @@ 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, ShortFileName};
+use embedded_sdmmc::SdCard as SdmmcSdCard;
 use static_cell::StaticCell;
 use talc::*;
 use {defmt_rtt as _, panic_probe as _};
@@ -105,6 +112,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 = embassy_rp::init(Default::default());
@@ -162,25 +172,39 @@ async fn main(_spawner: Spawner) {
 }
 
 // One-slot channel to pass EntryFn from core1
-static BINARY_CH: Channel<CriticalSectionRawMutex, ShortFileName, 1> = Channel::new();
+static BINARY_CH: Channel<CriticalSectionRawMutex, (EntryFn, Bump), 1> = Channel::new();
 
 // runs dynamically loaded elf files
 #[embassy_executor::task]
 async fn userland_task() {
     let recv = BINARY_CH.receiver();
     loop {
-        let name = recv.receive().await;
-        let (entry, _bump) = unsafe { load_binary(&name).await.expect("unable to load binary") };
+        let (entry, _bump) = recv.receive().await;
 
-        clear_screen().await;
+        // disable kernel ui
+        {
+            ENABLE_UI.store(false, Ordering::Release);
+            UI_CHANGE.signal(());
+
+            clear_selection().await;
+
+            MSC_SHUTDOWN.signal(());
+        }
 
         unsafe { MS_SINCE_LAUNCH = Some(Instant::now()) };
         #[cfg(feature = "defmt")]
         defmt::info!("Executing Binary");
         entry();
 
-        STOP_KEY_HANDLER.signal(());
-        clear_screen().await;
+        // 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);
+        }
     }
 }
 
@@ -245,7 +269,6 @@ 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
-#[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,
@@ -287,7 +310,7 @@ async fn setup_sd(sd: Sd) {
     let device = ExclusiveDevice::new(spi, cs, Delay).unwrap();
     let sdcard = SdmmcSdCard::new(device, Delay);
 
-    config.frequency = 64_000_000;
+    config.frequency = 32_000_000;
     sdcard.spi(|dev| dev.bus_mut().set_config(&config));
     SDCARD.get().lock().await.replace(SdCard::new(sdcard, det));
 }
@@ -319,28 +342,39 @@ async fn kernel_task(
     setup_display(display, spawner).await;
     setup_sd(sd).await;
 
-    let usb_driver = embassy_rp_usb::Driver::new(usb, Irqs);
-    spawner.spawn(usb_handler(usb_driver)).unwrap();
+    let _usb = embassy_rp_usb::Driver::new(usb, Irqs);
+    // spawner.spawn(usb_handler(usb)).unwrap();
 
-    let mut ui_enabled = true;
     loop {
+        let ui_enabled = ENABLE_UI.load(Ordering::Relaxed);
         if ui_enabled {
-            ui_handler().await;
+            select(join(ui_handler(), prog_search_handler()), UI_CHANGE.wait()).await;
         } else {
-            key_handler().await;
+            select(key_handler(), UI_CHANGE.wait()).await;
         }
-        ui_enabled ^= true // flip bool
     }
 }
 
-static STOP_KEY_HANDLER: Signal<CriticalSectionRawMutex, ()> = Signal::new();
+async fn prog_search_handler() {
+    loop {
+        {
+            let mut guard = SDCARD.get().lock().await;
+            let sd = guard.as_mut().unwrap();
+
+            let files = sd.list_files_by_extension(".bin").unwrap();
+            let mut select = SELECTIONS.lock().await;
+
+            if *select.selections() != files {
+                select.update_selections(files);
+                select.reset();
+            }
+        }
+        Timer::after_secs(5).await;
+    }
+}
 
 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 {

kernel/src/scsi/error.rs

@@ -1,100 +0,0 @@
-#[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,6 +1,7 @@
-use crate::storage::{SDCARD, SdCard};
-use core::sync::atomic::{AtomicBool, Ordering};
-use embassy_time::Timer;
+use embassy_futures::select::select;
+use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
+use embassy_sync::lazy_lock::LazyLock;
+use embassy_sync::signal::Signal;
 use embassy_usb::Builder;
 use embassy_usb::driver::{Driver, EndpointIn, EndpointOut};
 use embedded_sdmmc::{Block, BlockIdx};
@@ -8,32 +9,29 @@ use heapless::Vec;
 
 mod scsi_types;
 use scsi_types::*;
-#[allow(unused)]
-mod error;
-use error::ScsiSense;
+
+use crate::storage::{SDCARD, SdCard};
 
 const BULK_ENDPOINT_PACKET_SIZE: usize = 64;
 
-// 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);
+pub static MSC_SHUTDOWN: Signal<CriticalSectionRawMutex, ()> = Signal::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);
+// 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()));
 
 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>) -> Self {
+    pub fn new(builder: &mut Builder<'d, D>, temp_sd: Option<SdCard>) -> 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);
@@ -42,56 +40,32 @@ 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: None,
+            temp_sd,
+            pending_eject: false,
+            ejected: false,
             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.prevent_removal && (SCSI_HALT.load(Ordering::Acquire) || self.pending_eject) {
-                if self.temp_sd.is_some() {
-                    self.return_sdcard().await;
-                    SCSI_BUSY.store(false, Ordering::Release);
-                    self.pending_eject = false;
+            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.temp_sd.is_some() {
+                        let mut guard = SDCARD.get().lock().await;
+                        guard.replace(self.temp_sd.take().unwrap()).unwrap();
+                    }
+
+                    self.ejected = true;
+
+                    return;
                 }
-            } else {
-                self.handle_cbw().await;
-            }
-
-            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;
             }
         }
     }
@@ -101,19 +75,31 @@ 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
                     }
-                } else {
-                    self.last_sense = ScsiSense::invalid_cdb();
-                    self.send_csw_fail(0).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;
             }
         }
     }
@@ -121,12 +107,6 @@ 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 {
@@ -206,41 +186,16 @@ impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
                 self.bulk_in.write(&response[..len]).await.map_err(|_| ())
             }
             ScsiCommand::TestUnitReady => {
-                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(())
-                        }
-                    }
-                    None => {
-                        self.last_sense = ScsiSense::medium_not_present();
-                        Err(())
-                    }
+                if self.temp_sd.as_ref().unwrap().is_attached() {
+                    Ok(())
+                } else {
+                    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::RequestSense {
+                desc: _,
+                alloc_len: _,
+            } => Ok(()),
             ScsiCommand::ModeSense6 {
                 dbd: _,
                 page_control: _,
@@ -279,183 +234,125 @@ impl<'d, 's, D: Driver<'d>> MassStorageClass<'d, D> {
 
                 self.bulk_in.write(&response[..len]).await.map_err(|_| ())
             }
-            ScsiCommand::ReadCapacity10 => match self.temp_sd.as_ref() {
-                Some(sd) => {
-                    let total_blocks = sd.size() / BLOCK_SIZE as u64;
+            ScsiCommand::ReadCapacity10 => {
+                let block_size = SdCard::BLOCK_SIZE as u64;
+                let total_blocks = self.temp_sd.as_ref().unwrap().size() / block_size;
 
-                    let last_lba = total_blocks.checked_sub(1).unwrap_or(0);
+                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(&(last_lba as u32).to_be_bytes())?;
+                response.extend_from_slice(&(block_size as u32).to_be_bytes())?;
 
-                    self.bulk_in.write(&response).await.map_err(|_| ())
-                }
-                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;
+                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;
 
-                    let last_lba = total_blocks.checked_sub(1).unwrap_or(0);
+                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(&[0u8; 20])?; // 20 reserved bytes zeroed
+                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(&[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(|_| ())
-                }
-                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 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() };
+                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))?;
 
-                    while blocks > 0 {
-                        if blocks >= block_buf.len() as u64 {
-                            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())
-                                {
-                                    if self.bulk_in.write(chunk).await.map_err(|_| ()).is_err() {
-                                        error_occurred = true
-                                    }
-                                }
+                        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(|_| ())?;
                             }
-
-                            blocks -= block_buf.len() as u64;
-                            idx += block_buf.len() as u64;
-                        } else {
-                            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())
-                                {
-                                    if self.bulk_in.write(chunk).await.map_err(|_| ()).is_err() {
-                                        error_occurred = true
-                                    }
-                                }
-                            }
-
-                            idx += blocks;
-                            blocks = 0;
                         }
-                    }
 
-                    if error_occurred {
-                        self.last_sense = ScsiSense::unrecovered_read_error();
-                        return Err(());
-                    }
+                        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))?;
 
-                    Ok(())
-                }
-                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())
-                                {
-                                    if self.bulk_out.read(chunk).await.map_err(|_| ()).is_err() {
-                                        error_occurred = true
-                                    }
-                                }
+                        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(|_| ())?;
                             }
-
-                            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())
-                                {
-                                    if self.bulk_out.read(chunk).await.map_err(|_| ()).is_err() {
-                                        error_occurred = true
-                                    }
-                                }
-                            }
-
-                            sd.write_blocks(
-                                &mut block_buf[..blocks as usize],
-                                BlockIdx(idx as u32),
-                            )?;
-
-                            idx += blocks;
-                            blocks = 0;
                         }
+
+                        idx += blocks;
+                        blocks = 0;
                     }
-
-                    if error_occurred {
-                        self.last_sense = ScsiSense::unrecovered_write_error();
-                        return Err(());
-                    }
-
-                    Ok(())
                 }
-                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 = (sd.size() / block_size as u64) as u32;
-
-                    let mut response = [0u8; 12];
-
-                    // Capacity List Length (8 bytes follows)
-                    response[3] = 8;
-
-                    // Descriptor
-                    response[4..8].copy_from_slice(&num_blocks.to_be_bytes());
-                    response[8] = 0x03; // formatted media
-                    response[9..12].copy_from_slice(&block_size.to_be_bytes()[1..4]); // only 3 bytes
-
-                    let response_len = alloc_len.min(response.len() as u16) as usize;
-                    self.bulk_in
-                        .write(&response[..response_len])
-                        .await
-                        .map_err(|_| ())
-                }
-                None => {
-                    self.last_sense = ScsiSense::medium_not_present();
-                    Err(())
-                }
-            },
-            ScsiCommand::PreventAllowMediumRemoval { prevent } => {
-                self.prevent_removal = prevent;
                 Ok(())
             }
+            ScsiCommand::Write { lba, len } => {
+                let sdcard = self.temp_sd.as_ref().unwrap();
+                let block_buf = unsafe { &mut *BLOCK_BUF.get_mut() };
+                let mut blocks = len;
+                let mut idx = lba;
+
+                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())
+                            {
+                                self.bulk_out.read(chunk).await.map_err(|_| ())?;
+                            }
+                        }
+
+                        sdcard.read_blocks(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())
+                            {
+                                self.bulk_out.read(chunk).await.map_err(|_| ())?;
+                            }
+                        }
+
+                        sdcard.write_blocks(
+                            &mut block_buf[..blocks as usize],
+                            BlockIdx(idx as u32),
+                        )?;
+
+                        idx += blocks;
+                        blocks = 0;
+                    }
+                }
+                Ok(())
+            }
+            ScsiCommand::ReadFormatCapacities { alloc_len } => {
+                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 mut response = [0u8; 12];
+
+                // Capacity List Length (8 bytes follows)
+                response[3] = 8;
+
+                // Descriptor
+                response[4..8].copy_from_slice(&num_blocks.to_be_bytes());
+                response[8] = 0x03; // formatted media
+                response[9..12].copy_from_slice(&block_size.to_be_bytes()[1..4]); // only 3 bytes
+
+                let response_len = alloc_len.min(response.len() as u16) as usize;
+                self.bulk_in
+                    .write(&response[..response_len])
+                    .await
+                    .map_err(|_| ())
+            }
+            ScsiCommand::PreventAllowMediumRemoval { prevent: _prevent } => Ok(()),
             ScsiCommand::StartStopUnit { start, load_eject } => {
                 if !start && load_eject {
-                    SCSI_EJECTED.store(true, Ordering::Release);
                     self.pending_eject = true;
                 }
                 Ok(())
@@ -469,9 +366,7 @@ 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);
-        }
+        defmt::error!("Command Failed: {}", tag);
         self.send_csw(tag, 0x01, 0).await; // 0x01 = Command Failed
     }
 

kernel/src/ui.rs

@@ -1,26 +1,18 @@
 use crate::{
-    BINARY_CH,
-    display::FRAMEBUFFER,
-    framebuffer::FB_PAUSED,
-    peripherals::keyboard,
-    scsi::SCSI_BUSY,
-    storage::{FileName, SDCARD},
+    BINARY_CH, display::FRAMEBUFFER, elf::load_binary, framebuffer::FB_PAUSED,
+    peripherals::keyboard, storage::FileName,
 };
 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_4X6, FONT_10X20},
-    },
+    mono_font::{MonoTextStyle, ascii::FONT_10X20},
     pixelcolor::Rgb565,
     prelude::{Dimensions, Point, Primitive, RgbColor, Size},
     primitives::{PrimitiveStyle, Rectangle},
-    text::{Alignment, Text},
+    text::Text,
 };
 use embedded_layout::{
     align::{horizontal, vertical},
@@ -29,240 +21,167 @@ use embedded_layout::{
 };
 use embedded_text::TextBox;
 
+pub static SELECTIONS: Mutex<CriticalSectionRawMutex, SelectionList> =
+    Mutex::new(SelectionList::new());
+
 pub async fn ui_handler() {
-    let mut ui = UiState { page: UiPage::Menu };
-    let mut menu = MenuPage {
-        last_bounds: None,
-        selection: 0,
-        changed: true,
-    };
-    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;
-        }
+        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();
 
-        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;
-    }
-}
-
-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,
+                        let entry = unsafe {
+                            load_binary(&selection.short_name)
+                                .await
+                                .expect("unable to load binary")
+                        };
+                        BINARY_CH.send(entry).await;
+                    }
+                    _ => (),
+                }
             }
         }
-    }
-    false
-}
 
-#[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;
+        let changed = SELECTIONS.lock().await.changed;
+        if changed {
+            clear_selection().await;
+            draw_selection().await;
         }
-        self.last_bounds = None;
     }
 }
 
-static SELECTIONS: Mutex<CriticalSectionRawMutex, Vec<FileName>> = Mutex::new(Vec::new());
-static mut SELECTIONS_CHANGED: bool = true;
+pub async fn clear_selection() {
+    let sel = SELECTIONS.lock().await;
 
-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 }
+    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();
     }
 }
-struct MenuPage {
+
+async fn draw_selection() {
+    let mut guard = SELECTIONS.lock().await;
+    let file_names = &guard.selections.clone();
+
+    let text_style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
+    let display_area = unsafe { FRAMEBUFFER.as_mut().unwrap().bounding_box() };
+
+    const NO_BINS: &str = "No Programs found on SD Card. Ensure programs end with '.bin', and are located in the root directory";
+    let no_bins = String::from_str(NO_BINS).unwrap();
+
+    FB_PAUSED.store(true, Ordering::Release); // ensure all elements show up at once
+
+    if file_names.is_empty() {
+        TextBox::new(
+            &no_bins,
+            Rectangle::new(
+                Point::new(25, 25),
+                Size::new(display_area.size.width - 50, display_area.size.width - 50),
+            ),
+            text_style,
+        )
+        .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
+        .unwrap();
+    } else {
+        let mut views: alloc::vec::Vec<Text<MonoTextStyle<Rgb565>>> = Vec::new();
+
+        for i in file_names {
+            views.push(Text::new(&i.long_name, Point::zero(), text_style));
+        }
+
+        let views_group = Views::new(views.as_mut_slice());
+
+        let layout = LinearLayout::vertical(views_group)
+            .with_alignment(horizontal::Center)
+            .with_spacing(FixedMargin(5))
+            .arrange()
+            .align_to(&display_area, horizontal::Center, vertical::Center);
+
+        // draw selected box
+        let selected_bounds = layout
+            .inner()
+            .get(guard.current_selection as usize)
+            .expect("Selected binary missing")
+            .bounding_box();
+        Rectangle::new(selected_bounds.top_left, selected_bounds.size)
+            .into_styled(PrimitiveStyle::with_stroke(Rgb565::WHITE, 1))
+            .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
+            .unwrap();
+
+        guard.last_bounds = Some(layout.bounds());
+
+        layout
+            .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
+            .unwrap();
+    }
+
+    guard.changed = false;
+    FB_PAUSED.store(false, Ordering::Release); // ensure all elements show up at once
+}
+
+#[derive(Clone)]
+pub struct SelectionList {
+    // allows easy clearing of selection ui,
+    // based on previous bounds
     last_bounds: Option<Rectangle>,
-    selection: usize,
+    current_selection: u16,
+    selections: Vec<FileName>,
     changed: bool,
 }
 
-impl Page for MenuPage {
-    async fn draw(&mut self) {
-        if self.changed {
-            self.clear().await;
+impl SelectionList {
+    pub const fn new() -> Self {
+        Self {
+            last_bounds: None,
+            selections: Vec::new(),
+            current_selection: 0,
+            changed: false,
         }
-
-        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() };
-
-        const NO_BINS: &str = "No Programs found on SD Card. Ensure programs end with '.bin', and are located in the root directory";
-        let no_bins = String::from_str(NO_BINS).unwrap();
-
-        FB_PAUSED.store(true, Ordering::Release); // ensure all elements show up at once
-
-        if file_names.is_empty() {
-            TextBox::new(
-                &no_bins,
-                Rectangle::new(
-                    Point::new(25, 25),
-                    Size::new(display_area.size.width - 50, display_area.size.width - 50),
-                ),
-                text_style,
-            )
-            .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
-            .unwrap();
-        } else {
-            let mut views: alloc::vec::Vec<Text<MonoTextStyle<Rgb565>>> = Vec::new();
-
-            for i in file_names {
-                views.push(Text::new(&i.long_name, Point::zero(), text_style));
-            }
-
-            let views_group = Views::new(views.as_mut_slice());
-
-            let layout = LinearLayout::vertical(views_group)
-                .with_alignment(horizontal::Center)
-                .with_spacing(FixedMargin(5))
-                .arrange()
-                .align_to(&display_area, horizontal::Center, vertical::Center);
-
-            // draw selected box
-            let selected_bounds = layout
-                .inner()
-                .get(self.selection)
-                .expect("Selected binary missing")
-                .bounding_box();
-            Rectangle::new(selected_bounds.top_left, selected_bounds.size)
-                .into_styled(PrimitiveStyle::with_stroke(Rgb565::WHITE, 1))
-                .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
-                .unwrap();
-
-            self.last_bounds = Some(layout.bounds());
-
-            layout
-                .draw(unsafe { &mut *FRAMEBUFFER.as_mut().unwrap() })
-                .unwrap();
-        }
-
-        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();
+    pub fn set_changed(&mut self, changed: bool) {
+        self.changed = changed
+    }
 
-                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
-                }
-            }
-            _ => (),
-        }
+    pub fn update_selections(&mut self, selections: Vec<FileName>) {
+        self.selections = selections;
         self.changed = true;
-        false
     }
 
-    async fn clear(&mut self) {
-        if let Some(rect) = self.last_bounds {
-            clear_rect(rect).await;
+    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;
         }
-        self.last_bounds = None;
     }
 }
-
-pub async fn clear_screen() {
-    clear_rect(Rectangle {
-        top_left: Point::zero(),
-        size: Size::new(320, 320),
-    })
-    .await
-}
-
-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,8 +1,10 @@
-use crate::scsi::{MassStorageClass, SCSI_EJECTED};
-use core::sync::atomic::Ordering;
-use embassy_futures::join::join;
+use crate::{scsi::MassStorageClass, storage::SdCard};
+use core::sync::atomic::{AtomicBool, Ordering};
+use embassy_futures::select::select;
 use embassy_rp::{peripherals::USB, usb::Driver};
-use embassy_usb::{Builder, Config};
+use embassy_usb::{Builder, Config, UsbDevice};
+
+pub static USB_ACTIVE: AtomicBool = AtomicBool::new(false);
 
 #[embassy_executor::task]
 pub async fn usb_handler(driver: Driver<'static, USB>) {
@@ -26,18 +28,18 @@ pub async fn usb_handler(driver: Driver<'static, USB>) {
         &mut control_buf,
     );
 
-    let mut scsi = MassStorageClass::new(&mut builder);
-    let mut usb = builder.build();
+    let temp_sd: Option<SdCard> = None;
+    let mut scsi = MassStorageClass::new(&mut builder, temp_sd);
+    let usb = builder.build();
 
-    join(
-        async {
-            loop {
-                usb.wait_resume().await;
-                SCSI_EJECTED.store(false, Ordering::Release);
-                usb.run_until_suspend().await;
-            }
-        },
-        scsi.poll(),
-    )
-    .await;
+    select(run(usb), scsi.poll()).await;
+}
+
+async fn run<'d>(mut usb: UsbDevice<'d, Driver<'d, USB>>) -> ! {
+    loop {
+        usb.wait_resume().await;
+        USB_ACTIVE.store(true, Ordering::Release);
+        usb.run_until_suspend().await;
+        USB_ACTIVE.store(false, Ordering::Release);
+    }
 }

main_proc_macro/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "main_proc_macro"
+version = "0.1.0"
+edition = "2024"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+quote = "1.0.41"
+syn = "2.0.108"

main_proc_macro/src/lib.rs

@@ -0,0 +1,21 @@
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{ItemFn, parse_macro_input};
+
+#[proc_macro_attribute]
+pub fn main(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(item as ItemFn);
+    let name = &input.sig.ident;
+
+    // ensure we emit _start in the same module as the fn
+    let expanded = quote! {
+        #input
+
+        #[unsafe(no_mangle)]
+        pub extern "Rust" fn _start() {
+            #name();
+        }
+    };
+
+    expanded.into()
+}

selection_ui/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "selection_ui"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-abi = { path = "../abi" }
-embedded-graphics = "0.8.1"
-embedded-layout = "0.4.2"
-embedded-text = "0.7.3"

selection_ui/src/lib.rs

@@ -1,119 +0,0 @@
-#![no_std]
-
-extern crate alloc;
-
-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, Point, Primitive, RgbColor, Size},
-    primitives::{PrimitiveStyle, Rectangle},
-    text::Text,
-};
-use embedded_layout::{
-    align::{horizontal, vertical},
-    layout::linear::{FixedMargin, LinearLayout},
-    prelude::*,
-};
-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], 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>, ()> {
-        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);
-                    break;
-                }
-            }
-        }
-        Ok(selection)
-    }
-
-    /// 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>, ()> {
-        match key {
-            KeyCode::JoyUp => {
-                self.selection = self.selection.saturating_sub(1);
-            }
-            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<(), ()> {
-        let text_style = MonoTextStyle::new(&FONT_10X20, Rgb565::WHITE);
-        let display_area = display.bounding_box();
-
-        if self.items.is_empty() {
-            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)
-            .unwrap();
-        }
-
-        let mut views: Vec<Text<MonoTextStyle<Rgb565>>> = Vec::new();
-
-        for i in self.items {
-            views.push(Text::new(i, Point::zero(), text_style));
-        }
-
-        let views_group = Views::new(views.as_mut_slice());
-
-        let layout = LinearLayout::vertical(views_group)
-            .with_alignment(horizontal::Center)
-            .with_spacing(FixedMargin(5))
-            .arrange()
-            .align_to(&display_area, horizontal::Center, vertical::Center);
-
-        // draw selected 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)?;
-
-        self.last_bounds = Some(layout.bounds());
-
-        layout.draw(display)?;
-        Ok(())
-    }
-}

user-apps/calculator/src/main.rs

@@ -9,7 +9,6 @@ use abi::{
     print,
 };
 use alloc::{format, string::String, vec, vec::Vec};
-use core::panic::PanicInfo;
 use embedded_graphics::{
     Drawable,
     geometry::{Dimensions, Point},
@@ -26,12 +25,6 @@ use embedded_layout::{
     prelude::Chain,
 };
 
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    print!("user panic: {} @ {:?}", info.message(), info.location(),);
-    loop {}
-}
-
 #[unsafe(no_mangle)]
 pub extern "Rust" fn _start() {
     main()

user-apps/gallery/src/main.rs

@@ -5,35 +5,25 @@
 extern crate alloc;
 use abi::{
     display::{Display, SCREEN_HEIGHT, SCREEN_WIDTH},
-    fs::{Entries, list_dir, read_file},
+    fs::{list_dir, read_file},
     get_key,
     keyboard::{KeyCode, KeyState},
-    print,
+    main, print,
 };
-use alloc::{format, vec};
-use core::panic::PanicInfo;
+use alloc::{format, string::ToString, vec};
 use embedded_graphics::{
     Drawable, image::Image, mono_font::MonoTextStyle, mono_font::ascii::FONT_6X10,
     pixelcolor::Rgb565, prelude::*, text::Text,
 };
 use tinybmp::Bmp;
 
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    print!("user panic: {} @ {:?}", info.message(), info.location());
-    loop {}
-}
-
-#[unsafe(no_mangle)]
-pub extern "Rust" fn _start() {
-    main()
-}
-
+#[main]
 pub fn main() {
     print!("Starting Gallery app");
     let mut bmp_buf = vec![0_u8; 100_000];
     let mut display = Display;
 
+    // Grid parameters
     let grid_cols = 3;
     let grid_rows = 3;
     let cell_width = SCREEN_WIDTH as i32 / grid_cols;
@@ -41,44 +31,50 @@ pub fn main() {
 
     let mut images_drawn = 0;
 
-    let mut entries = Entries::new();
-    let files_num = list_dir("/images", &mut entries);
+    let mut files = [const { None }; 18];
+    let files_num = list_dir("/images", &mut files);
 
-    for file in &entries.entries()[2..files_num] {
+    for file in &files[2..files_num] {
         if images_drawn >= grid_cols * grid_rows {
             break; // only draw 3x3
         }
 
-        print!("file: {}", file);
-        if file.extension().unwrap_or("") == "bmp" || file.extension().unwrap_or("") == "BMP" {
-            let file_path = format!("/images/{}", file);
+        if let Some(f) = file {
+            print!("file: {}", f.name);
+            if f.name.extension() == b"bmp" || f.name.extension() == b"BMP" {
+                let file = format!("/images/{}", f.name);
 
-            let read = read_file(&file_path, 0, &mut &mut bmp_buf[..]);
-            if read > 0 {
-                let bmp = Bmp::from_slice(&bmp_buf).expect("failed to parse bmp");
+                let read = read_file(&file, 0, &mut &mut bmp_buf[..]);
+                if read > 0 {
+                    let bmp = Bmp::from_slice(&bmp_buf).expect("failed to parse bmp");
 
-                let row = images_drawn / grid_cols;
-                let col = images_drawn % grid_cols;
-                let cell_x = col * cell_width;
-                let cell_y = row * cell_height;
+                    let row = images_drawn / grid_cols;
+                    let col = images_drawn % grid_cols;
+                    let cell_x = col * cell_width;
+                    let cell_y = row * cell_height;
 
-                // Center image inside cell
-                let bmp_w = bmp.size().width as i32;
-                let bmp_h = bmp.size().height as i32;
-                let x = cell_x + (cell_width - bmp_w) / 2;
-                let y = cell_y + 5; // 5px top margin
+                    // Center image inside cell
+                    let bmp_w = bmp.size().width as i32;
+                    let bmp_h = bmp.size().height as i32;
+                    let x = cell_x + (cell_width - bmp_w) / 2;
+                    let y = cell_y + 5; // 5px top margin
 
-                Image::new(&bmp, Point::new(x, y))
+                    Image::new(&bmp, Point::new(x, y))
+                        .draw(&mut display)
+                        .unwrap();
+
+                    let text_style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE);
+                    let text_y = y + bmp_h + 2; // 2px gap under image
+                    Text::new(
+                        f.name.to_string().as_str(),
+                        Point::new(cell_x + 2, text_y),
+                        text_style,
+                    )
                     .draw(&mut display)
                     .unwrap();
 
-                let text_style = MonoTextStyle::new(&FONT_6X10, Rgb565::WHITE);
-                let text_y = y + bmp_h + 2; // 2px gap under image
-                Text::new(&file.base(), Point::new(cell_x + 2, text_y), text_style)
-                    .draw(&mut display)
-                    .unwrap();
-
-                images_drawn += 1;
+                    images_drawn += 1;
+                }
             }
         }
     }

user-apps/gif/Cargo.toml

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

user-apps/gif/src/main.rs

@@ -4,55 +4,29 @@
 extern crate alloc;
 use abi::{
     display::Display,
-    fs::{Entries, file_len, list_dir, read_file},
+    fs::{file_len, read_file},
     get_key, get_ms,
     keyboard::{KeyCode, KeyState},
-    print, sleep,
+    main, print, sleep,
 };
-use alloc::{format, vec, vec::Vec};
-use core::panic::PanicInfo;
+use alloc::{format, vec};
 use embedded_graphics::{
     image::ImageDrawable, pixelcolor::Rgb565, prelude::Point, transform::Transform,
 };
-use selection_ui::SelectionUi;
 use tinygif::Gif;
 
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    print!("user panic: {} @ {:?}", info.message(), info.location(),);
-    loop {}
-}
-
-#[unsafe(no_mangle)]
-pub extern "Rust" fn _start() {
-    main()
-}
-
+#[main]
 pub fn main() {
     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 gifs = &files.iter().map(|e| e.full_name()).collect::<Vec<&str>>();
-
-    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");
-
-    let file_name = format!("/gifs/{}", gifs[selection]);
-    let size = file_len(&file_name);
+    let size = file_len("/gifs/bad_apple.gif");
     let mut buf = vec![0_u8; size];
-    let read = read_file(&file_name, 0, &mut buf);
+    let read = read_file("/gifs/bad_apple.gif", 0, &mut buf);
     print!("read: {}, file size: {}", read, size);
     assert!(read == size);
 
-    let gif = Gif::<Rgb565>::from_slice(&buf).expect("Failed to parse gif");
+    let gif = Gif::<Rgb565>::from_slice(&buf).unwrap();
     let height = gif.height();
 
     let mut frame_num = 0;

user-apps/snake/src/main.rs

@@ -9,16 +9,10 @@ use abi::{
     keyboard::{KeyCode, KeyState},
     print, sleep,
 };
-use core::panic::PanicInfo;
+use alloc::format;
 use embedded_graphics::{pixelcolor::Rgb565, prelude::RgbColor};
 use embedded_snake::{Direction, SnakeGame};
 
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    print!("user panic: {} @ {:?}", info.message(), info.location(),);
-    loop {}
-}
-
 #[unsafe(no_mangle)]
 pub extern "Rust" fn _start() {
     main()