djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Mac crash when waking up with an ejected CIRCUITPY 

We now correctly set the reason for the unit not being ready and
always start the unit.

Fixes #2567
This commit is contained in:
Scott Shawcroft 2020-02-24 15:40:52 -08:00
parent 90c67673ad
commit 876c646d09
No known key found for this signature in database
GPG Key ID: 9349BC7E64B1921E
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
supervisor/shared/usb/usb_msc_flash.c
View File

@ -208,6 +208,8 @@ bool tud_msc_test_unit_ready_cb(uint8_t lun) {
return false; return false;
} }
if (ejected[lun]) { if (ejected[lun]) {
// Set 0x3a for media not present.
tud_msc_set_sense(lun, SCSI_SENSE_NOT_READY, 0x3A, 0x00);
return false; return false;
} }
@ -243,10 +245,8 @@ bool tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, boo
if (disk_ioctl(current_mount, CTRL_SYNC, NULL) != RES_OK) { if (disk_ioctl(current_mount, CTRL_SYNC, NULL) != RES_OK) {
return false; return false;
} }
} else {
// Start the unit, but only if not ejected.
return !ejected[lun];
} }
// Always start the unit, even if ejected. Whether media is present is a separate check.
} }
return true; return true;