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

2 files changed, 3 insertions, 3 deletions

diff --git a/firmware/test/fat/main.c b/firmware/test/fat/main.c
index 756f326bb3..96a95a8b2a 100644
--- a/firmware/test/fat/main.c
+++ b/firmware/test/fat/main.c
@@ -697,7 +697,7 @@ int main(int argc, char *argv[])
 #endif
         ) {
             DEBUGF("*** Mounting at block %ld\n",pinfo[i].start);
-            rc = fat_mount(IF_MV2(0,) IF_MD2(0,) pinfo[i].start);
+            rc = fat_mount(IF_MV(0,) IF_MD(0,) pinfo[i].start);
             if(rc) {
                 DEBUGF("mount: %d",rc);
                 return -1;
@@ -706,7 +706,7 @@ int main(int argc, char *argv[])
         }
     }
     if ( i==4 ) {
-        if(fat_mount(IF_MV2(0,) IF_MD2(0,) 0)) {
+        if(fat_mount(IF_MV(0,) IF_MD(0,) 0)) {
             DEBUGF("No FAT32 partition!");
             return -1;
         }
diff --git a/firmware/test/i2c/main.c b/firmware/test/i2c/main.c
index ad684829fb..990369eae8 100644
--- a/firmware/test/i2c/main.c
+++ b/firmware/test/i2c/main.c
@@ -642,7 +642,7 @@ int main(void)
 
     
 
-    i = fat_mount(IF_MV2(0,) IF_MD2(0,) part[0].start);
+    i = fat_mount(IF_MV(0,) IF_MD(0,) part[0].start);
 
     debugf("fat_mount() returned %d\n", i);