Fix Mac crash when waking up with an ejected CIRCUITPY

tannewt · tannewt · commit 876c646d097b · 2020-02-24T15:40:52.000-08:00
We now correctly set the reason for the unit not being ready and always start the unit. Fixes adafruit#2567
diff --git a/supervisor/shared/usb/usb_msc_flash.c b/supervisor/shared/usb/usb_msc_flash.c
@@ -208,6 +208,8 @@ bool tud_msc_test_unit_ready_cb(uint8_t lun) {
         return false;
     }
     if (ejected[lun]) {
+        // Set 0x3a for media not present.
+        tud_msc_set_sense(lun, SCSI_SENSE_NOT_READY, 0x3A, 0x00);
         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) {
                 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;

Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,8 @@ bool tud_msc_test_unit_ready_cb(uint8_t lun) {`
`208`	`208`	`return false;`
`209`	`209`	`}`
`210`	`210`	`if (ejected[lun]) {`
	`211`	`+ // Set 0x3a for media not present.`
	`212`	`+ tud_msc_set_sense(lun, SCSI_SENSE_NOT_READY, 0x3A, 0x00);`
`211`	`213`	`return false;`
`212`	`214`	`}`
`213`	`215`
`@@ -243,10 +245,8 @@ bool tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, boo`
`243`	`245`	`if (disk_ioctl(current_mount, CTRL_SYNC, NULL) != RES_OK) {`
`244`	`246`	`return false;`
`245`	`247`	`}`
`246`		`- } else {`
`247`		`- // Start the unit, but only if not ejected.`
`248`		`- return !ejected[lun];`
`249`	`248`	`}`
	`249`	`+ // Always start the unit, even if ejected. Whether media is present is a separate check.`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`return true;`