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/target/mips | |
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/target/mips')
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c | 6 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c index f201983404..ac4092f043 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c | |||
@@ -628,7 +628,7 @@ static inline int read_sector(unsigned long start, unsigned int count, | |||
628 | return ret; | 628 | return ret; |
629 | } | 629 | } |
630 | 630 | ||
631 | int nand_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf) | 631 | int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* buf) |
632 | { | 632 | { |
633 | #ifdef HAVE_MULTIVOLUME | 633 | #ifdef HAVE_MULTIVOLUME |
634 | (void)drive; | 634 | (void)drive; |
@@ -671,7 +671,7 @@ int nand_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* b | |||
671 | } | 671 | } |
672 | 672 | ||
673 | /* TODO */ | 673 | /* TODO */ |
674 | int nand_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf) | 674 | int nand_write_sectors(IF_MV(int drive,) unsigned long start, int count, const void* buf) |
675 | { | 675 | { |
676 | (void)start; | 676 | (void)start; |
677 | (void)count; | 677 | (void)count; |
@@ -728,7 +728,7 @@ void nand_sleepnow(void) | |||
728 | } | 728 | } |
729 | 729 | ||
730 | #ifdef STORAGE_GET_INFO | 730 | #ifdef STORAGE_GET_INFO |
731 | void nand_get_info(IF_MV2(int drive,) struct storage_info *info) | 731 | void nand_get_info(IF_MV(int drive,) struct storage_info *info) |
732 | { | 732 | { |
733 | #ifdef HAVE_MULTIVOLUME | 733 | #ifdef HAVE_MULTIVOLUME |
734 | (void)drive; | 734 | (void)drive; |
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c index 846b9095f1..9c0d1982ad 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | |||
@@ -1266,7 +1266,7 @@ static inline void sd_stop_transfer(void) | |||
1266 | mutex_unlock(&sd_mtx); | 1266 | mutex_unlock(&sd_mtx); |
1267 | } | 1267 | } |
1268 | 1268 | ||
1269 | int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf) | 1269 | int sd_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* buf) |
1270 | { | 1270 | { |
1271 | #ifdef HAVE_MULTIVOLUME | 1271 | #ifdef HAVE_MULTIVOLUME |
1272 | (void)drive; | 1272 | (void)drive; |
@@ -1320,7 +1320,7 @@ err: | |||
1320 | return retval; | 1320 | return retval; |
1321 | } | 1321 | } |
1322 | 1322 | ||
1323 | int sd_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf) | 1323 | int sd_write_sectors(IF_MV(int drive,) unsigned long start, int count, const void* buf) |
1324 | { | 1324 | { |
1325 | #ifdef HAVE_MULTIVOLUME | 1325 | #ifdef HAVE_MULTIVOLUME |
1326 | (void)drive; | 1326 | (void)drive; |