From a56f1ca1ed63b93eb61fd5319f47347b3eb1e364 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 17 Aug 2013 12:18:22 -0400 Subject: 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 --- firmware/target/arm/as3525/sd-as3525.c | 14 +++++++------- firmware/target/arm/as3525/sd-as3525v2.c | 10 +++++----- firmware/target/arm/ata-nand-telechips.c | 6 +++--- firmware/target/arm/imx233/nand-imx233.c | 6 +++--- firmware/target/arm/imx233/sdmmc-imx233.c | 10 +++++----- firmware/target/arm/pp/ata-sd-pp.c | 4 ++-- firmware/target/arm/rk27xx/ata-nand-rk27xx.c | 6 +++--- firmware/target/arm/rk27xx/sd-rk27xx.c | 4 ++-- firmware/target/arm/s3c2440/sd-s3c2440.c | 4 ++-- firmware/target/arm/s5l8700/ata-nand-s5l8700.c | 6 +++--- firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c | 6 +++--- firmware/target/arm/tcc780x/sd-tcc780x.c | 4 ++-- .../arm/tms320dm320/creative-zvm/ata-creativezvm.c | 16 ++++++++-------- .../target/arm/tms320dm320/creative-zvm/ata-target.h | 4 ++-- firmware/target/arm/tms320dm320/sdmmc-dm320.c | 4 ++-- 15 files changed, 52 insertions(+), 52 deletions(-) (limited to 'firmware/target/arm') diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c index 5bed36e51e..c80c7f7491 100644 --- a/firmware/target/arm/as3525/sd-as3525.c +++ b/firmware/target/arm/as3525/sd-as3525.c @@ -693,7 +693,7 @@ static int sd_select_bank(signed char bank) return 0; } -static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start, +static int sd_transfer_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf, const bool write) { #ifndef HAVE_MULTIDRIVE @@ -887,19 +887,19 @@ sd_transfer_error_nodma: return ret; } -int sd_read_sectors(IF_MD2(int drive,) unsigned long start, int count, +int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf) { int ret; mutex_lock(&sd_mtx); - ret = sd_transfer_sectors(IF_MD2(drive,) start, count, buf, false); + ret = sd_transfer_sectors(IF_MD(drive,) start, count, buf, false); mutex_unlock(&sd_mtx); return ret; } -int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count, +int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf) { #ifdef VERIFY_WRITE @@ -911,7 +911,7 @@ int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count, mutex_lock(&sd_mtx); - ret = sd_transfer_sectors(IF_MD2(drive,) start, count, (void*)buf, true); + ret = sd_transfer_sectors(IF_MD(drive,) start, count, (void*)buf, true); #ifdef VERIFY_WRITE if (ret) { @@ -928,10 +928,10 @@ int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count, if(transfer > UNALIGNED_NUM_SECTORS) transfer = UNALIGNED_NUM_SECTORS; - sd_transfer_sectors(IF_MD2(drive,) start, transfer, aligned_buffer, false); + sd_transfer_sectors(IF_MD(drive,) start, transfer, aligned_buffer, false); if (memcmp(buf, aligned_buffer, transfer * 512) != 0) { /* try the write again in the hope to repair the damage */ - sd_transfer_sectors(IF_MD2(drive,) saved_start, saved_count, saved_buf, true); + sd_transfer_sectors(IF_MD(drive,) saved_start, saved_count, saved_buf, true); panicf("sd: verify failed: sec=%ld n=%d!", start, transfer); } diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c index 9edc598edf..ae3dde4495 100644 --- a/firmware/target/arm/as3525/sd-as3525v2.c +++ b/firmware/target/arm/as3525/sd-as3525v2.c @@ -773,7 +773,7 @@ int sd_init(void) return 0; } -static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start, +static int sd_transfer_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf, bool write) { unsigned long response; @@ -969,16 +969,16 @@ sd_transfer_error_no_dma: } } -int sd_read_sectors(IF_MD2(int drive,) unsigned long start, int count, +int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf) { - return sd_transfer_sectors(IF_MD2(drive,) start, count, buf, false); + return sd_transfer_sectors(IF_MD(drive,) start, count, buf, false); } -int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count, +int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf) { - return sd_transfer_sectors(IF_MD2(drive,) start, count, (void*)buf, true); + return sd_transfer_sectors(IF_MD(drive,) start, count, (void*)buf, true); } #ifndef BOOTLOADER diff --git a/firmware/target/arm/ata-nand-telechips.c b/firmware/target/arm/ata-nand-telechips.c index 2ae425f4c6..fe1314d35a 100644 --- a/firmware/target/arm/ata-nand-telechips.c +++ b/firmware/target/arm/ata-nand-telechips.c @@ -800,7 +800,7 @@ static void read_inplace_writes_cache(int bank, int phys_segment) } -int nand_read_sectors(IF_MD2(int drive,) unsigned long start, int incount, +int nand_read_sectors(IF_MD(int drive,) unsigned long start, int incount, void* inbuf) { #ifdef HAVE_MULTIDRIVE @@ -855,7 +855,7 @@ nand_read_error: return ret; } -int nand_write_sectors(IF_MD2(int drive,) unsigned long start, int count, +int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* outbuf) { #ifdef HAVE_MULTIDRIVE @@ -877,7 +877,7 @@ int nand_flush(void) #endif #ifdef STORAGE_GET_INFO -void nand_get_info(IF_MD2(int drive,) struct storage_info *info) +void nand_get_info(IF_MD(int drive,) struct storage_info *info) { #ifdef HAVE_MULTIDRIVE (void)drive; /* unused for now */ diff --git a/firmware/target/arm/imx233/nand-imx233.c b/firmware/target/arm/imx233/nand-imx233.c index ec584b5869..22c4fc2748 100644 --- a/firmware/target/arm/imx233/nand-imx233.c +++ b/firmware/target/arm/imx233/nand-imx233.c @@ -36,13 +36,13 @@ int nand_init(void) { return -1; } -int nand_read_sectors(IF_MD2(int drive,) unsigned long start, int count, +int nand_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf) { return -1; } -int nand_write_sectors(IF_MD2(int drive,) unsigned long start, int count, +int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf) { return -1; @@ -54,7 +54,7 @@ int nand_num_drives(int first_drive) return 1; } -void nand_get_info(IF_MD2(int drive,) struct storage_info *info) +void nand_get_info(IF_MD(int drive,) struct storage_info *info) { IF_MD((void)drive); info->sector_size = SECTOR_SIZE; diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c index c389a1d2c8..e520fcc6e6 100644 --- a/firmware/target/arm/imx233/sdmmc-imx233.c +++ b/firmware/target/arm/imx233/sdmmc-imx233.c @@ -845,7 +845,7 @@ void sd_enable(bool on) (void) on; } -int sd_read_sectors(IF_MD2(int sd_drive,) unsigned long start, int count, void *buf) +int sd_read_sectors(IF_MD(int sd_drive,) unsigned long start, int count, void *buf) { #ifndef HAVE_MULTIDRIVE int sd_drive = 0; @@ -853,7 +853,7 @@ int sd_read_sectors(IF_MD2(int sd_drive,) unsigned long start, int count, void * return transfer_sectors(sd_map[sd_drive], start, count, buf, true); } -int sd_write_sectors(IF_MD2(int sd_drive,) unsigned long start, int count, const void* buf) +int sd_write_sectors(IF_MD(int sd_drive,) unsigned long start, int count, const void* buf) { #ifndef HAVE_MULTIDRIVE int sd_drive = 0; @@ -878,7 +878,7 @@ int mmc_init(void) return 0; } -void mmc_get_info(IF_MD2(int mmc_drive,) struct storage_info *info) +void mmc_get_info(IF_MD(int mmc_drive,) struct storage_info *info) { #ifndef HAVE_MULTIDRIVE int mmc_drive = 0; @@ -968,7 +968,7 @@ int mmc_spinup_time(void) return 0; } -int mmc_read_sectors(IF_MD2(int mmc_drive,) unsigned long start, int count, void *buf) +int mmc_read_sectors(IF_MD(int mmc_drive,) unsigned long start, int count, void *buf) { #ifndef HAVE_MULTIDRIVE int mmc_drive = 0; @@ -976,7 +976,7 @@ int mmc_read_sectors(IF_MD2(int mmc_drive,) unsigned long start, int count, void return transfer_sectors(mmc_map[mmc_drive], start, count, buf, true); } -int mmc_write_sectors(IF_MD2(int mmc_drive,) unsigned long start, int count, const void* buf) +int mmc_write_sectors(IF_MD(int mmc_drive,) unsigned long start, int count, const void* buf) { #ifndef HAVE_MULTIDRIVE int mmc_drive = 0; diff --git a/firmware/target/arm/pp/ata-sd-pp.c b/firmware/target/arm/pp/ata-sd-pp.c index f83bb60566..bcf8a660c2 100644 --- a/firmware/target/arm/pp/ata-sd-pp.c +++ b/firmware/target/arm/pp/ata-sd-pp.c @@ -864,7 +864,7 @@ static void sd_select_device(int card_no) /* API Functions */ -int sd_read_sectors(IF_MD2(int drive,) unsigned long start, int incount, +int sd_read_sectors(IF_MD(int drive,) unsigned long start, int incount, void* inbuf) { #ifndef HAVE_MULTIDRIVE @@ -981,7 +981,7 @@ sd_read_error: } } -int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count, +int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* outbuf) { /* Write support is not finished yet */ diff --git a/firmware/target/arm/rk27xx/ata-nand-rk27xx.c b/firmware/target/arm/rk27xx/ata-nand-rk27xx.c index fc150ecf52..a32963b44d 100644 --- a/firmware/target/arm/rk27xx/ata-nand-rk27xx.c +++ b/firmware/target/arm/rk27xx/ata-nand-rk27xx.c @@ -35,14 +35,14 @@ static bool initialized = false; /* API Functions */ -int nand_read_sectors(IF_MD2(int drive,) unsigned long start, int incount, +int nand_read_sectors(IF_MD(int drive,) unsigned long start, int incount, void* inbuf) { (void)drive; return ftl_read(start, incount, inbuf); } -int nand_write_sectors(IF_MD2(int drive,) unsigned long start, int count, +int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* outbuf) { (void)drive; @@ -74,7 +74,7 @@ void nand_enable(bool on) (void)on; } -void nand_get_info(IF_MD2(int drive,) struct storage_info *info) +void nand_get_info(IF_MD(int drive,) struct storage_info *info) { (void)drive; uint32_t ppb = ftl_banks * (*ftl_nand_type).pagesperblock; diff --git a/firmware/target/arm/rk27xx/sd-rk27xx.c b/firmware/target/arm/rk27xx/sd-rk27xx.c index cb870c9e38..ef9845d696 100644 --- a/firmware/target/arm/rk27xx/sd-rk27xx.c +++ b/firmware/target/arm/rk27xx/sd-rk27xx.c @@ -495,7 +495,7 @@ static inline void write_sd_data(unsigned char **src) *src += 512; } -int sd_read_sectors(IF_MD2(int drive,) unsigned long start, int count, +int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf) { #ifdef HAVE_MULTIDRIVE @@ -618,7 +618,7 @@ int sd_read_sectors(IF_MD2(int drive,) unsigned long start, int count, } /* Not tested */ -int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count, +int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf) { #ifdef HAVE_MULTIDRIVE diff --git a/firmware/target/arm/s3c2440/sd-s3c2440.c b/firmware/target/arm/s3c2440/sd-s3c2440.c index 8695b65fa5..6658fa1515 100644 --- a/firmware/target/arm/s3c2440/sd-s3c2440.c +++ b/firmware/target/arm/s3c2440/sd-s3c2440.c @@ -847,7 +847,7 @@ sd_transfer_error: return ret; } -int sd_read_sectors(IF_MD2(int card_no,) unsigned long start, int incount, +int sd_read_sectors(IF_MD(int card_no,) unsigned long start, int incount, void* inbuf) { int ret; @@ -868,7 +868,7 @@ int sd_read_sectors(IF_MD2(int card_no,) unsigned long start, int incount, } /*****************************************************************************/ -int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count, +int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* outbuf) { #ifdef BOOTLOADER /* we don't need write support in bootloader */ diff --git a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c index a5dcb4b874..227f6b703b 100644 --- a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c +++ b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c @@ -33,13 +33,13 @@ static bool initialized = false; /* API Functions */ -int nand_read_sectors(IF_MD2(int drive,) unsigned long start, int incount, +int nand_read_sectors(IF_MD(int drive,) unsigned long start, int incount, void* inbuf) { return ftl_read(start, incount, inbuf); } -int nand_write_sectors(IF_MD2(int drive,) unsigned long start, int count, +int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* outbuf) { return ftl_write(start, count, outbuf); @@ -70,7 +70,7 @@ void nand_enable(bool on) (void)on; } -void nand_get_info(IF_MD2(int drive,) struct storage_info *info) +void nand_get_info(IF_MD(int drive,) struct storage_info *info) { uint32_t ppb = ftl_banks * (*ftl_nand_type).pagesperblock; (*info).sector_size = SECTOR_SIZE; diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c index dbf0ce9dd4..395c0f49e6 100644 --- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c +++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c @@ -962,7 +962,7 @@ int ata_soft_reset(void) return rc; } -int ata_read_sectors(IF_MD2(int drive,) unsigned long start, int incount, +int ata_read_sectors(IF_MD(int drive,) unsigned long start, int incount, void* inbuf) { mutex_lock(&ata_mutex); @@ -971,7 +971,7 @@ int ata_read_sectors(IF_MD2(int drive,) unsigned long start, int incount, return rc; } -int ata_write_sectors(IF_MD2(int drive,) unsigned long start, int count, +int ata_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* outbuf) { mutex_lock(&ata_mutex); @@ -1007,7 +1007,7 @@ void ata_spin(void) ata_set_active(); } -void ata_get_info(IF_MD2(int drive,) struct storage_info *info) +void ata_get_info(IF_MD(int drive,) struct storage_info *info) { (*info).sector_size = SECTOR_SIZE; #ifdef ATA_HAVE_BBT diff --git a/firmware/target/arm/tcc780x/sd-tcc780x.c b/firmware/target/arm/tcc780x/sd-tcc780x.c index 3b67d21958..55ae4e7c70 100644 --- a/firmware/target/arm/tcc780x/sd-tcc780x.c +++ b/firmware/target/arm/tcc780x/sd-tcc780x.c @@ -398,7 +398,7 @@ static void sd_select_device(int card_no) } } -int sd_read_sectors(IF_MD2(int card_no,) unsigned long start, int incount, +int sd_read_sectors(IF_MD(int card_no,) unsigned long start, int incount, void* inbuf) { #ifndef HAVE_MULTIDRIVE @@ -512,7 +512,7 @@ sd_read_error: } } -int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count, +int sd_write_sectors(IF_MD(int card_no,) unsigned long start, int count, const void* outbuf) { /* Write support is not finished yet */ diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c index 4ff39e2a9e..f13904628d 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c @@ -126,8 +126,8 @@ void GIO2(void) #define VFAT_SECTOR_SIZE(x) ( (x)/0x8000 ) /* 1GB array requires 80kB of RAM */ -extern int ata_read_sectors(IF_MD2(int drive,) unsigned long start, int count, void* buf); -extern int ata_write_sectors(IF_MD2(int drive,) unsigned long start, int count, const void* buf); +extern int ata_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf); +extern int ata_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf); struct main_header { @@ -396,14 +396,14 @@ static inline unsigned long map_sector(unsigned long sector) return cfs_start+sectors[sector/64]*64+sector%64; } -int ata_read_sectors(IF_MD2(int drive,) unsigned long start, int count, void* buf) +int ata_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf) { if(!cfs_inited) cfs_init(); /* Check if count is lesser than or equal to 1 native CFS sector */ if(count <= 64) - return _ata_read_sectors(IF_MD2(drive,) map_sector(start), count, buf); + return _ata_read_sectors(IF_MD(drive,) map_sector(start), count, buf); else { int i; @@ -412,7 +412,7 @@ int ata_read_sectors(IF_MD2(int drive,) unsigned long start, int count, void* bu /* Read sectors in parts of 0x8000 */ for(i=0; i= 64 ? 64 : count-i), (void*)dest); + int ret = _ata_read_sectors(IF_MD(drive,) map_sector(start+i), (count-i >= 64 ? 64 : count-i), (void*)dest); if(ret != 0) return ret; @@ -423,7 +423,7 @@ int ata_read_sectors(IF_MD2(int drive,) unsigned long start, int count, void* bu } } -int ata_write_sectors(IF_MD2(int drive,) unsigned long start, int count, const void* buf) +int ata_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf) { if(!cfs_inited) cfs_init(); @@ -431,7 +431,7 @@ int ata_write_sectors(IF_MD2(int drive,) unsigned long start, int count, const v #if 0 /* Disabled for now */ /* Check if count is lesser than or equal to 1 native CFS sector */ if(count <= 64) - return _ata_write_sectors(IF_MD2(drive,) map_sector(start), count, buf); + return _ata_write_sectors(IF_MD(drive,) map_sector(start), count, buf); else { int i, ret; @@ -440,7 +440,7 @@ int ata_write_sectors(IF_MD2(int drive,) unsigned long start, int count, const v /* Read sectors in parts of 0x8000 */ for(i=0; i= 64 ? 64 : count-i), (const void*)dest); + ret = _ata_write_sectors(IF_MD(drive,) map_sector(start+i), (count-i >= 64 ? 64 : count-i), (const void*)dest); if(ret != 0) return ret; diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h index 5b66d192a5..d0aa12e040 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h +++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h @@ -36,8 +36,8 @@ /* Nasty hack, but Creative is nasty... */ #define ata_read_sectors _ata_read_sectors #define ata_write_sectors _ata_write_sectors -extern int _ata_read_sectors(IF_MD2(int drive,) unsigned long start, int count, void* buf); -extern int _ata_write_sectors(IF_MD2(int drive,) unsigned long start, int count, const void* buf); +extern int _ata_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf); +extern int _ata_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf); /* General purpose memory region #1 */ #define ATA_IOBASE 0x50FEE000 diff --git a/firmware/target/arm/tms320dm320/sdmmc-dm320.c b/firmware/target/arm/tms320dm320/sdmmc-dm320.c index 2a7e1739eb..284061e1ad 100644 --- a/firmware/target/arm/tms320dm320/sdmmc-dm320.c +++ b/firmware/target/arm/tms320dm320/sdmmc-dm320.c @@ -849,7 +849,7 @@ sd_transfer_error: } } -int sd_read_sectors(IF_MD2(int card_no,) unsigned long start, int incount, +int sd_read_sectors(IF_MD(int card_no,) unsigned long start, int incount, void* inbuf) { #ifndef HAVE_MULTIDRIVE @@ -858,7 +858,7 @@ int sd_read_sectors(IF_MD2(int card_no,) unsigned long start, int incount, return sd_transfer_sectors(card_no, start, incount, inbuf, false); } -int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count, +int sd_write_sectors(IF_MD(int card_no,) unsigned long start, int count, const void* outbuf) { #ifndef BOOTLOADER -- cgit v1.2.3