mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
add some example code to FFI-test for implementing a getchar-like facility
This commit is contained in:
parent
28a9d5bca7
commit
3e84e0e597
3 changed files with 56 additions and 0 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
|
@ -1157,6 +1157,7 @@ name = "ffi-test"
|
|||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"ffi-sys",
|
||||
"keyboard",
|
||||
"log",
|
||||
"log-server",
|
||||
"num-derive",
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ num-derive = {version = "0.3.3", default-features = false}
|
|||
num-traits = {version = "0.2.14", default-features = false}
|
||||
susres = {path = "../susres"}
|
||||
ffi-sys = {path = "sys"}
|
||||
keyboard = {path = "../keyboard"}
|
||||
|
||||
[target.'cfg(not(any(windows,unix)))'.dependencies]
|
||||
utralib = { path = "../../utralib"}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,60 @@ pub type c_float = f32;
|
|||
pub type c_double = f64;
|
||||
pub type c_void = core::ffi::c_void;
|
||||
|
||||
use xous::{send_message, Message};
|
||||
static mut KBD: Option<keyboard::Keyboard> = None;
|
||||
fn get_keys_blocking() -> Vec<char> {
|
||||
if unsafe{KBD.is_none()} {
|
||||
let xns = xous_names::XousNames::new().unwrap();
|
||||
let kbd = keyboard::Keyboard::new(&xns).unwrap();
|
||||
unsafe{KBD = Some(kbd)};
|
||||
}
|
||||
match send_message(unsafe{KBD.as_ref().unwrap().conn()},
|
||||
Message::new_blocking_scalar(
|
||||
9, // BlockingKeyboardListener
|
||||
0, 0, 0, 0
|
||||
)
|
||||
) {
|
||||
Ok(xous::Result::Scalar2(k1, k2)) => {
|
||||
let mut ret = Vec::<char>::new();
|
||||
if let Some(c) = core::char::from_u32(k1 as u32) {
|
||||
ret.push(c)
|
||||
}
|
||||
if let Some(c) = core::char::from_u32(k2 as u32) {
|
||||
ret.push(c)
|
||||
}
|
||||
ret
|
||||
}
|
||||
Ok(_) | Err(_) => panic!("internal error: Incorrect return type")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#[export_name = "rust_getchar"]
|
||||
pub unsafe extern "C" fn rust_getchar() -> c_char {
|
||||
log::info!("rust_getchar called");
|
||||
let mut chr = 0 as c_char;
|
||||
let kbhit = get_keys_blocking();
|
||||
for k in kbhit {
|
||||
log::info!("got key character: {}", k);
|
||||
chr = k as i8;
|
||||
return chr;
|
||||
//break;
|
||||
}
|
||||
log::info!("libc_getchar cleanup FIXME");
|
||||
//kbd.drop(); ?????
|
||||
return chr;
|
||||
}
|
||||
|
||||
/*
|
||||
/// Call this from your Rust init routine, before using get_keys_blocking()
|
||||
pub fn init_kbd() {
|
||||
let xns = xous_names::XousNames::new().unwrap();
|
||||
let kbd = keyboard::Keyboard::new(&xns).unwrap();
|
||||
KBD_CONN.store(kbd.conn(), Ordering::SeqCst);
|
||||
unsafe{KBD = Some(kbd)};
|
||||
}*/
|
||||
|
||||
extern "C" {
|
||||
pub fn add_one(a: i32) -> i32;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue