fix composite device description - we now have HID & U2F simultaneously!

This commit is contained in:
bunnie 2022-05-27 00:34:06 +08:00
parent a8f761722a
commit 634f3b0e93

View file

@ -141,18 +141,13 @@ fn xmain() -> ! {
#[cfg(any(target_os = "none", target_os = "xous"))] #[cfg(any(target_os = "none", target_os = "xous"))]
let usb_alloc = UsbBusAllocator::new(usbdev); let usb_alloc = UsbBusAllocator::new(usbdev);
/*
#[cfg(any(target_os = "none", target_os = "xous"))] #[cfg(any(target_os = "none", target_os = "xous"))]
let clock = EmbeddedClock::new(); let clock = EmbeddedClock::new();
#[cfg(any(target_os = "none", target_os = "xous"))] #[cfg(any(target_os = "none", target_os = "xous"))]
let mut keyboard = UsbHidClassBuilder::new() let mut composite = UsbHidClassBuilder::new()
.add_interface( .add_interface(
NKROBootKeyboardInterface::default_config(&clock), NKROBootKeyboardInterface::default_config(&clock),
) )
.build(&usb_alloc);
*/
#[cfg(any(target_os = "none", target_os = "xous"))]
let mut u2f = UsbHidClassBuilder::new()
.add_interface( .add_interface(
FidoInterface::default_config() FidoInterface::default_config()
) )
@ -211,7 +206,8 @@ fn xmain() -> ! {
let mut u2f_msg = FidoMsg::default(); let mut u2f_msg = FidoMsg::default();
assert_eq!(u2f_ipc.code, U2fCode::Tx, "Expected U2fCode::Tx in wrapper"); assert_eq!(u2f_ipc.code, U2fCode::Tx, "Expected U2fCode::Tx in wrapper");
u2f_msg.deref_mut().copy_from_slice(&u2f_ipc.data); u2f_msg.deref_mut().copy_from_slice(&u2f_ipc.data);
u2f.interface().write_report(&u2f_msg).ok(); let u2f = composite.interface::<FidoInterface<'_, _>, _>();
u2f.write_report(&u2f_msg).ok();
u2f_ipc.code = U2fCode::TxAck; u2f_ipc.code = U2fCode::TxAck;
} else { } else {
u2f_ipc.code = U2fCode::Denied; u2f_ipc.code = U2fCode::Denied;
@ -220,16 +216,16 @@ fn xmain() -> ! {
} }
Some(Opcode::UsbIrqHandler) => { Some(Opcode::UsbIrqHandler) => {
#[cfg(any(target_os = "none", target_os = "xous"))] #[cfg(any(target_os = "none", target_os = "xous"))]
// if usb_dev.poll(&mut [&mut keyboard, &mut u2f]) { if usb_dev.poll(&mut [&mut composite]) {
if usb_dev.poll(&mut [&mut u2f]) { let keyboard = composite.interface::<NKROBootKeyboardInterface<'_, _, _,>, _>();
/* match keyboard.read_report() {
match keyboard.interface().read_report() {
Ok(l) => { Ok(l) => {
led_state = l; led_state = l;
} }
Err(e) => log::trace!("KEYB ERR: {:?}", e), Err(e) => log::trace!("KEYB ERR: {:?}", e),
}*/ }
match u2f.interface().read_report() { let u2f = composite.interface::<FidoInterface<'_, _>, _>();
match u2f.read_report() {
Ok(u2f_report) => { Ok(u2f_report) => {
log::info!("got U2F packet {:?}", u2f_report); log::info!("got U2F packet {:?}", u2f_report);
if let Some(mut listener) = fido_listener.take() { if let Some(mut listener) = fido_listener.take() {
@ -332,12 +328,13 @@ fn xmain() -> ! {
codes.push(Keyboard::from_primitive(code2 as u8)); codes.push(Keyboard::from_primitive(code2 as u8));
} }
let auto_up = if autoup == 1 {true} else {false}; let auto_up = if autoup == 1 {true} else {false};
//keyboard.interface().write_report(&codes).ok(); let keyboard = composite.interface::<NKROBootKeyboardInterface<'_, _, _,>, _>();
//keyboard.interface().tick().unwrap(); keyboard.write_report(&codes).ok();
keyboard.tick().unwrap();
tt.sleep_ms(30).ok(); tt.sleep_ms(30).ok();
if auto_up { if auto_up {
//keyboard.interface().write_report(&[]).ok(); // this is the key-up keyboard.write_report(&[]).ok(); // this is the key-up
//keyboard.interface().tick().unwrap(); keyboard.tick().unwrap();
tt.sleep_ms(30).ok(); tt.sleep_ms(30).ok();
} }
xous::return_scalar(msg.sender, 0).unwrap(); xous::return_scalar(msg.sender, 0).unwrap();
@ -364,11 +361,12 @@ fn xmain() -> ! {
KeyMap::Dvorak => mappings::char_to_hid_code_dvorak(ch), KeyMap::Dvorak => mappings::char_to_hid_code_dvorak(ch),
_ => mappings::char_to_hid_code_us101(ch), _ => mappings::char_to_hid_code_us101(ch),
}; };
//keyboard.interface().write_report(&codes).ok(); let keyboard = composite.interface::<NKROBootKeyboardInterface<'_, _, _,>, _>();
//keyboard.interface().tick().unwrap(); keyboard.write_report(&codes).ok();
keyboard.tick().unwrap();
tt.sleep_ms(30).ok(); tt.sleep_ms(30).ok();
//keyboard.interface().write_report(&[]).ok(); // this is the key-up keyboard.write_report(&[]).ok(); // this is the key-up
//keyboard.interface().tick().unwrap(); keyboard.tick().unwrap();
tt.sleep_ms(30).ok(); tt.sleep_ms(30).ok();
sent += 1; sent += 1;
} }