store VGA mode in config.

Author: thejpster

Cargo.lock

@@ -41,7 +41,7 @@ panic = "abort"
 panic = "abort"
 
 [dependencies]
-neotron-common-bios = { git = "https://github.com/neotron-compute/neotron-common-bios", branch = "make-things-inline" } 
+neotron-common-bios = "0.11.1"
 pc-keyboard = "0.7"
 r0 = "1.0"
 heapless = "0.7"

Cargo.toml

@@ -1,6 +1,6 @@
 //! Configuration related commands for Neotron OS
 
-use crate::{config, osprintln, Ctx};
+use crate::{bios, config, osprintln, Ctx};
 
 pub static COMMAND_ITEM: menu::Item<Ctx> = menu::Item {
     item_type: menu::ItemType::Callback {
@@ -42,16 +42,25 @@ fn command(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, args: &[&str], ctx:
             }
         },
         "vga" => match args.get(1).cloned() {
-            Some("on") => {
-                ctx.config.set_vga_console(true);
-                osprintln!("VGA now on");
-            }
             Some("off") => {
-                ctx.config.set_vga_console(false);
+                ctx.config.set_vga_console(None);
                 osprintln!("VGA now off");
             }
+            Some(mode_str) => {
+                let Some(mode) = mode_str
+                    .parse::<u8>()
+                    .ok()
+                    .and_then(bios::video::Mode::try_from_u8)
+                    .filter(|m| m.is_text_mode())
+                else {
+                    osprintln!("Not a valid text mode");
+                    return;
+                };
+                ctx.config.set_vga_console(Some(mode));
+                osprintln!("VGA set to mode {}", mode.as_u8());
+            }
             _ => {
-                osprintln!("Give on or off as argument");
+                osprintln!("Give integer or off as argument");
             }
         },
         "serial" => match (args.get(1).cloned(), args.get(1).map(|s| s.parse::<u32>())) {
@@ -68,7 +77,14 @@ fn command(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, args: &[&str], ctx:
             }
         },
         "print" => {
-            osprintln!("VGA   : {}", ctx.config.get_vga_console());
+            match ctx.config.get_vga_console() {
+                Some(m) => {
+                    osprintln!("VGA   : Mode {}", m.as_u8());
+                }
+                None => {
+                    osprintln!("VGA   : off");
+                }
+            };
             match ctx.config.get_serial_console() {
                 None => {
                     osprintln!("Serial: off");
@@ -83,7 +99,7 @@ fn command(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, args: &[&str], ctx:
             osprintln!("config help - print this help text");
             osprintln!("config reset - load config from BIOS store");
             osprintln!("config save - save config to BIOS store");
-            osprintln!("config vga on - turn VGA on");
+            osprintln!("config vga <n> - enable VGA in Mode <n>");
             osprintln!("config vga off - turn VGA off");
             osprintln!("config serial off - turn serial console off");
             osprintln!("config serial <baud> - turn serial console on with given baud rate");

src/commands/config.rs

@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 /// Represents our configuration information that we ask the BIOS to serialise
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Config {
-    vga_console: bool,
+    vga_console: Option<u8>,
     serial_console: bool,
     serial_baud: u32,
 }
@@ -39,13 +39,13 @@ impl Config {
     }
 
     /// Should this system use the VGA console?
-    pub fn get_vga_console(&self) -> bool {
-        self.vga_console
+    pub fn get_vga_console(&self) -> Option<bios::video::Mode> {
+        self.vga_console.and_then(bios::video::Mode::try_from_u8)
     }
 
     // Set whether this system should use the VGA console.
-    pub fn set_vga_console(&mut self, new_value: bool) {
-        self.vga_console = new_value;
+    pub fn set_vga_console(&mut self, new_value: Option<bios::video::Mode>) {
+        self.vga_console = new_value.map(|m| m.as_u8());
     }
 
     /// Should this system use the UART console?
@@ -82,7 +82,7 @@ impl Config {
 impl core::default::Default for Config {
     fn default() -> Config {
         Config {
-            vga_console: true,
+            vga_console: Some(0),
             serial_console: false,
             serial_baud: 115200,
         }

src/config.rs

@@ -376,20 +376,19 @@ pub extern "C" fn os_main(api: &bios::Api) -> ! {
     }
 
     let api = API.get();
-    if (api.api_version_get)() != neotron_common_bios::API_VERSION {
+    if (api.api_version_get)() != bios::API_VERSION {
         panic!("API mismatch!");
     }
 
     let config = config::Config::load().unwrap_or_default();
 
-    if config.get_vga_console() {
-        // Try and set 80x30 mode for maximum compatibility
-        (api.video_set_mode)(bios::video::Mode::new(
-            bios::video::Timing::T640x480,
-            bios::video::Format::Text8x16,
-        ));
+    if let Some(mut mode) = config.get_vga_console() {
+        // Set the configured mode
+        if let bios::FfiResult::Err(_e) = (api.video_set_mode)(mode) {
+            // Failed to change mode - check what mode we're in
+            mode = (api.video_get_mode)();
+        };
         // Work with whatever we get
-        let mode = (api.video_get_mode)();
         let (width, height) = (mode.text_width(), mode.text_height());
 
         if let (Some(width), Some(height)) = (width, height) {