Update crates.

Picks up changes to the Bios API for mode setting.

Author: thejpster

Cargo.lock

@@ -41,17 +41,17 @@ panic = "abort"
 panic = "abort"
 
 [dependencies]
-neotron-common-bios = { git = "https://github.com/neotron-compute/neotron-common-bios" }
-pc-keyboard = "0.7"
-r0 = "1.0"
+chrono = { version = "0.4", default-features = false }
+embedded-sdmmc = { git = "https://github.com/rust-embedded-community/embedded-sdmmc-rs.git", rev = "ae5e116", default-features = false }
 heapless = "0.7"
-postcard = "1.0"
-serde = { version = "1.0", default-features = false }
 menu = "0.3"
-chrono = { version = "0.4", default-features = false }
-embedded-sdmmc = { git = "https://github.com/rust-embedded-community/embedded-sdmmc-rs.git", rev = "2f14459", default-features = false }
 neotron-api = "0.1"
+neotron-common-bios = "0.12.0"
 neotron-loader = "0.1"
+pc-keyboard = "0.7"
+postcard = "1.0"
+r0 = "1.0"
+serde = { version = "1.0", default-features = false }
 vte = "0.12"
 
 [features]

Cargo.toml

@@ -26,7 +26,7 @@ pub static MODE_ITEM: menu::Item<Ctx> = menu::Item {
         }],
     },
     command: "mode",
-    help: Some("List possible video modes"),
+    help: Some("List/change video mode"),
 };
 
 /// Called when the "cls" command is executed.
@@ -63,7 +63,15 @@ fn mode_cmd(_menu: &menu::Menu<Ctx>, item: &menu::Item<Ctx>, args: &[&str], _ctx
                 return;
             }
         }
-        match (api.video_set_mode)(mode) {
+        if (api.video_mode_needs_vram)(mode) {
+            // The OS currently has no VRAM for text modes
+            osprintln!("That mode requires more VRAM than the BIOS has.");
+            return;
+        }
+        // # Safety
+        //
+        // It's always OK to pass NULl to this API.
+        match unsafe { (api.video_set_mode)(mode, core::ptr::null_mut()) } {
             ApiResult::Ok(_) => {
                 let mut guard = crate::VGA_CONSOLE.lock();
                 if let Some(console) = guard.as_mut() {

src/commands/screen.rs

@@ -389,7 +389,9 @@ pub extern "C" fn os_main(api: &bios::Api) -> ! {
 
     if let Some(mut mode) = config.get_vga_console() {
         // Set the configured mode
-        if let bios::FfiResult::Err(_e) = (api.video_set_mode)(mode) {
+        if let bios::FfiResult::Err(_e) =
+            unsafe { (api.video_set_mode)(mode, core::ptr::null_mut()) }
+        {
             // Failed to change mode - check what mode we're in
             mode = (api.video_get_mode)();
         };

src/lib.rs

@@ -52,7 +52,7 @@ impl VgaConsole {
         false,
     );
 
-    pub fn new(addr: *mut u8, width: isize, height: isize) -> VgaConsole {
+    pub fn new(addr: *mut u32, width: isize, height: isize) -> VgaConsole {
         VgaConsole {
             inner: ConsoleInner {
                 addr,
@@ -112,16 +112,31 @@ impl VgaConsole {
 ///
 /// Separate from the parser, so it can be passed to the `advance` method.
 struct ConsoleInner {
-    addr: *mut u8,
+    /// The start of our text buffer.
+    ///
+    /// Always 32-bit aligned.
+    addr: *mut u32,
+    /// The width of the screen in characters
     width: isize,
+    /// The height of the screen in characters
     height: isize,
+    /// The current row position in characters
     row: isize,
+    /// The current column position in characters
     col: isize,
+    /// The attribute to apply to the next character we draw
     attr: Attr,
+    /// Have we seen the ANSI 'bold' command?
     bright: bool,
+    /// Have we seen the ANSI 'reverse' command?
     reverse: bool,
+    /// Should we draw a cursor?
     cursor_wanted: bool,
+    /// How many times has the cursor been turned off?
+    ///
+    /// The cursor is only enabled when at `0`.
     cursor_depth: u8,
+    /// What character should be where the cursor currently is?
     cursor_holder: Option<u8>,
 }
 
@@ -237,7 +252,8 @@ impl ConsoleInner {
         }
 
         let offset = ((row * self.width) + col) * 2;
-        unsafe { core::ptr::write_volatile(self.addr.offset(offset), glyph) };
+        let byte_addr = self.addr as *mut u8;
+        unsafe { core::ptr::write_volatile(byte_addr.offset(offset), glyph) };
         let attr = if self.reverse {
             let new_fg = self.attr.bg().make_foreground();
             let new_bg = self.attr.fg().make_background();
@@ -246,7 +262,7 @@ impl ConsoleInner {
             self.attr
         };
 
-        unsafe { core::ptr::write_volatile(self.addr.offset(offset + 1), attr.as_u8()) };
+        unsafe { core::ptr::write_volatile(byte_addr.offset(offset + 1), attr.as_u8()) };
     }
 
     /// Read a glyph at the current position
@@ -266,20 +282,21 @@ impl ConsoleInner {
             assert!(self.cursor_holder.is_none());
         }
         let offset = ((row * self.width) + col) * 2;
-        unsafe { core::ptr::read_volatile(self.addr.offset(offset)) }
+        let byte_addr = self.addr as *const u8;
+        unsafe { core::ptr::read_volatile(byte_addr.offset(offset)) }
     }
 
     /// Move everyone on screen up one line, losing the top line.
     ///
     /// The bottom line will be all space characters.
     fn scroll_page(&mut self) {
-        let row_len_bytes = self.width * 2;
+        let row_len_words = self.width / 2;
         unsafe {
             // Scroll rows[1..=height-1] to become rows[0..=height-2].
             core::ptr::copy(
-                self.addr.offset(row_len_bytes),
+                self.addr.offset(row_len_words),
                 self.addr,
-                (row_len_bytes * (self.height - 1)) as usize,
+                (row_len_words * (self.height - 1)) as usize,
             );
         }
         // Blank the bottom line of the screen (rows[height-1]).