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

atmel-samd: Add support for ERR_ABORTED to indicate medium not present.

Browse Source
This commit is contained in:
Scott Shawcroft 2017-10-25 17:41:44 -07:00 committed by Dan Halbert
parent ab7da9353a
commit d613776f0d
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/atmel-samd/asf4

@ -1 +1 @@
Subproject commit bff3972abaeab79502bd7d0498b6ae81cc335e19
Subproject commit 8e3e471f481effddd5c23da2342e1e4aab618e1f

21
ports/atmel-samd/usb_mass_storage.c
View File

@ -77,6 +77,11 @@ int32_t usb_msc_disk_eject(uint8_t lun) {
if (lun > 1) {
return ERR_NOT_FOUND;
}
fs_user_mount_t* current_mount = get_vfs(lun);
// Return ERR_NOT_READY if not ready, otherwise ERR_NONE.
if (current_mount == NULL) {
return ERR_ABORTED;
}
// TODO(tannewt): Should we flush here?
return ERR_NONE;
}
@ -92,11 +97,10 @@ int32_t usb_msc_disk_is_ready(uint8_t lun) {
}
fs_user_mount_t* current_mount = get_vfs(lun);
// Return ERR_NOT_READY if not ready, otherwise ERR_NONE.
if (current_mount != NULL) {
return ERR_NONE;
if (current_mount == NULL) {
return ERR_ABORTED;
}
return ERR_NOT_READY;
return ERR_NONE;
}
/**
@ -111,9 +115,12 @@ uint8_t *usb_msc_inquiry_info(uint8_t lun) {
for (uint8_t i = 0; i < 36; i++) {
inquiry_info[lun][i] = 0;
}
inquiry_info[lun][1] = (0x1 << 7);
inquiry_info[lun][3] = 0x01;
inquiry_info[lun][4] = 31;
inquiry_info[lun][0] = SCSI_INQ_PQ_CONNECTED | SCSI_INQ_DT_DIR_ACCESS;
// connected, direct access
inquiry_info[lun][1] = SCSI_INQ_RMB; // removable medium
inquiry_info[lun][2] = SCSI_INQ_VER_SPC; // SBC version of SCSI primary commands
inquiry_info[lun][3] = SCSI_INQ_RSP_SPC2;// SPC-2 response format
inquiry_info[lun][4] = 31; // 31 bytes following
return &inquiry_info[lun][0];
}
}