make the thing compile

This commit is contained in:
Gianguido Sorà 2022-06-08 12:08:49 +02:00
parent c99ac0b3f5
commit 7985ad9a95
3 changed files with 9 additions and 11 deletions

View file

@ -35,7 +35,6 @@ members = [
"xous-ipc", "xous-ipc",
"xous-rs", "xous-rs",
"tools", "tools",
"macros",
"services/keyboard-backlight", "services/keyboard-backlight",
"services/aes-test", "services/aes-test",
"services/graphics-server", "services/graphics-server",

View file

@ -20,8 +20,7 @@ enum ThreadOps {
Renew, Renew,
} }
#[xous::xous_main] fn main() -> ! {
fn xmain() -> ! {
log_server::init_wait().unwrap(); log_server::init_wait().unwrap();
log::set_max_level(log::LevelFilter::Trace); log::set_max_level(log::LevelFilter::Trace);
log::info!("my PID is {}", xous::process::id()); log::info!("my PID is {}", xous::process::id());

View file

@ -61,28 +61,28 @@ pub(crate) enum Opcode {
RegisterRawListener = 3, RegisterRawListener = 3,
/// request for updates for *when* keyboard is pressed /// request for updates for *when* keyboard is pressed
RegisterKeyObserver, RegisterKeyObserver = 4,
/// set repeat delay, rate; both in ms /// set repeat delay, rate; both in ms
SetRepeat = 4, //(u32, u32), SetRepeat = 5, //(u32, u32),
/// set chording interval (how long to wait for all keydowns to happen before interpreting as a chord), in ms (for braille keyboards) /// set chording interval (how long to wait for all keydowns to happen before interpreting as a chord), in ms (for braille keyboards)
SetChordInterval = 5, //(u32), SetChordInterval = 6, //(u32),
/// used by host mode emulation and debug UART to inject keys /// used by host mode emulation and debug UART to inject keys
InjectKey = 6, //(char), InjectKey = 7, //(char),
/// used by the interrupt handler to transfer results to the main loop /// used by the interrupt handler to transfer results to the main loop
HandlerTrigger = 7, HandlerTrigger = 8,
/// used to turn keyboard vibrate on and off /// used to turn keyboard vibrate on and off
Vibe = 8, Vibe = 9,
/// a blocking key listener - blocks until a key is hit /// a blocking key listener - blocks until a key is hit
BlockingKeyListener = 9, BlockingKeyListener = 10,
/// Suspend/resume callback /// Suspend/resume callback
SuspendResume = 10, SuspendResume = 11,
} }
// this structure is used to register a keyboard listener. Currently, we only accept // this structure is used to register a keyboard listener. Currently, we only accept