Add shutdown command.

Author: jonathanpallant

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 ## Unreleased changes
 
-* Switch to neotron-common-bios 0.9
+* Switch to neotron-common-bios 0.11
+* Added "Shutdown" command
+* Added ANSI decoder for colour changes (SGI) and cursor position support
+* Added 'standard input' support for applications
+* Use new compare-and-swap BIOS API to implement mutexes, instead of `static mut`
 
 ## v0.4.0
 

Cargo.lock

@@ -41,7 +41,7 @@ panic = "abort"
 panic = "abort"
 
 [dependencies]
-neotron-common-bios = { version = "0.11.0-alpha", git = "https://github.com/neotron-compute/neotron-common-bios", branch = "extra-functions" }
+neotron-common-bios = "0.11"
 pc-keyboard = "0.7"
 r0 = "1.0"
 heapless = "0.7"

Cargo.toml

@@ -11,6 +11,18 @@ pub static LSHW_ITEM: menu::Item<Ctx> = menu::Item {
     help: Some("List all the BIOS hardware"),
 };
 
+pub static SHUTDOWN_ITEM: menu::Item<Ctx> = menu::Item {
+    item_type: menu::ItemType::Callback {
+        function: shutdown,
+        parameters: &[
+            menu::Parameter::Named { parameter_name: "reboot", help: Some("Reboot after shutting down") },
+            menu::Parameter::Named { parameter_name: "bootloader", help: Some("Reboot into the bootloader after shutting down") }
+        ],
+    },
+    command: "shutdown",
+    help: Some("Shutdown the system"),
+};
+
 /// Called when the "lshw" command is executed.
 fn lshw(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx: &mut Ctx) {
     let api = API.get();
@@ -104,3 +116,19 @@ fn lshw(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], _ctx:
         osprintln!("  None");
     }
 }
+
+/// Called when the "shutdown" command is executed.
+fn shutdown(_menu: &menu::Menu<Ctx>, item: &menu::Item<Ctx>, args: &[&str], _ctx: &mut Ctx) {
+    let api = API.get();
+
+    if let Ok(Some(_)) = menu::argument_finder(item, args, "reboot") {
+        osprintln!("Rebooting...");
+        (api.power_control)(bios::PowerMode::Reset);
+    } else if let Ok(Some(_)) = menu::argument_finder(item, args, "bootloader") {
+        osprintln!("Rebooting into bootloader...");
+        (api.power_control)(bios::PowerMode::Bootloader);
+    } else {
+        osprintln!("Shutting down...");
+        (api.power_control)(bios::PowerMode::Off);
+    }
+}

src/commands/hardware.rs

@@ -31,6 +31,7 @@ pub static OS_MENU: menu::Menu<Ctx> = menu::Menu {
         &screen::FILL_ITEM,
         &screen::MANDEL_ITEM,
         &input::KBTEST_ITEM,
+        &hardware::SHUTDOWN_ITEM,
     ],
     entry: None,
     exit: None,