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

Cleanup MV/MD macros a little.

Browse source 
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
This commit is contained in:
Michael Sevakis 2013-08-17 12:18:22 -04:00
parent c13f21a4d5
commit a56f1ca1ed
44 changed files with 219 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

10
firmware/common/dircache.c
View file

@ -303,7 +303,7 @@ static int sab_process_dir(unsigned long startcluster, struct dircache_entry *ce
sab.dir->entrycount = 0;
sab.dir->file.firstcluster = 0;
/* open directory */
int rc = fat_opendir(IF_MV2(sab.volume,) sab.dir, startcluster, sab.dir);
int rc = fat_opendir(IF_MV(sab.volume,) sab.dir, startcluster, sab.dir);
if(rc < 0)
{
logf("fat_opendir failed: %d", rc);
@ -381,7 +381,7 @@ static int sab_process_dir(unsigned long startcluster, struct dircache_entry *ce
/* used during the generation */
static struct fat_dir sab_fat_dir;
static int dircache_scan_and_build(IF_MV2(int volume,) struct dircache_entry *ce)
static int dircache_scan_and_build(IF_MV(int volume,) struct dircache_entry *ce)
{
memset(ce, 0, sizeof(struct dircache_entry));
@ -493,7 +493,7 @@ static int sab_process_dir(struct dircache_entry *ce)
return 0;
}
static int dircache_scan_and_build(IF_MV2(int volume,) struct dircache_entry *ce)
static int dircache_scan_and_build(IF_MV(int volume,) struct dircache_entry *ce)
{
#ifdef HAVE_MULTIVOLUME
(void) volume;
@ -786,9 +786,9 @@ static int dircache_do_rebuild(void)
#endif
cpu_boost(true);
#ifdef HAVE_MULTIVOLUME
if (dircache_scan_and_build(IF_MV2(i,) append_position) < 0)
if (dircache_scan_and_build(IF_MV(i,) append_position) < 0)
#else
if (dircache_scan_and_build(IF_MV2(0,) root_entry) < 0)
if (dircache_scan_and_build(IF_MV(0,) root_entry) < 0)
#endif /* HAVE_MULTIVOLUME */
{
logf("dircache_scan_and_build failed");