diff --git a/services/cram-hal-service/src/hw/keyboard.rs b/services/cram-hal-service/src/hw/keyboard.rs index 71fd0c90c..21b694745 100644 --- a/services/cram-hal-service/src/hw/keyboard.rs +++ b/services/cram-hal-service/src/hw/keyboard.rs @@ -9,6 +9,32 @@ pub fn start_keyboard_service() { std::thread::spawn(move || { keyboard_service(); }); + std::thread::spawn(move || { + keyboard_bouncer(); + }); +} + +fn keyboard_bouncer() { + // private server that has no dependencies but a "well-known-name" for the log server + // to forward keystrokes into. + let sid = xous::create_server_with_address(b"keyboard_bouncer") + .expect("couldn't create keyboard log bounce server"); + let xns = xous_names::XousNames::new().unwrap(); + let kbd = cram_hal_service::keyboard::Keyboard::new(&xns).unwrap(); + let mut msg_opt = None; + loop { + xous::reply_and_receive_next(sid, &mut msg_opt).unwrap(); + let msg = msg_opt.as_mut().unwrap(); + // only one type of message is expected + match msg.body.scalar_message() { + Some(m) => { + if let Some(c) = char::from_u32(m.arg1 as u32) { + kbd.inject_key(c); + } + } + _ => {} + } + } } fn keyboard_service() { diff --git a/services/cram-hal-service/src/iox_lib.rs b/services/cram-hal-service/src/iox_lib.rs index 0e546a421..e208d6d13 100644 --- a/services/cram-hal-service/src/iox_lib.rs +++ b/services/cram-hal-service/src/iox_lib.rs @@ -3,7 +3,7 @@ use core::sync::atomic::Ordering; use cramium_hal::iox::{IoxDir, IoxDriveStrength, IoxEnable, IoxFunction, IoxPort, IoxValue}; use num_traits::*; -use crate::{IoxConfigMessage, Opcode, SERVER_NAME_CRAM_HAL}; +use crate::{api::IoxConfigMessage, Opcode, SERVER_NAME_CRAM_HAL}; pub struct IoxHal { conn: xous::CID, diff --git a/services/cram-hal-service/src/keyboard.rs b/services/cram-hal-service/src/keyboard.rs index 3ea0321c9..4bbeb6286 100644 --- a/services/cram-hal-service/src/keyboard.rs +++ b/services/cram-hal-service/src/keyboard.rs @@ -2,7 +2,7 @@ use num_traits::*; use xous::{send_message, Message}; use xous_ipc::{Buffer, String}; -use crate::api::*; +use crate::api::keyboard::*; #[derive(Debug)] pub struct Keyboard { diff --git a/services/cram-hal-service/src/lib.rs b/services/cram-hal-service/src/lib.rs index 1a67b718a..4bae7b100 100644 --- a/services/cram-hal-service/src/lib.rs +++ b/services/cram-hal-service/src/lib.rs @@ -3,7 +3,7 @@ pub mod iox_lib; pub mod keyboard; pub mod trng; -pub use api::*; +use api::Opcode; use cramium_hal::udma::{EventChannel, PeriphEventType, PeriphId}; pub use iox_lib::*; use num_traits::*; diff --git a/services/cram-hal-service/src/main.rs b/services/cram-hal-service/src/main.rs index 55e15b928..287c76720 100644 --- a/services/cram-hal-service/src/main.rs +++ b/services/cram-hal-service/src/main.rs @@ -87,7 +87,7 @@ fn try_alloc(ifram_allocs: &mut Vec>, size: usize, sender: Sender } fn main() { log_server::init_wait().unwrap(); - log::set_max_level(log::LevelFilter::Debug); + log::set_max_level(log::LevelFilter::Info); let xns = xous_names::XousNames::new().unwrap(); let sid = xns.register_name(cram_hal_service::SERVER_NAME_CRAM_HAL, None).expect("can't register server");