mirror/tinyusb
3
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2026-08-18 11:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3822 from ice458/fix/usbtmc-trigger-bulk-out-rearm

Browse Source 
usbtmc: re-arm (or stall) the bulk-OUT endpoint after a USB488 TRIGGER message
This commit is contained in:
Zixun LI
2026-08-15 05:43:53 +02:00
committed by GitHub
parent 53fef28335 af81f9ef42
commit 09b02650e5
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/class/usbtmc/usbtmc_device.c
View File

@ -497,9 +497,24 @@ bool usbtmcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint
#if (CFG_TUD_USBTMC_ENABLE_488)
case USBTMC_MSGID_USB488_TRIGGER:
// Spec says we halt the EP if we didn't declare we support it.
TU_VERIFY(usbtmc_state.capabilities->bmIntfcCapabilities488.supportsTrigger);
TU_VERIFY(tud_usbtmc_msg_trigger_cb(msg));
// Unlike the messages above, TRIGGER is complete on arrival and has no response, so nothing else
// will move us out of STATE_IDLE. Do it here, otherwise the tud_usbtmc_start_bus_read() below (and
// any call the application makes from its callback) is a no-op and the bulk-OUT endpoint is left
// un-armed, silently timing out every subsequent host transfer.
TU_VERIFY(atomicChangeState(STATE_IDLE, STATE_NAK));
// Spec says we halt the EP if we didn't declare we support it; do the same when the application
// rejects the trigger. The callback result must not be wrapped in TU_VERIFY() here: returning
// early would skip both the stall and the re-arm below.
if (!usbtmc_state.capabilities->bmIntfcCapabilities488.supportsTrigger ||
!tud_usbtmc_msg_trigger_cb(msg)) {
usbd_edpt_stall(rhport, usbtmc_state.ep_bulk_out);
return false;
}
// Result deliberately ignored: false here means the endpoint is already armed - either the
// application re-armed it from its callback, or a transfer is still queued - not that arming
// failed. Stalling on it would halt a healthy endpoint.
tud_usbtmc_start_bus_read();
break;
#endif

1
src/class/usbtmc/usbtmc_device.h
View File

@ -25,7 +25,6 @@
// * tud_usbtmc_open_cb
// * tud_usbtmc_msg_data_cb
// * tud_usbtmc_msgBulkIn_complete_cb
// * tud_usbtmc_msg_trigger_cb
// * (successful) tud_usbtmc_check_abort_bulk_out_cb
// * (successful) tud_usbtmc_check_abort_bulk_in_cb
// * (successful) tud_usmtmc_bulkOut_clearFeature_cb