andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

USBTMC: Manually stall and unstall EP when clear(ENDPOINT_HALT) is received.

Browse Source
This commit is contained in:
NConrad
2022-06-24 23:06:32 -04:00
parent 3d4d37375b
commit 239b5d5279
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -597,18 +597,31 @@ bool usbtmcd_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request
{ {
uint32_t ep_addr = (request->wIndex); uint32_t ep_addr = (request->wIndex);
// At this point, a transfer MAY be in progress. Based on USB spec, when clearing bulk EP HALT,
// the EP transfer buffer needs to be cleared and DTOG needs to be reset, even if
// the EP is not halted. The only USBD API interface to do this is to stall and then unstall the EP.
if(ep_addr == usbtmc_state.ep_bulk_out) if(ep_addr == usbtmc_state.ep_bulk_out)
{ {
criticalEnter(); criticalEnter();
usbd_edpt_stall(rhport, ep_addr);
usbd_edpt_clear_stall(rhport, ep_addr);
usbtmc_state.state = STATE_NAK; // USBD core has placed EP in NAK state for us usbtmc_state.state = STATE_NAK; // USBD core has placed EP in NAK state for us
criticalLeave(); criticalLeave();
tud_usbtmc_bulkOut_clearFeature_cb(); tud_usbtmc_bulkOut_clearFeature_cb();
} }
else if (ep_addr == usbtmc_state.ep_bulk_in) else if (ep_addr == usbtmc_state.ep_bulk_in)
{ {
usbd_edpt_stall(rhport, ep_addr);
usbd_edpt_clear_stall(rhport, ep_addr);
tud_usbtmc_bulkIn_clearFeature_cb(); tud_usbtmc_bulkIn_clearFeature_cb();
} }
else else if ((usbtmc_state.ep_int_in != 0) && (ep_addr == usbtmc_state.ep_int_in))
{
// Clearing interrupt in EP
usbd_edpt_stall(rhport, ep_addr);
usbd_edpt_clear_stall(rhport, ep_addr);
}
else
{ {
return false; return false;
} }
@@ -836,6 +849,7 @@ bool usbtmcd_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request
}, },
.StatusByte = tud_usbtmc_get_stb_cb(&(rsp.USBTMC_status)) .StatusByte = tud_usbtmc_get_stb_cb(&(rsp.USBTMC_status))
}; };
// USB488 spec states that transfer must be queued before control request response sent.
usbd_edpt_xfer(rhport, usbtmc_state.ep_int_in, (void*)&intMsg, sizeof(intMsg)); usbd_edpt_xfer(rhport, usbtmc_state.ep_int_in, (void*)&intMsg, sizeof(intMsg));
} }
else else