devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Handle disk errors properly in USB storage driver. Fixes FS#10873

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28733 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2010-12-04 13:56:19 +00:00
parent 911f2a7dac
commit f9a6bde15f
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
firmware/usbstack/usb_storage.c
View file

@ -647,6 +647,15 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length)
if(status==0) { if(status==0) {
if(cur_cmd.count==0) { if(cur_cmd.count==0) {
//logf("data sent, now send csw"); //logf("data sent, now send csw");
if(cur_cmd.last_result!=0) {
/* The last read failed. */
send_csw(UMS_STATUS_FAIL);
cur_sense_data.sense_key=SENSE_MEDIUM_ERROR;
cur_sense_data.asc=ASC_READ_ERROR;
cur_sense_data.ascq=0;
return;
}
else
send_csw(UMS_STATUS_GOOD); send_csw(UMS_STATUS_GOOD);
} }
else { else {
@ -716,14 +725,6 @@ bool usb_storage_control_request(struct usb_ctrlrequest* req, unsigned char* des
static void send_and_read_next(void) static void send_and_read_next(void)
{ {
if(cur_cmd.last_result!=0) {
/* The last read failed. */
send_csw(UMS_STATUS_FAIL);
cur_sense_data.sense_key=SENSE_MEDIUM_ERROR;
cur_sense_data.asc=ASC_READ_ERROR;
cur_sense_data.ascq=0;
return;
}
send_block_data(cur_cmd.data[cur_cmd.data_select], send_block_data(cur_cmd.data[cur_cmd.data_select],
MIN(READ_BUFFER_SIZE,cur_cmd.count*SECTOR_SIZE)); MIN(READ_BUFFER_SIZE,cur_cmd.count*SECTOR_SIZE));
@ -741,10 +742,13 @@ static void send_and_read_next(void)
ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE, ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE,
MIN(READ_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE); MIN(READ_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE);
#else #else
cur_cmd.last_result = storage_read_sectors(IF_MD2(cur_cmd.lun,) int result = storage_read_sectors(IF_MD2(cur_cmd.lun,)
cur_cmd.sector, cur_cmd.sector,
MIN(READ_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count), MIN(READ_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count),
cur_cmd.data[cur_cmd.data_select]); cur_cmd.data[cur_cmd.data_select]);
if(cur_cmd.last_result == 0)
cur_cmd.last_result = result;
#endif #endif
} }
} }