From 9815e33f4e243fc08746b6d78087df80b51c8c31 Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Thu, 23 Apr 2026 00:34:35 +0800
Subject: [PATCH] fix missing packet issue due to storage overflow

---
 services/usb-bao1x/src/hw.rs   | 6 +++---
 services/usb-bao1x/src/main.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/usb-bao1x/src/hw.rs b/services/usb-bao1x/src/hw.rs
index d3b158091..c09748a66 100644
--- a/services/usb-bao1x/src/hw.rs
+++ b/services/usb-bao1x/src/hw.rs
@@ -47,7 +47,7 @@ pub struct Bao1xUsb<'a> {
         >,
     >,
     // storage for hid_packets to expatriate from the interrupt handler
-    pub hid_packet: Option<[u8; 64]>,
+    pub hid_packet: VecDeque<[u8; 64]>,
     pub serial_port: SerialPort<'a, CorigineWrapper, [u8; 1024], [u8; 1024]>,
     // holds one HS packet - must be statically allocated in IRQ handler. Valid length is
     // passed as part of the interrupt recovery message.
@@ -117,7 +117,7 @@ impl<'a> Bao1xUsb<'a> {
             fido_tx_queue: RefCell::new(VecDeque::new()),
             kbd_tx_queue: RefCell::new(VecDeque::new()),
             irq_req: None,
-            hid_packet: None,
+            hid_packet: VecDeque::with_capacity(4),
             serial_port,
             serial_rx: [0u8; SERIAL_MAX_PACKET_SIZE],
             double_lock: AtomicBool::new(false),
@@ -299,7 +299,7 @@ pub(crate) fn composite_handler(_irq_no: usize, arg: *mut usize) {
                     match class.device::<RawFido<'_, _>, _>().read_report() {
                         Ok(u2f_report) => {
                             // crate::println!("got report {:x?}", u2f_report);
-                            usb.hid_packet = Some(u2f_report.packet);
+                            usb.hid_packet.push_back(u2f_report.packet);
                             xous::try_send_message(
                                 usb.conn,
                                 Message::new_scalar(Opcode::IrqFidoRx.to_usize().unwrap(), 0, 0, 0, 0),
diff --git a/services/usb-bao1x/src/main.rs b/services/usb-bao1x/src/main.rs
index bd86eb26c..58f15fc79 100644
--- a/services/usb-bao1x/src/main.rs
+++ b/services/usb-bao1x/src/main.rs
@@ -414,7 +414,7 @@ pub(crate) fn main_hw() -> ! {
                 }
             }
             Opcode::IrqFidoRx => {
-                if let Some(raw_report) = cu.hid_packet.take() {
+                if let Some(raw_report) = cu.hid_packet.pop_front() {
                     let u2f_report = HIDReport(raw_report);
                     if let Some(mut listener) = fido_listener.take() {
                         let mut response = unsafe {