diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-11-20 16:38:54 +0000 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-11-20 16:38:54 +0000 |
commit | 75dc601738d6c940455de5948cb33e6098b3fa72 (patch) | |
tree | 9e828fae35843e9eb61d0e26f55d14962b343c98 /firmware/target/arm/imx233/sdmmc-imx233.c | |
parent | 262479173b5f2053f977232794d3c5f3243302ad (diff) | |
download | rockbox-75dc601738d6c940455de5948cb33e6098b3fa72.tar.gz 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.c | 20 |
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) | |||
853 | return _sd_num_drives; | 853 | return _sd_num_drives; |
854 | } | 854 | } |
855 | 855 | ||
856 | bool sd_present(IF_MV_NONVOID(int sd_drive)) | 856 | bool sd_present(int sd_drive) |
857 | { | 857 | { |
858 | #ifndef HAVE_MULTIVOLUME | ||
859 | int sd_drive = 0; | ||
860 | #endif | ||
861 | return sdmmc_present(sd_map[sd_drive]); | 858 | return sdmmc_present(sd_map[sd_drive]); |
862 | } | 859 | } |
863 | 860 | ||
864 | bool sd_removable(IF_MV_NONVOID(int sd_drive)) | 861 | bool sd_removable(int sd_drive) |
865 | { | 862 | { |
866 | #ifndef HAVE_MULTIVOLUME | ||
867 | int sd_drive = 0; | ||
868 | #endif | ||
869 | return sdmmc_removable(sd_map[sd_drive]); | 863 | return sdmmc_removable(sd_map[sd_drive]); |
870 | } | 864 | } |
871 | 865 | ||
@@ -934,19 +928,13 @@ int mmc_num_drives(int first_drive) | |||
934 | return _mmc_num_drives; | 928 | return _mmc_num_drives; |
935 | } | 929 | } |
936 | 930 | ||
937 | bool mmc_present(IF_MV_NONVOID(int mmc_drive)) | 931 | bool mmc_present(int mmc_drive) |
938 | { | 932 | { |
939 | #ifndef HAVE_MULTIVOLUME | ||
940 | int mmc_drive = 0; | ||
941 | #endif | ||
942 | return sdmmc_present(mmc_map[mmc_drive]); | 933 | return sdmmc_present(mmc_map[mmc_drive]); |
943 | } | 934 | } |
944 | 935 | ||
945 | bool mmc_removable(IF_MV_NONVOID(int mmc_drive)) | 936 | bool mmc_removable(int mmc_drive) |
946 | { | 937 | { |
947 | #ifndef HAVE_MULTIVOLUME | ||
948 | int mmc_drive = 0; | ||
949 | #endif | ||
950 | return sdmmc_removable(mmc_map[mmc_drive]); | 938 | return sdmmc_removable(mmc_map[mmc_drive]); |
951 | } | 939 | } |
952 | 940 | ||