bstanwell/wch-uf2-example
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug prematurely sending STALL when write in progress

Browse Source
This commit is contained in:
R
2024-04-14 15:21:01 +01:00
parent 5b69ac973f
commit 389e387aa1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootloader.c
+4 -3
View File
@@ -174,6 +174,7 @@ extern uint32_t USB_SECTOR_STASH[128];
#define USB_STAT_DISABLED 0b00 #define USB_STAT_DISABLED 0b00
#define USB_STAT_STALL 0b01 #define USB_STAT_STALL 0b01
#define USB_STAT_NAK 0b10
#define USB_STAT_ACK 0b11 #define USB_STAT_ACK 0b11
#define R16_BKP_DATAR10 (*(volatile uint32_t*)0x40006C28) #define R16_BKP_DATAR10 (*(volatile uint32_t*)0x40006C28)
@@ -694,7 +695,7 @@ __attribute__((naked)) int main(void) {
msc_state = STATE_SEND_MORE_READ; msc_state = STATE_SEND_MORE_READ;
} else { } else {
// WRITE // WRITE
set_ep_mode(1, 1, USB_EPTYPE_BULK, USB_STAT_ACK, USB_STAT_STALL, 0, 0); set_ep_mode(1, 1, USB_EPTYPE_BULK, USB_STAT_ACK, USB_STAT_NAK, 0, 0);
msc_state = STATE_WAITING_FOR_WRITE; msc_state = STATE_WAITING_FOR_WRITE;
} }
break; break;
@@ -747,7 +748,7 @@ __attribute__((naked)) int main(void) {
} }
if (piece != 7) { if (piece != 7) {
set_ep_mode(1, 1, USB_EPTYPE_BULK, USB_STAT_ACK, USB_STAT_STALL, 0, 0); set_ep_mode(1, 1, USB_EPTYPE_BULK, USB_STAT_ACK, USB_STAT_NAK, 0, 0);
msc_state += 0x100; msc_state += 0x100;
} else { } else {
// full sector is done // full sector is done
@@ -787,7 +788,7 @@ __attribute__((naked)) int main(void) {
msc_state = STATE_SENT_CSW; msc_state = STATE_SENT_CSW;
} else { } else {
scsi_xfer_lba_blocks = blocks_left; scsi_xfer_lba_blocks = blocks_left;
set_ep_mode(1, 1, USB_EPTYPE_BULK, USB_STAT_ACK, USB_STAT_STALL, 0, 0); set_ep_mode(1, 1, USB_EPTYPE_BULK, USB_STAT_ACK, USB_STAT_NAK, 0, 0);
msc_state = STATE_WAITING_FOR_WRITE; msc_state = STATE_WAITING_FOR_WRITE;
} }
} }