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, 4 insertions, 4 deletions

diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c
index 7538788bd6..690ef39f5f 100644
--- a/uisimulator/common/io.c
+++ b/uisimulator/common/io.c
@@ -57,7 +57,7 @@
 #include "thread.h"
 #include "kernel.h"
 #include "debug.h"
-#include "ata.h" /* for IF_MV2 et al. */
+#include "ata.h" /* for IF_MV et al. */
 #include "rbpaths.h"
 #include "load_code.h"
 
@@ -534,7 +534,7 @@ long filesize(int fd)
 #endif
 }
 
-void fat_size(IF_MV2(int volume,) unsigned long* size, unsigned long* free)
+void fat_size(IF_MV(int volume,) unsigned long* size, unsigned long* free)
 {
 #ifdef HAVE_MULTIVOLUME
     if (volume != 0) {
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index 51706ca3d5..6ad0b986f3 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -169,7 +169,7 @@ int storage_init(void)
     return 1;
 }
 
-int storage_write_sectors(IF_MV2(int drive,)
+int storage_write_sectors(IF_MV(int drive,)
                       unsigned long start,
                       int count,
                       const void* buf)
@@ -197,7 +197,7 @@ int storage_write_sectors(IF_MV2(int drive,)
     return 0;
 }
 
-int storage_read_sectors(IF_MV2(int drive,)
+int storage_read_sectors(IF_MV(int drive,)
                      unsigned long start,
                      int count,
                      void* buf)