Run command takes arguments.

Author: thejpster

Cargo.lock

@@ -45,7 +45,7 @@ chrono = { version = "0.4", default-features = false }
 embedded-sdmmc = { version = "0.7", default-features = false }
 heapless = "0.7"
 menu = "0.3"
-neotron-api = "0.1"
+neotron-api = "0.2"
 neotron-common-bios = "0.12.0"
 neotron-loader = "0.1"
 pc-keyboard = "0.7"

Cargo.toml

@@ -24,10 +24,27 @@ pub static HEXDUMP_ITEM: menu::Item<Ctx> = menu::Item {
 pub static RUN_ITEM: menu::Item<Ctx> = menu::Item {
     item_type: menu::ItemType::Callback {
         function: run,
-        parameters: &[],
+        parameters: &[
+            menu::Parameter::Optional {
+                parameter_name: "arg1",
+                help: None,
+            },
+            menu::Parameter::Optional {
+                parameter_name: "arg2",
+                help: None,
+            },
+            menu::Parameter::Optional {
+                parameter_name: "arg3",
+                help: None,
+            },
+            menu::Parameter::Optional {
+                parameter_name: "arg4",
+                help: None,
+            },
+        ],
     },
     command: "run",
-    help: Some("Jump to start of application area"),
+    help: Some("Run a program (with up to four arguments)"),
 };
 
 pub static LOAD_ITEM: menu::Item<Ctx> = menu::Item {
@@ -90,8 +107,8 @@ fn hexdump(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, args: &[&str], _ctx
 }
 
 /// Called when the "run" command is executed.
-fn run(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, _args: &[&str], ctx: &mut Ctx) {
-    match ctx.tpa.execute() {
+fn run(_menu: &menu::Menu<Ctx>, _item: &menu::Item<Ctx>, args: &[&str], ctx: &mut Ctx) {
+    match ctx.tpa.execute(args) {
         Ok(0) => {
             osprintln!();
         }

src/commands/ram.rs

@@ -1,6 +1,6 @@
 //! Program Loading and Execution
 
-use crate::{osprint, osprintln, FILESYSTEM};
+use crate::{osprintln, FILESYSTEM};
 
 #[allow(unused)]
 static CALLBACK_TABLE: neotron_api::Api = neotron_api::Api {
@@ -230,15 +230,23 @@ impl TransientProgramArea {
     /// an exit code that is non-zero is not considered a failure from the point
     /// of view of this API. You wanted to run a program, and the program was
     /// run.
-    pub fn execute(&mut self) -> Result<i32, Error> {
+    pub fn execute(&mut self, args: &[&str]) -> Result<i32, Error> {
         if self.last_entry == 0 {
             return Err(Error::NothingLoaded);
         }
 
+        // We support a maximum of four arguments.
+        let ffi_args = [
+            neotron_api::FfiString::new(args.get(0).unwrap_or(&"")),
+            neotron_api::FfiString::new(args.get(1).unwrap_or(&"")),
+            neotron_api::FfiString::new(args.get(2).unwrap_or(&"")),
+            neotron_api::FfiString::new(args.get(3).unwrap_or(&"")),
+        ];
+
         let result = unsafe {
-            let code: extern "C" fn(*const neotron_api::Api) -> i32 =
+            let code: neotron_api::AppStartFn =
                 ::core::mem::transmute(self.last_entry as *const ());
-            code(&CALLBACK_TABLE)
+            code(&CALLBACK_TABLE, args.len(), ffi_args.as_ptr())
         };
 
         self.last_entry = 0;
@@ -278,17 +286,6 @@ impl TransientProgramArea {
     }
 }
 
-/// Application API to print things to the console.
-#[allow(unused)]
-extern "C" fn print_fn(data: *const u8, len: usize) {
-    let slice = unsafe { core::slice::from_raw_parts(data, len) };
-    if let Ok(s) = core::str::from_utf8(slice) {
-        osprint!("{}", s);
-    } else {
-        // Ignore App output - not UTF-8
-    }
-}
-
 /// Open a file, given a path as UTF-8 string.
 ///
 /// If the file does not exist, or is already open, it returns an error.