From 095939ee5381b4807f6b1fa090ee28d31bcbd523 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 6 May 2025 01:48:37 +0800 Subject: [PATCH] allow multiple listeners in gen2 targets this simplifies a bunch of stuff when we can trust the internal code base --- services/cram-hal-service/src/hw/keyboard.rs | 14 +++++--------- services/cramium-emu/src/keyboard.rs | 14 +++++--------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/services/cram-hal-service/src/hw/keyboard.rs b/services/cram-hal-service/src/hw/keyboard.rs index 901e7a52e..c86117b7e 100644 --- a/services/cram-hal-service/src/hw/keyboard.rs +++ b/services/cram-hal-service/src/hw/keyboard.rs @@ -39,8 +39,7 @@ fn keyboard_service() { let xns = xous_names::XousNames::new().unwrap(); let kbd_sid = xns.register_name(cramium_api::SERVER_NAME_KBD, None).expect("can't register server"); - let mut listener_conn: Option = None; - let mut listener_op: Option = None; + let mut listeners: Vec<(CID, usize)> = Vec::new(); let mut observer_conn: Option = None; let mut observer_op: Option = None; @@ -62,13 +61,10 @@ fn keyboard_service() { let kr = buffer.as_flat::().unwrap(); match xns.request_connection_blocking(kr.server_name.as_str()) { Ok(cid) => { - listener_conn = Some(cid); - listener_op = Some(>::from(kr.listener_op_id.into()) as usize); + listeners.push((cid, >::from(kr.listener_op_id.into()) as usize)); } Err(e) => { log::error!("couldn't connect to listener: {:?}", e); - listener_conn = None; - listener_op = None; } } } @@ -152,16 +148,16 @@ fn keyboard_service() { } }; - if let Some(conn) = listener_conn { + for &(conn, listener_op) in listeners.iter() { if key != '\u{0000}' { if key >= '\u{f700}' && key <= '\u{f8ff}' { log::info!("ignoring key '{}'({:x})", key, key as u32); // ignore Apple PUA characters } else { - log::debug!("injecting key '{}'({:x})", key, key as u32); // always be noisy about this, it's an exploit path + log::debug!("injecting key '{}'({:x}) to {}", key, key as u32, conn); // always be noisy about this, it's an exploit path xous::try_send_message( conn, xous::Message::new_scalar( - listener_op.unwrap(), + listener_op, key as u32 as usize, '\u{0000}' as u32 as usize, '\u{0000}' as u32 as usize, diff --git a/services/cramium-emu/src/keyboard.rs b/services/cramium-emu/src/keyboard.rs index af0ed078c..606f596e3 100644 --- a/services/cramium-emu/src/keyboard.rs +++ b/services/cramium-emu/src/keyboard.rs @@ -38,8 +38,7 @@ fn keyboard_service() { let xns = xous_names::XousNames::new().unwrap(); let kbd_sid = xns.register_name(cramium_api::SERVER_NAME_KBD, None).expect("can't register server"); - let mut listener_conn: Option = None; - let mut listener_op: Option = None; + let mut listeners: Vec<(CID, usize)> = Vec::new(); let mut observer_conn: Option = None; let mut observer_op: Option = None; @@ -61,13 +60,10 @@ fn keyboard_service() { let kr = buffer.as_flat::().unwrap(); match xns.request_connection_blocking(kr.server_name.as_str()) { Ok(cid) => { - listener_conn = Some(cid); - listener_op = Some(>::from(kr.listener_op_id.into()) as usize); + listeners.push((cid, >::from(kr.listener_op_id.into()) as usize)); } Err(e) => { log::error!("couldn't connect to listener: {:?}", e); - listener_conn = None; - listener_op = None; } } } @@ -151,16 +147,16 @@ fn keyboard_service() { } }; - if let Some(conn) = listener_conn { + for &(conn, listener_op) in listeners.iter() { if key != '\u{0000}' { if key >= '\u{f700}' && key <= '\u{f8ff}' { log::info!("ignoring key '{}'({:x})", key, key as u32); // ignore Apple PUA characters } else { - log::debug!("injecting key '{}'({:x})", key, key as u32); // always be noisy about this, it's an exploit path + log::debug!("injecting key '{}'({:x}) to {}", key, key as u32, conn); // always be noisy about this, it's an exploit path xous::try_send_message( conn, xous::Message::new_scalar( - listener_op.unwrap(), + listener_op, key as u32 as usize, '\u{0000}' as u32 as usize, '\u{0000}' as u32 as usize,