Merge pull request #5 from Neotron-Compute/pico_fixups

Pico fixups

Author: jonathanpallant

.gitmodules

@@ -30,7 +30,7 @@ codegen-units = 1
 opt-level = "s"
 
 [dependencies]
-neotron-common-bios = { path = "./common" }
+neotron-common-bios = "0.1.0"
 r0 = "1.0"
 postcard = "0.5"
 serde = { version = "1.0", default-features = false }

Cargo.toml

@@ -50,7 +50,7 @@ Your BIOS should tell you which one you want and how to load it onto your system
 
 ## Licence
 
-    Neotron-OS Copyright (c) The Neotron Developers, 2020
+    Neotron-OS Copyright (c) The Neotron Developers, 2022
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

README.md

@@ -1,5 +1,22 @@
 fn main() {
-    println!("cargo:rustc-link-arg-bin=flash1002=-Tneotron-flash-1000.ld");
-    println!("cargo:rustc-link-arg-bin=flash0802=-Tneotron-flash-0800.ld");
-    println!("cargo:rustc-link-arg-bin=flash0002=-Tneotron-flash-0000.ld");
+    println!("cargo:rustc-link-arg-bin=flash1002=-Tneotron-flash-1002.ld");
+    println!("cargo:rustc-link-arg-bin=flash0802=-Tneotron-flash-0802.ld");
+    println!("cargo:rustc-link-arg-bin=flash0002=-Tneotron-flash-0002.ld");
+
+    if let Ok(cmd_output) = std::process::Command::new("git")
+        .arg("describe")
+        .arg("--all")
+        .arg("--dirty")
+        .arg("--long")
+        .output()
+    {
+        let git_version = std::str::from_utf8(&cmd_output.stdout).unwrap();
+        println!(
+            "cargo:rustc-env=OS_VERSION={} (git:{})",
+            env!("CARGO_PKG_VERSION"),
+            git_version.trim()
+        );
+    } else {
+        println!("cargo:rustc-env=OS_VERSION={}", env!("CARGO_PKG_VERSION"));
+    }
 }

build.rs

@@ -31,7 +31,7 @@ MEMORY
 }
 
 /* # Entry point = what the BIOS calls to start the OS */
-ENTRY(entry_point);
+ENTRY(main);
 EXTERN(__RESET_VECTOR);
 
 /* # Sections */

common

@@ -31,7 +31,7 @@ MEMORY
 }
 
 /* # Entry point = what the BIOS calls to start the OS */
-ENTRY(entry_point);
+ENTRY(main);
 EXTERN(__RESET_VECTOR);
 
 /* # Sections */

neotron-flash-0000.ld neotron-flash-0002.ldneotron-flash-0000.ld renamed to neotron-flash-0002.ld

@@ -31,7 +31,7 @@ MEMORY
 }
 
 /* # Entry point = what the BIOS calls to start the OS */
-ENTRY(entry_point);
+ENTRY(main);
 EXTERN(__RESET_VECTOR);
 
 /* # Sections */

neotron-flash-0800.ld neotron-flash-0802.ldneotron-flash-0800.ld renamed to neotron-flash-0802.ld

@@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize};
 // ===========================================================================
 
 /// The OS version string
-const OS_VERSION: &str = concat!("Neotron OS, version ", env!("CARGO_PKG_VERSION"), "-2");
+const OS_VERSION: &str = concat!("Neotron OS, version ", env!("OS_VERSION"));
 
 /// We store the API object supplied by the BIOS here
 static mut API: Option<&'static bios::Api> = None;
@@ -275,6 +275,7 @@ unsafe fn start_up_init() {
 
 /// This is the function the BIOS calls. This is because we store the address
 /// of this function in the ENTRY_POINT_ADDR variable.
+#[no_mangle]
 pub extern "C" fn main(api: &'static bios::Api) -> ! {
     unsafe {
         start_up_init();
@@ -284,15 +285,14 @@ pub extern "C" fn main(api: &'static bios::Api) -> ! {
     let config = Config::load().unwrap_or_else(|_| Config::default());
 
     if config.has_vga_console() {
-        let mut addr: *mut u8 = core::ptr::null_mut();
-        let mut width = 0;
-        let mut height = 0;
-        (api.video_memory_info_get)(&mut addr, &mut width, &mut height);
-        if !addr.is_null() {
+        let mode = (api.video_get_mode)();
+        let (width, height) = (mode.text_width(), mode.text_height());
+
+        if let (Some(width), Some(height)) = (width, height) {
             let mut vga = VgaConsole {
-                addr,
-                width,
-                height,
+                addr: (api.video_get_framebuffer)(),
+                width: width as u8,
+                height: height as u8,
                 row: 0,
                 col: 0,
             };