aboutsummaryrefslogtreecommitdiffstats
path: root/os/various/fatfs_bindings/fatfs_devices.h
diff options
context:
space:
mode:
authorDiego Ismirlian <dismirlian@gmail.com>2019-08-24 17:45:41 -0300
committerDiego Ismirlian <dismirlian@gmail.com>2019-08-24 17:45:41 -0300
commit7b2c61a676e024163057ec5ccc508a29ab3b9ed4 (patch)
tree5d1f5423a4e720d657681794ac81dc2a2004cbb0 /os/various/fatfs_bindings/fatfs_devices.h
parent81391097156ce2c9fc71c3350457522841e10095 (diff)
parente346e779339636f578536785014609e46866fb9c (diff)
downloadChibiOS-Contrib-7b2c61a676e024163057ec5ccc508a29ab3b9ed4.tar.gz
ChibiOS-Contrib-7b2c61a676e024163057ec5ccc508a29ab3b9ed4.tar.bz2
ChibiOS-Contrib-7b2c61a676e024163057ec5ccc508a29ab3b9ed4.zip
Merge branch 'master' of https://github.com/ChibiOS/ChibiOS-Contrib
Diffstat (limited to 'os/various/fatfs_bindings/fatfs_devices.h')
-rw-r--r--os/various/fatfs_bindings/fatfs_devices.h30
1 files changed, 6 insertions, 24 deletions
diff --git a/os/various/fatfs_bindings/fatfs_devices.h b/os/various/fatfs_bindings/fatfs_devices.h
index 5ec05ca..fe28383 100644
--- a/os/various/fatfs_bindings/fatfs_devices.h
+++ b/os/various/fatfs_bindings/fatfs_devices.h
@@ -20,39 +20,21 @@
#include "hal.h"
-#if HAL_USE_MMC_SPI && HAL_USE_SDC
-#error "cannot specify both MMC_SPI and SDC drivers"
-#endif
-
-#if HAL_USE_MMC_SPI
-extern MMCDriver MMCD1;
-#elif HAL_USE_SDC
-extern SDCDriver SDCD1;
-#elif HAL_USBH_USE_MSD
-
-#else
-#error "MMC_SPI, SDC or USBH_MSD driver must be specified"
-#endif
-
/*-----------------------------------------------------------------------*/
/* Correspondence between physical drive number and physical drive. */
-#if HAL_USE_MMC_SPI
+#if HAL_USE_MMC_SPI || HAL_USE_SDC
#define FATFSDEV_MMC 0
#define FATFSDEV_MMC_DRIVE "0:"
#endif
-#if HAL_USE_SDC
-#define FATFSDEV_SDC 0
-#define FATFSDEV_SDC_DRIVE "0:"
-#endif
#if HAL_USBH_USE_MSD
-#if defined(FATFSDEV_MMC) || defined(FATFSDEV_SDC)
-#define FATFSDEV_MSDLUN0 1
-#define FATFSDEV_MSDLUN0_DRIVE "1:"
+#if defined(FATFSDEV_MMC)
+#define FATFSDEV_MSD 1
+#define FATFSDEV_MSD_DRIVE "1:"
#else
-#define FATFSDEV_MSDLUN0 0
-#define FATFSDEV_MSDLUN0_DRIVE "0:"
+#define FATFSDEV_MSD 0
+#define FATFSDEV_MSD_DRIVE "0:"
#endif
#endif