diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-08-17 12:18:22 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2013-08-17 12:18:22 -0400 |
commit | a56f1ca1ed63b93eb61fd5319f47347b3eb1e364 (patch) | |
tree | 62a253ba44b23c1867cef59fee40b40092719ee1 /firmware/usbstack/usb_storage.c | |
parent | c13f21a4d5c27c638c9f0dedf6d7b1f9bbb4d682 (diff) | |
download | rockbox-a56f1ca1ed63b93eb61fd5319f47347b3eb1e364.tar.gz rockbox-a56f1ca1ed63b93eb61fd5319f47347b3eb1e364.zip |
Cleanup MV/MD macros a little.
When using variadic macros there's no need for IF_MD2/IF_MV2 to deal
with function parameters. IF_MD/IF_MV are enough.
Throw in IF_MD_DRV/ID_MV_VOL that return the parameter if MD/MV, or 0
if not.
Change-Id: I7605e6039f3be19cb47110c84dcb3c5516f2c3eb
Diffstat (limited to 'firmware/usbstack/usb_storage.c')
-rw-r--r-- | firmware/usbstack/usb_storage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c index b898978776..d1279d0ee1 100644 --- a/firmware/usbstack/usb_storage.c +++ b/firmware/usbstack/usb_storage.c | |||
@@ -353,7 +353,7 @@ static bool check_disk_present(IF_MD_NONVOID(int volume)) | |||
353 | return true; | 353 | return true; |
354 | #else | 354 | #else |
355 | unsigned char* sector = fat_get_sector_buffer(); | 355 | unsigned char* sector = fat_get_sector_buffer(); |
356 | bool success = storage_read_sectors(IF_MD2(volume,)0,1,sector) == 0; | 356 | bool success = storage_read_sectors(IF_MD(volume,)0,1,sector) == 0; |
357 | fat_release_sector_buffer(); | 357 | fat_release_sector_buffer(); |
358 | return success; | 358 | return success; |
359 | #endif | 359 | #endif |
@@ -526,7 +526,7 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length) | |||
526 | int result = USBSTOR_WRITE_SECTORS_FILTER(); | 526 | int result = USBSTOR_WRITE_SECTORS_FILTER(); |
527 | 527 | ||
528 | if (result == 0) { | 528 | if (result == 0) { |
529 | result = storage_write_sectors(IF_MD2(cur_cmd.lun,) | 529 | result = storage_write_sectors(IF_MD(cur_cmd.lun,) |
530 | cur_cmd.sector, | 530 | cur_cmd.sector, |
531 | MIN(WRITE_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count), | 531 | MIN(WRITE_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count), |
532 | cur_cmd.data[cur_cmd.data_select]); | 532 | cur_cmd.data[cur_cmd.data_select]); |
@@ -728,7 +728,7 @@ static void send_and_read_next(void) | |||
728 | ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE, | 728 | ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE, |
729 | MIN(READ_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE); | 729 | MIN(READ_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE); |
730 | #else | 730 | #else |
731 | result = storage_read_sectors(IF_MD2(cur_cmd.lun,) | 731 | result = storage_read_sectors(IF_MD(cur_cmd.lun,) |
732 | cur_cmd.sector, | 732 | cur_cmd.sector, |
733 | MIN(READ_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count), | 733 | MIN(READ_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count), |
734 | cur_cmd.data[cur_cmd.data_select]); | 734 | cur_cmd.data[cur_cmd.data_select]); |
@@ -1087,7 +1087,7 @@ static void handle_scsi(struct command_block_wrapper* cbw) | |||
1087 | ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE, | 1087 | ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE, |
1088 | MIN(READ_BUFFER_SIZE/SECTOR_SIZE,cur_cmd.count)*SECTOR_SIZE); | 1088 | MIN(READ_BUFFER_SIZE/SECTOR_SIZE,cur_cmd.count)*SECTOR_SIZE); |
1089 | #else | 1089 | #else |
1090 | cur_cmd.last_result = storage_read_sectors(IF_MD2(cur_cmd.lun,) | 1090 | cur_cmd.last_result = storage_read_sectors(IF_MD(cur_cmd.lun,) |
1091 | cur_cmd.sector, | 1091 | cur_cmd.sector, |
1092 | MIN(READ_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count), | 1092 | MIN(READ_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count), |
1093 | cur_cmd.data[cur_cmd.data_select]); | 1093 | cur_cmd.data[cur_cmd.data_select]); |