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

A floppy drive is a slow device, so we have to try many times before getting a result.

Browse Source 
This gets read capaity working, the device shows up in drivesetup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38404 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues
2010-08-27 17:33:54 +00:00
parent e9a09f6670
commit 87bfae8987
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/usb/usb_floppy/usb_disk.cpp
+8 -4
View File
@@ -261,6 +261,11 @@ usb_disk_operation(device_lun *lun, uint8* operation,
if (result != B_OK || actualLength != 12) { if (result != B_OK || actualLength != 12) {
TRACE("Command stage: wrote %ld bytes (error: %s)\n", TRACE("Command stage: wrote %ld bytes (error: %s)\n",
actualLength, strerror(result)); actualLength, strerror(result));
// There was an error, we have to do a request sense to reset the device
if (operation[0] != SCSI_REQUEST_SENSE_6) {
result = usb_disk_request_sense(lun);
}
return B_ERROR; return B_ERROR;
} }
@@ -544,12 +549,11 @@ usb_disk_update_capacity(device_lun *lun)
// changed, which is more or less expected if it is the first operation // changed, which is more or less expected if it is the first operation
// on the device or the device only clears the unit atention for capacity // on the device or the device only clears the unit atention for capacity
// reads. // reads.
for (int32 i = 0; i < 3; i++) { do {
snooze(10000);
result = usb_disk_operation(lun, commandBlock, &parameter, &dataLength, result = usb_disk_operation(lun, commandBlock, &parameter, &dataLength,
true); true);
if (result == B_OK) } while (result != B_OK);
break;
}
if (result != B_OK) { if (result != B_OK) {
TRACE_ALWAYS("failed to update capacity\n"); TRACE_ALWAYS("failed to update capacity\n");