i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb_disk: Don't synchronize cache or read if no media present.

Browse Source 
Signed-off-by: Augustin Cavalier <[email protected]>
Minor style fixes and one additional check by me.

May help with #19256 and others.
This commit is contained in:
Mika T. Lindqvist
2024-12-16 15:51:15 -05:00
committed by Augustin Cavalier
parent 91bb4d0238
commit c5cc07a188
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
+11 -1
View File
@@ -691,7 +691,7 @@ usb_disk_request_sense(device_lun *lun, err_act *_action)
} else if (parameter.sense_key == SCSI_SENSE_KEY_UNIT_ATTENTION } else if (parameter.sense_key == SCSI_SENSE_KEY_UNIT_ATTENTION
&& status != B_DEV_NO_MEDIA) { && status != B_DEV_NO_MEDIA) {
lun->media_present = true; lun->media_present = true;
} else if (status == B_DEV_NOT_READY) { } else if (status == B_DEV_NOT_READY || status == B_DEV_NO_MEDIA) {
lun->media_present = false; lun->media_present = false;
usb_disk_reset_capacity(lun); usb_disk_reset_capacity(lun);
} }
@@ -985,6 +985,9 @@ usb_disk_synchronize(device_lun *lun, bool force)
if (!lun->should_sync && !force) if (!lun->should_sync && !force)
return B_OK; return B_OK;
if (!lun->media_present)
return B_DEV_NO_MEDIA;
uint8 commandBlock[12]; uint8 commandBlock[12];
memset(commandBlock, 0, sizeof(commandBlock)); memset(commandBlock, 0, sizeof(commandBlock));
@@ -1277,8 +1280,12 @@ static status_t
usb_disk_block_read(device_lun *lun, uint64 blockPosition, size_t blockCount, usb_disk_block_read(device_lun *lun, uint64 blockPosition, size_t blockCount,
struct transfer_data data, size_t *length) struct transfer_data data, size_t *length)
{ {
if (!lun->media_present)
return B_DEV_NO_MEDIA;
uint8 commandBlock[16]; uint8 commandBlock[16];
memset(commandBlock, 0, sizeof(commandBlock)); memset(commandBlock, 0, sizeof(commandBlock));
if (lun->device->is_ufi) { if (lun->device->is_ufi) {
commandBlock[0] = SCSI_READ_12; commandBlock[0] = SCSI_READ_12;
commandBlock[1] = lun->logical_unit_number << 5; commandBlock[1] = lun->logical_unit_number << 5;
@@ -1339,6 +1346,9 @@ static status_t
usb_disk_block_write(device_lun *lun, uint64 blockPosition, size_t blockCount, usb_disk_block_write(device_lun *lun, uint64 blockPosition, size_t blockCount,
struct transfer_data data, size_t *length) struct transfer_data data, size_t *length)
{ {
if (!lun->media_present)
return B_DEV_NO_MEDIA;
uint8 commandBlock[16]; uint8 commandBlock[16];
memset(commandBlock, 0, sizeof(commandBlock)); memset(commandBlock, 0, sizeof(commandBlock));