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

fix for out retry attempts with nak response

Browse Source
This commit is contained in:
Cumhur Onat
2024-07-21 21:22:19 -04:00
committed by hathach
parent 4485bffd13
commit 5bb2e66ce7
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,12 +203,13 @@ typedef struct {
uint16_t packet_size : 11; uint16_t packet_size : 11;
}; };
bool received_nak;
uint16_t total_len; uint16_t total_len;
uint16_t xferred_len; uint16_t xferred_len;
uint8_t* buf; uint8_t* buf;
} max3421_ep_t; } max3421_ep_t;
TU_VERIFY_STATIC(sizeof(max3421_ep_t) == 12, "size is not correct"); TU_VERIFY_STATIC(sizeof(max3421_ep_t) == 16, "size is not correct");
typedef struct { typedef struct {
volatile uint16_t frame_count; volatile uint16_t frame_count;
@@ -625,12 +626,17 @@ static void xact_out(uint8_t rhport, max3421_ep_t *ep, bool switch_ep, bool in_i
reg_write(rhport, HCTL_ADDR, hctl, in_isr); reg_write(rhport, HCTL_ADDR, hctl, in_isr);
} }
uint8_t const xact_len = (uint8_t) tu_min16(ep->total_len - ep->xferred_len, ep->packet_size); if (!ep->received_nak){
TU_ASSERT(_hcd_data.hirq & HIRQ_SNDBAV_IRQ,); // do not write to fifo or sdnbc register again if previous attempt got NAK
if (xact_len) { uint8_t const xact_len = (uint8_t) tu_min16(ep->total_len - ep->xferred_len, ep->packet_size);
fifo_write(rhport, SNDFIFO_ADDR, ep->buf, xact_len, in_isr); TU_ASSERT(_hcd_data.hirq & HIRQ_SNDBAV_IRQ,);
if (xact_len) {
fifo_write(rhport, SNDFIFO_ADDR, ep->buf, xact_len, in_isr);
}
sndbc_write(rhport, xact_len, in_isr);
} }
sndbc_write(rhport, xact_len, in_isr);
hxfr_write(rhport, ep->hxfr, in_isr); hxfr_write(rhport, ep->hxfr, in_isr);
} }
@@ -844,6 +850,7 @@ static void handle_xfer_done(uint8_t rhport, bool in_isr) {
return; return;
} else if (EP_STATE_ATTEMPT_1 <= ep->state && ep->state < EP_STATE_ATTEMPT_MAX) { } else if (EP_STATE_ATTEMPT_1 <= ep->state && ep->state < EP_STATE_ATTEMPT_MAX) {
ep->state++; ep->state++;
ep->received_nak = true;
} }
} }
@@ -867,6 +874,7 @@ static void handle_xfer_done(uint8_t rhport, bool in_isr) {
case HRSL_SUCCESS: case HRSL_SUCCESS:
xfer_result = XFER_RESULT_SUCCESS; xfer_result = XFER_RESULT_SUCCESS;
ep->received_nak = false;
break; break;
case HRSL_STALL: case HRSL_STALL: