diff --git a/services/usb-device-xous/src/main.rs b/services/usb-device-xous/src/main.rs index 88b935c12..1cfa8bd12 100644 --- a/services/usb-device-xous/src/main.rs +++ b/services/usb-device-xous/src/main.rs @@ -43,6 +43,7 @@ use num_enum::FromPrimitive as EnumFromPrimitive; use embedded_time::Clock; use std::convert::TryInto; +#[cfg(any(target_os = "none", target_os = "xous"))] use keyboard::KeyMap; use xous_ipc::Buffer; @@ -77,7 +78,9 @@ fn xmain() -> ! { log::trace!("registered with NS -- {:?}", usbdev_sid); let llio = llio::Llio::new(&xns); let tt = ticktimer_server::Ticktimer::new().unwrap(); + #[cfg(any(target_os = "none", target_os = "xous"))] let native_kbd = keyboard::Keyboard::new(&xns).unwrap(); + #[cfg(any(target_os = "none", target_os = "xous"))] let native_map = native_kbd.get_keymap().unwrap(); #[cfg(any(target_os = "none", target_os = "xous"))] @@ -275,7 +278,10 @@ fn xmain() -> ! { } Some(Opcode::SendString) => { let mut buffer = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) }; + #[cfg(any(target_os = "none", target_os = "xous"))] let mut usb_send = buffer.to_original::().unwrap(); + #[cfg(not(any(target_os = "none", target_os = "xous")))] + let usb_send = buffer.to_original::().unwrap(); // suppress mut warning on hosted mode #[cfg(any(target_os = "none", target_os = "xous"))] { let mut sent = 0; diff --git a/services/usb-device-xous/src/mappings.rs b/services/usb-device-xous/src/mappings.rs index 11ee7a37f..1ab4a420d 100644 --- a/services/usb-device-xous/src/mappings.rs +++ b/services/usb-device-xous/src/mappings.rs @@ -1,5 +1,6 @@ pub use usbd_human_interface_device::page::Keyboard as UsbKeyCode; +#[cfg(any(target_os = "none", target_os = "xous"))] pub fn char_to_hid_code_us101(key: char) -> Vec { let mut code = vec![]; match key { @@ -117,6 +118,7 @@ pub fn char_to_hid_code_us101(key: char) -> Vec { } /// auto-generated using tools/kbd_layout.py + `usb kbdtest` on device for dvorak layout on US101 +#[cfg(any(target_os = "none", target_os = "xous"))] pub fn char_to_hid_code_dvorak(key: char) -> Vec { let mut code = vec![]; match key {