get OUT packets working; in particular, HID/U2F seems good to go

This commit is contained in:
bunnie 2025-09-09 17:53:47 +08:00
parent 51adf0e76c
commit 16b3c43e31

View file

@ -175,7 +175,7 @@ pub(crate) fn main_hw() -> ! {
let now = tt.elapsed_ms(); let now = tt.elapsed_ms();
let opcode = let opcode =
num_traits::FromPrimitive::from_usize(msg.body.id()).unwrap_or(TimeoutOp::InvalidCall); num_traits::FromPrimitive::from_usize(msg.body.id()).unwrap_or(TimeoutOp::InvalidCall);
log::info!("Timeout thread: {:?}", opcode); log::debug!("Timeout thread: {:?}", opcode);
match opcode { match opcode {
TimeoutOp::Pump => { TimeoutOp::Pump => {
if to_run.load(Ordering::SeqCst) { if to_run.load(Ordering::SeqCst) {
@ -254,7 +254,7 @@ pub(crate) fn main_hw() -> ! {
xous::reply_and_receive_next(usbdev_sid, &mut msg_opt).expect("Error fetching next message"); xous::reply_and_receive_next(usbdev_sid, &mut msg_opt).expect("Error fetching next message");
let msg = msg_opt.as_mut().unwrap(); let msg = msg_opt.as_mut().unwrap();
let opcode = num_traits::FromPrimitive::from_usize(msg.body.id()).unwrap_or(Opcode::InvalidCall); let opcode = num_traits::FromPrimitive::from_usize(msg.body.id()).unwrap_or(Opcode::InvalidCall);
log::info!("{:?}", opcode); log::debug!("{:?}", opcode);
match opcode { match opcode {
Opcode::PmicIrq => match pmic.get_vbus_irq_status(&mut i2c).unwrap() { Opcode::PmicIrq => match pmic.get_vbus_irq_status(&mut i2c).unwrap() {
VbusIrq::Insert => { VbusIrq::Insert => {
@ -366,21 +366,25 @@ pub(crate) fn main_hw() -> ! {
} }
} }
Opcode::IrqFidoRx => { Opcode::IrqFidoRx => {
let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; if let Some(raw_report) = cu.hid_packet.take() {
let u2f_report = buffer.to_original::<HIDReport, _>().unwrap(); let u2f_report = HIDReport(raw_report);
if let Some(mut listener) = fido_listener.take() { if let Some(mut listener) = fido_listener.take() {
let mut response = unsafe { let mut response = unsafe {
Buffer::from_memory_message_mut(listener.body.memory_message_mut().unwrap()) Buffer::from_memory_message_mut(listener.body.memory_message_mut().unwrap())
}; };
let mut deferred_buf = response.to_original::<U2fMsgIpc, _>().unwrap(); let mut deferred_buf = response.to_original::<U2fMsgIpc, _>().unwrap();
deferred_buf.data.copy_from_slice(&u2f_report.0); deferred_buf.data.copy_from_slice(&u2f_report.0);
log::trace!("ret deferred data {:x?}", &u2f_report.0[..8]); log::trace!("ret deferred data {:x?}", &u2f_report.0[..8]);
deferred_buf.code = U2fCode::RxAck; deferred_buf.code = U2fCode::RxAck;
response.replace(deferred_buf).unwrap(); response.replace(deferred_buf).unwrap();
} else {
crate::println!("Got U2F packet, but no server to respond...queuing.");
fido_rx_queue.push_back(u2f_report.0);
}
} else { } else {
crate::println!("Got U2F packet, but no server to respond...queuing."); // I *think* this is harmless, can remove this later on if protocol is robust
fido_rx_queue.push_back(u2f_report.0); log::warn!("got IrqFidoRx but no data");
} }
} }
Opcode::U2fTx => { Opcode::U2fTx => {