Merge pull request #1065 from hathach/rp2040-compliance

Rp2040 compliance test
2021-09-01 20:18:01 +07:00
parent e2175f6ed1 d4c56c70a8
commit 831a45f14b
9 changed files with 77 additions and 114 deletions
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -323,7 +323,11 @@ bool mscd_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t
        if ( p_msc->stage == MSC_STAGE_CMD )
        {
          // part of reset recovery (probably due to invalid CBW) -> prepare for new command
-          TU_ASSERT( prepare_cbw(rhport, p_msc) );
+          // Note: skip if already queued previously
+          if ( usbd_edpt_ready(rhport, p_msc->ep_out) )
+          {
+            TU_ASSERT( prepare_cbw(rhport, p_msc) );
+          }
        }
      }
    }