diff options
Diffstat (limited to 'firmware/usbstack/usb_storage.c')
-rw-r--r-- | firmware/usbstack/usb_storage.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c index 24ac00138d..5e97796db0 100644 --- a/firmware/usbstack/usb_storage.c +++ b/firmware/usbstack/usb_storage.c | |||
@@ -287,7 +287,7 @@ static bool check_disk_present(IF_MV_NONVOID(int volume)) | |||
287 | return true; | 287 | return true; |
288 | #else | 288 | #else |
289 | unsigned char sector[512]; | 289 | unsigned char sector[512]; |
290 | return storage_read_sectors(IF_MV2(volume,)0,1,sector) == 0; | 290 | return storage_read_sectors(volume,0,1,sector) == 0; |
291 | #endif | 291 | #endif |
292 | } | 292 | } |
293 | 293 | ||
@@ -458,7 +458,7 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length) | |||
458 | cur_cmd.data[cur_cmd.data_select], | 458 | cur_cmd.data[cur_cmd.data_select], |
459 | MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE); | 459 | MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE); |
460 | #else | 460 | #else |
461 | int result = storage_write_sectors(IF_MV2(cur_cmd.lun,) | 461 | int result = storage_write_sectors(cur_cmd.lun, |
462 | cur_cmd.sector, | 462 | cur_cmd.sector, |
463 | MIN(BUFFER_SIZE/SECTOR_SIZE, | 463 | MIN(BUFFER_SIZE/SECTOR_SIZE, |
464 | cur_cmd.count), | 464 | cur_cmd.count), |
@@ -637,7 +637,7 @@ static void send_and_read_next(void) | |||
637 | ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE, | 637 | ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE, |
638 | MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE); | 638 | MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE); |
639 | #else | 639 | #else |
640 | cur_cmd.last_result = storage_read_sectors(IF_MV2(cur_cmd.lun,) | 640 | cur_cmd.last_result = storage_read_sectors(cur_cmd.lun, |
641 | cur_cmd.sector, | 641 | cur_cmd.sector, |
642 | MIN(BUFFER_SIZE/SECTOR_SIZE, | 642 | MIN(BUFFER_SIZE/SECTOR_SIZE, |
643 | cur_cmd.count), | 643 | cur_cmd.count), |
@@ -663,7 +663,7 @@ static void handle_scsi(struct command_block_wrapper* cbw) | |||
663 | unsigned char lun = cbw->lun; | 663 | unsigned char lun = cbw->lun; |
664 | #endif | 664 | #endif |
665 | unsigned int block_size_mult = 1; | 665 | unsigned int block_size_mult = 1; |
666 | storage_get_info(IF_MV2(lun,)&info); | 666 | storage_get_info(lun,&info); |
667 | #ifdef USB_USE_RAMDISK | 667 | #ifdef USB_USE_RAMDISK |
668 | block_size = SECTOR_SIZE; | 668 | block_size = SECTOR_SIZE; |
669 | block_count = RAMDISK_SIZE; | 669 | block_count = RAMDISK_SIZE; |
@@ -673,7 +673,7 @@ static void handle_scsi(struct command_block_wrapper* cbw) | |||
673 | #endif | 673 | #endif |
674 | 674 | ||
675 | #ifdef HAVE_HOTSWAP | 675 | #ifdef HAVE_HOTSWAP |
676 | if(storage_removable(IF_MV(lun)) && !storage_present(IF_MV(lun))) { | 676 | if(storage_removable(lun) && !storage_present(lun)) { |
677 | ejected[lun] = true; | 677 | ejected[lun] = true; |
678 | try_release_ata(); | 678 | try_release_ata(); |
679 | } | 679 | } |
@@ -723,7 +723,7 @@ static void handle_scsi(struct command_block_wrapper* cbw) | |||
723 | for(i=0;i<NUM_VOLUMES;i++) | 723 | for(i=0;i<NUM_VOLUMES;i++) |
724 | { | 724 | { |
725 | #ifdef HAVE_HOTSWAP | 725 | #ifdef HAVE_HOTSWAP |
726 | if(storage_removable(IF_MV(i))) | 726 | if(storage_removable(i)) |
727 | tb.lun_data->luns[i][1]=1; | 727 | tb.lun_data->luns[i][1]=1; |
728 | else | 728 | else |
729 | #endif | 729 | #endif |
@@ -972,7 +972,7 @@ static void handle_scsi(struct command_block_wrapper* cbw) | |||
972 | ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE, | 972 | ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE, |
973 | MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE); | 973 | MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE); |
974 | #else | 974 | #else |
975 | cur_cmd.last_result = storage_read_sectors(IF_MV2(cur_cmd.lun,) | 975 | cur_cmd.last_result = storage_read_sectors(cur_cmd.lun, |
976 | cur_cmd.sector, | 976 | cur_cmd.sector, |
977 | MIN(BUFFER_SIZE/SECTOR_SIZE, | 977 | MIN(BUFFER_SIZE/SECTOR_SIZE, |
978 | cur_cmd.count), | 978 | cur_cmd.count), |
@@ -1089,7 +1089,7 @@ static void fill_inquiry(IF_MV_NONVOID(int lun)) | |||
1089 | { | 1089 | { |
1090 | memset(tb.inquiry, 0, sizeof(struct inquiry_data)); | 1090 | memset(tb.inquiry, 0, sizeof(struct inquiry_data)); |
1091 | struct storage_info info; | 1091 | struct storage_info info; |
1092 | storage_get_info(IF_MV2(lun,)&info); | 1092 | storage_get_info(lun,&info); |
1093 | copy_padded(tb.inquiry->VendorId,info.vendor,sizeof(tb.inquiry->VendorId)); | 1093 | copy_padded(tb.inquiry->VendorId,info.vendor,sizeof(tb.inquiry->VendorId)); |
1094 | copy_padded(tb.inquiry->ProductId,info.product,sizeof(tb.inquiry->ProductId)); | 1094 | copy_padded(tb.inquiry->ProductId,info.product,sizeof(tb.inquiry->ProductId)); |
1095 | copy_padded(tb.inquiry->ProductRevisionLevel,info.revision,sizeof(tb.inquiry->ProductRevisionLevel)); | 1095 | copy_padded(tb.inquiry->ProductRevisionLevel,info.revision,sizeof(tb.inquiry->ProductRevisionLevel)); |