summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/imx233/sdmmc-imx233.c
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2013-11-20 16:38:54 +0000
committerAmaury Pouly <amaury.pouly@gmail.com>2013-11-20 16:38:54 +0000
commit75dc601738d6c940455de5948cb33e6098b3fa72 (patch)
tree9e828fae35843e9eb61d0e26f55d14962b343c98 /firmware/target/arm/imx233/sdmmc-imx233.c
parent262479173b5f2053f977232794d3c5f3243302ad (diff)
downloadrockbox-75dc601738d6c940455de5948cb33e6098b3fa72.tar.gz
rockbox-75dc601738d6c940455de5948cb33e6098b3fa72.tar.bz2
rockbox-75dc601738d6c940455de5948cb33e6098b3fa72.zip
imx233/sdmmc: {sd,mmc}_{present,removable} don't depend on multivolume
Change-Id: Id35fbdbc62b804e9a67c6d1f18b19a1d2051bb78
Diffstat (limited to 'firmware/target/arm/imx233/sdmmc-imx233.c')
-rw-r--r--firmware/target/arm/imx233/sdmmc-imx233.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c
index 24bf69e332..a435b149f2 100644
--- a/firmware/target/arm/imx233/sdmmc-imx233.c
+++ b/firmware/target/arm/imx233/sdmmc-imx233.c
@@ -853,19 +853,13 @@ int sd_num_drives(int first_drive)
return _sd_num_drives;
}
-bool sd_present(IF_MV_NONVOID(int sd_drive))
+bool sd_present(int sd_drive)
{
-#ifndef HAVE_MULTIVOLUME
- int sd_drive = 0;
-#endif
return sdmmc_present(sd_map[sd_drive]);
}
-bool sd_removable(IF_MV_NONVOID(int sd_drive))
+bool sd_removable(int sd_drive)
{
-#ifndef HAVE_MULTIVOLUME
- int sd_drive = 0;
-#endif
return sdmmc_removable(sd_map[sd_drive]);
}
@@ -934,19 +928,13 @@ int mmc_num_drives(int first_drive)
return _mmc_num_drives;
}
-bool mmc_present(IF_MV_NONVOID(int mmc_drive))
+bool mmc_present(int mmc_drive)
{
-#ifndef HAVE_MULTIVOLUME
- int mmc_drive = 0;
-#endif
return sdmmc_present(mmc_map[mmc_drive]);
}
-bool mmc_removable(IF_MV_NONVOID(int mmc_drive))
+bool mmc_removable(int mmc_drive)
{
-#ifndef HAVE_MULTIVOLUME
- int mmc_drive = 0;
-#endif
return sdmmc_removable(mmc_map[mmc_drive]);
}