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 /apps | |
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 'apps')
-rw-r--r-- | apps/debug_menu.c | 4 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 265d8988b5..bd8406cacb 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -1424,7 +1424,7 @@ static int disk_callback(int btn, struct gui_synclist *lists) | |||
1424 | simplelist_addline( | 1424 | simplelist_addline( |
1425 | "Size: %s", buf); | 1425 | "Size: %s", buf); |
1426 | unsigned long free; | 1426 | unsigned long free; |
1427 | fat_size( IF_MV2(0,) NULL, &free ); | 1427 | fat_size( IF_MV(0,) NULL, &free ); |
1428 | simplelist_addline( | 1428 | simplelist_addline( |
1429 | "Free: %ld MB", free / 1024); | 1429 | "Free: %ld MB", free / 1024); |
1430 | simplelist_addline( | 1430 | simplelist_addline( |
@@ -1543,7 +1543,7 @@ static int disk_callback(int btn, struct gui_synclist *lists) | |||
1543 | simplelist_addline( | 1543 | simplelist_addline( |
1544 | "Size: %ld MB", info.num_sectors*(info.sector_size/512)/2024); | 1544 | "Size: %ld MB", info.num_sectors*(info.sector_size/512)/2024); |
1545 | unsigned long free; | 1545 | unsigned long free; |
1546 | fat_size( IF_MV2(0,) NULL, &free ); | 1546 | fat_size( IF_MV(0,) NULL, &free ); |
1547 | simplelist_addline( | 1547 | simplelist_addline( |
1548 | "Free: %ld MB", free / 1024); | 1548 | "Free: %ld MB", free / 1024); |
1549 | simplelist_addline( | 1549 | simplelist_addline( |
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index f4b754364b..8445d67035 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -160,7 +160,7 @@ static const char* info_getname(int selected_item, void *data, | |||
160 | #endif | 160 | #endif |
161 | if (info->new_data) | 161 | if (info->new_data) |
162 | { | 162 | { |
163 | fat_size(IF_MV2(0,) &info->size, &info->free); | 163 | fat_size(IF_MV(0,) &info->size, &info->free); |
164 | #ifdef HAVE_MULTIVOLUME | 164 | #ifdef HAVE_MULTIVOLUME |
165 | if (fat_ismounted(1)) | 165 | if (fat_ismounted(1)) |
166 | fat_size(1, &info->size2, &info->free2); | 166 | fat_size(1, &info->size2, &info->free2); |