mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-04-16 05:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

try next endpoint when received NAK

Browse Source
This commit is contained in:
hathach 2023-08-25 17:37:09 +07:00
parent ac00b91472
commit cd7464a884
No known key found for this signature in database
GPG Key ID: F5D50C6D51D17CBA
1 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/portable/analog/max3421/hcd_max3421.c
View File

@ -362,27 +362,27 @@ TU_ATTR_ALWAYS_INLINE static inline max3421_ep_t * find_opened_ep(uint8_t daddr,
} }
} }
//static max3421_ep_t * find_next_pending_ep(max3421_ep_t * cur_ep) { static max3421_ep_t * find_next_pending_ep(max3421_ep_t * cur_ep) {
// size_t idx = cur_ep - _hcd_data.ep; size_t idx = cur_ep - _hcd_data.ep;
//
// // starting from next endpoint // starting from next endpoint
// for (size_t i = idx + 1; i < CFG_TUH_MAX3421_ENDPOINT_TOTAL; i++) { for (size_t i = idx + 1; i < CFG_TUH_MAX3421_ENDPOINT_TOTAL; i++) {
// max3421_ep_t* ep = &_hcd_data.ep[i]; max3421_ep_t* ep = &_hcd_data.ep[i];
// if (ep->xfer_pending) { if (ep->xfer_pending) {
// return ep; return ep;
// } }
// } }
//
// // wrap around including current endpoint // wrap around including current endpoint
// for (size_t i = 0; i <= idx; i++) { for (size_t i = 0; i <= idx; i++) {
// max3421_ep_t* ep = &_hcd_data.ep[i]; max3421_ep_t* ep = &_hcd_data.ep[i];
// if (ep->xfer_pending) { if (ep->xfer_pending) {
// return ep; return ep;
// } }
// } }
//
// return NULL; return NULL;
//} }
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// Controller API // Controller API
@ -443,6 +443,7 @@ bool hcd_init(uint8_t rhport) {
(void) rhport; (void) rhport;
hcd_int_disable(rhport); hcd_int_disable(rhport);
tuh_max3421_spi_cs_api(rhport, false);
TU_LOG2_INT(sizeof(max3421_ep_t)); TU_LOG2_INT(sizeof(max3421_ep_t));
TU_LOG2_INT(sizeof(max3421_data_t)); TU_LOG2_INT(sizeof(max3421_data_t));
@ -689,6 +690,7 @@ static void handle_xfer_done(uint8_t rhport) {
uint8_t const ep_dir = ((hxfr_type & HXFR_SETUP) || (hxfr_type & HXFR_OUT_NIN)) ? 0 : 1; uint8_t const ep_dir = ((hxfr_type & HXFR_SETUP) || (hxfr_type & HXFR_OUT_NIN)) ? 0 : 1;
max3421_ep_t *ep = find_opened_ep(_hcd_data.peraddr, ep_num, ep_dir); max3421_ep_t *ep = find_opened_ep(_hcd_data.peraddr, ep_num, ep_dir);
TU_ASSERT(ep, );
xfer_result_t xfer_result; xfer_result_t xfer_result;
@ -712,6 +714,20 @@ static void handle_xfer_done(uint8_t rhport) {
hxfr_write(rhport, _hcd_data.hxfr, true); hxfr_write(rhport, _hcd_data.hxfr, true);
}else { }else {
// NAK on non-control, find next pending to switch // NAK on non-control, find next pending to switch
max3421_ep_t *next_ep = find_next_pending_ep(ep);
TU_ASSERT(next_ep, );
if (ep == next_ep) {
// only one pending, retry immediately
hxfr_write(rhport, _hcd_data.hxfr, true);
}else {
// switch to next pending TODO could have issue with double buffered if not clear previously out data
if ( ep_dir ) {
xact_in(rhport, next_ep, true, true);
} else {
xact_out(rhport, next_ep, true, true);
}
}
} }
return; return;