From 1ec66137be5e772998cf5b0180c06a5e4e9074f7 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 23 Sep 2024 14:35:51 +0800 Subject: [PATCH] port cramium target to xous-ipc 0.10 --- services/cram-console/src/cmds.rs | 18 +++++++++--------- services/cram-console/src/cmds/mbox.rs | 4 ++-- services/cram-console/src/cmds/test.rs | 2 +- services/cram-console/src/cmds/trng_cmd.rs | 2 +- services/cram-console/src/cmds/usb.rs | 2 +- services/cram-console/src/cmds/ver.rs | 2 +- services/cram-console/src/repl.rs | 6 ++---- services/cram-hal-service/src/api/keyboard.rs | 2 +- services/cram-hal-service/src/hw/keyboard.rs | 6 +++--- 9 files changed, 21 insertions(+), 23 deletions(-) diff --git a/services/cram-console/src/cmds.rs b/services/cram-console/src/cmds.rs index 2a286b9fb..648c9fe9f 100644 --- a/services/cram-console/src/cmds.rs +++ b/services/cram-console/src/cmds.rs @@ -1,11 +1,11 @@ use core::fmt::Write; use std::collections::HashMap; +use String; use cram_hal_service::trng; #[cfg(feature = "shellperf")] use utralib::generated::*; use xous::MessageEnvelope; -use String; /////////////////////////// Common items to all commands pub trait ShellCmdApi<'a> { @@ -160,7 +160,7 @@ impl CmdEnv { let mut cmd_ret: Result, xous::Error> = Ok(None); if let Some(verb_string) = maybe_verb { - let verb = verb_string.to_str(); + let verb = &verb_string; // search through the list of commands linearly until one matches, // then run it. @@ -168,7 +168,7 @@ impl CmdEnv { for cmd in commands.iter_mut() { if cmd.matches(verb) { match_found = true; - cmd_ret = cmd.process(*cmdline, &mut self.common_env); + cmd_ret = cmd.process(cmdline.to_string(), &mut self.common_env); self.lastverb.clear(); write!(self.lastverb, "{}", verb).expect("SHCH: couldn't record last verb"); }; @@ -182,7 +182,7 @@ impl CmdEnv { if !first { ret.push_str(", "); } - ret.append(cmd.verb())?; + ret.push_str(cmd.verb()); first = false; } Ok(Some(ret)) @@ -196,8 +196,8 @@ impl CmdEnv { let mut cmd_ret: Result, xous::Error> = Ok(None); // first check and see if we have a callback registration; if not, just map to the last verb let verb = match self.common_env.cb_registrations.get(&(callback.body.id() as u32)) { - Some(verb) => verb.to_str(), - None => self.lastverb.to_str(), + Some(verb) => &verb, + None => &self.lastverb, }; // now dispatch let mut verbfound = false; @@ -228,13 +228,13 @@ pub fn tokenize(line: &mut String) -> Option { let mut foundrest = false; for ch in lineiter { if ch != ' ' && !foundspace { - token.push(ch).unwrap(); + token.push(ch); } else if foundspace && foundrest { - retline.push(ch).unwrap(); + retline.push(ch); } else if foundspace && ch != ' ' { // handle case of multiple spaces in a row foundrest = true; - retline.push(ch).unwrap(); + retline.push(ch); } else { foundspace = true; // consume the space diff --git a/services/cram-console/src/cmds/mbox.rs b/services/cram-console/src/cmds/mbox.rs index 4e4fb136f..dd24f9c7a 100644 --- a/services/cram-console/src/cmds/mbox.rs +++ b/services/cram-console/src/cmds/mbox.rs @@ -1,7 +1,7 @@ +use String; use modals::Modals; use utra::mailbox; use utralib::generated::*; -use String; use crate::{CommonEnv, ShellCmdApi}; @@ -181,7 +181,7 @@ impl<'a> ShellCmdApi<'a> for Mbox { let mut ret = String::new(); let helpstring = "mbox [knock]"; - let mut tokens = &args.split(' '); + let mut tokens = args.split(' '); if let Some(sub_cmd) = tokens.next() { match sub_cmd { diff --git a/services/cram-console/src/cmds/test.rs b/services/cram-console/src/cmds/test.rs index 6aae16f2e..bee853d3b 100644 --- a/services/cram-console/src/cmds/test.rs +++ b/services/cram-console/src/cmds/test.rs @@ -15,7 +15,7 @@ impl<'a> ShellCmdApi<'a> for Test { let mut ret = String::new(); let helpstring = "Test commands. See code for options."; - let mut tokens = &args.split(' '); + let mut tokens = args.split(' '); if let Some(sub_cmd) = tokens.next() { match sub_cmd { diff --git a/services/cram-console/src/cmds/trng_cmd.rs b/services/cram-console/src/cmds/trng_cmd.rs index 7f1e2862d..43c8845af 100644 --- a/services/cram-console/src/cmds/trng_cmd.rs +++ b/services/cram-console/src/cmds/trng_cmd.rs @@ -16,7 +16,7 @@ impl<'a> ShellCmdApi<'a> for TrngCmd { let mut ret = String::new(); let helpstring = "trng [pump]"; - let mut tokens = &args.split(' '); + let mut tokens = args.split(' '); if let Some(sub_cmd) = tokens.next() { match sub_cmd { diff --git a/services/cram-console/src/cmds/usb.rs b/services/cram-console/src/cmds/usb.rs index ffc6df57e..70adffdfa 100644 --- a/services/cram-console/src/cmds/usb.rs +++ b/services/cram-console/src/cmds/usb.rs @@ -25,7 +25,7 @@ impl<'a> ShellCmdApi<'a> for Usb { #[cfg(feature = "mass-storage")] let helpstring = "usb [hid] [fido] [ms] [debug] [send ] [status] [leds] [lock] [unlock] [kbdtest] [console] [noconsole]"; - let mut tokens = &args.split(' '); + let mut tokens = args.split(' '); if let Some(sub_cmd) = tokens.next() { match sub_cmd { diff --git a/services/cram-console/src/cmds/ver.rs b/services/cram-console/src/cmds/ver.rs index ad86f5d72..d025acd9e 100644 --- a/services/cram-console/src/cmds/ver.rs +++ b/services/cram-console/src/cmds/ver.rs @@ -15,7 +15,7 @@ impl<'a> ShellCmdApi<'a> for Ver { let mut ret = String::new(); let helpstring = "ver [xous]"; - let mut tokens = &args.split(' '); + let mut tokens = args.split(' '); if let Some(sub_cmd) = tokens.next() { match sub_cmd { diff --git a/services/cram-console/src/repl.rs b/services/cram-console/src/repl.rs index 419fdb708..76bee0ef2 100644 --- a/services/cram-console/src/repl.rs +++ b/services/cram-console/src/repl.rs @@ -122,11 +122,9 @@ impl Repl { let mut dirty = true; // take the input and pass it on to the various command parsers, and attach result - if let Some(local) = &self.input { + if let Some(local) = &mut self.input { log::trace!("processing line: {}", local); - if let Some(res) = - self.env.dispatch(Some(&mut String::from(&local)), None).expect("command dispatch failed") - { + if let Some(res) = self.env.dispatch(Some(local), None).expect("command dispatch failed") { let output_history = History { text: String::from(res.as_str()), is_input: false }; self.circular_push(output_history); } else { diff --git a/services/cram-hal-service/src/api/keyboard.rs b/services/cram-hal-service/src/api/keyboard.rs index 23752f6c2..9c08e99cc 100644 --- a/services/cram-hal-service/src/api/keyboard.rs +++ b/services/cram-hal-service/src/api/keyboard.rs @@ -98,7 +98,7 @@ pub(crate) enum KeyboardOpcode { // this structure is used to register a keyboard listener. Currently, we only accept // one trusted listener (enforced by name server and structurally in the code), // which is the GAM. -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub(crate) struct KeyboardRegistration { pub server_name: String, pub listener_op_id: usize, diff --git a/services/cram-hal-service/src/hw/keyboard.rs b/services/cram-hal-service/src/hw/keyboard.rs index b9b0238e0..145b46ef5 100644 --- a/services/cram-hal-service/src/hw/keyboard.rs +++ b/services/cram-hal-service/src/hw/keyboard.rs @@ -1,5 +1,5 @@ use num_traits::*; -use xous::{msg_blocking_scalar_unpack, msg_scalar_unpack, MessageSender, CID}; +use xous::{CID, MessageSender, msg_blocking_scalar_unpack, msg_scalar_unpack}; use xous_ipc::Buffer; use crate::api; @@ -65,7 +65,7 @@ fn keyboard_service() { match xns.request_connection_blocking(kr.server_name.as_str()) { Ok(cid) => { listener_conn = Some(cid); - listener_op = Some(kr.listener_op_id as usize); + listener_op = Some(>::from(kr.listener_op_id.into()) as usize); } Err(e) => { log::error!("couldn't connect to listener: {:?}", e); @@ -81,7 +81,7 @@ fn keyboard_service() { match xns.request_connection_blocking(kr.server_name.as_str()) { Ok(cid) => { observer_conn = Some(cid); - observer_op = Some(kr.listener_op_id as usize); + observer_op = Some(>::from(kr.listener_op_id.into()) as usize); } Err(e) => { log::error!("couldn't connect to observer: {:?}", e);