Add SDCARD SDIO/SPI support; modify USB/MSC locking

Author: GrumpyOldPizza

boards.txt

@@ -1,4 +1,5 @@
 menu.usb=USB Type
+menu.dosfs=DOSFS
 menu.speed=CPU Speed
 menu.opt=Optimize
 
@@ -30,7 +31,7 @@ Dragonfly-L476RE.build.usb_manufacturer=u"\u0324Tlera Corporation"
 Dragonfly-L476RE.build.usb_product=u"\u0314Dragonfly"
 Dragonfly-L476RE.build.vid=0x1209
 Dragonfly-L476RE.build.pid=0x6667
-Dragonfly-L476RE.build.extra_flags=-DSTM32L476xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant {build.usb_flags}
+Dragonfly-L476RE.build.extra_flags=-DSTM32L476xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant {build.usb_flags} {build.dosfs_flags}
 Dragonfly-L476RE.build.ldscript=linker_scripts/STM32L476RE_FLASH.ld
 Dragonfly-L476RE.build.openocdscript=openocd_scripts/stm32l476re_dragonfly.cfg
 Dragonfly-L476RE.build.variant=STM32L476RE-Dragonfly
@@ -44,6 +45,22 @@ Dragonfly-L476RE.menu.usb.cdc_msc.build.usb_type=USB_TYPE_CDC_MSC
 Dragonfly-L476RE.menu.usb.none=No USB
 Dragonfly-L476RE.menu.usb.none.build.usb_type=USB_TYPE_NONE
 
+Dragonfly-L476RE.menu.dosfs.sflash=SFLASH (QSPI)
+Dragonfly-L476RE.menu.dosfs.sflash.build.dosfs_sdcard=0
+Dragonfly-L476RE.menu.dosfs.sflash.build.dosfs_sflash=2
+Dragonfly-L476RE.menu.dosfs.sdspi=SDCARD (SPI)
+Dragonfly-L476RE.menu.dosfs.sdspi.build.dosfs_sdcard=1
+Dragonfly-L476RE.menu.dosfs.sdspi.build.dosfs_sflash=0
+Dragonfly-L476RE.menu.dosfs.sdmmc=SDCARD (SDIO Default Speed)
+Dragonfly-L476RE.menu.dosfs.sdmmc.build.dosfs_sdcard=2
+Dragonfly-L476RE.menu.dosfs.sdmmc.build.dosfs_sflash=0
+Dragonfly-L476RE.menu.dosfs.sdmmc1=SDCARD (SDIO High Speed)
+Dragonfly-L476RE.menu.dosfs.sdmmc1.build.dosfs_sdcard=3
+Dragonfly-L476RE.menu.dosfs.sdmmc1.build.dosfs_sflash=0
+Dragonfly-L476RE.menu.dosfs.none=None
+Dragonfly-L476RE.menu.dosfs.none.build.dosfs_sdcard=0
+Dragonfly-L476RE.menu.dosfs.none.build.dosfs_sflash=0
+
 Dragonfly-L476RE.menu.speed.80=80 MHz
 Dragonfly-L476RE.menu.speed.80.build.f_cpu=80000000L
 Dragonfly-L476RE.menu.speed.72=72 MHz
@@ -106,7 +123,7 @@ Butterfly-L433CC.build.usb_manufacturer=u"\u0324Tlera Corporation"
 Butterfly-L433CC.build.usb_product=u"\u0314Butterfly"
 Butterfly-L433CC.build.vid=0x1209
 Butterfly-L433CC.build.pid=0x6668
-Butterfly-L433CC.build.extra_flags=-DSTM32L433xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant {build.usb_flags}
+Butterfly-L433CC.build.extra_flags=-DSTM32L433xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant {build.usb_flags} {build.dosfs_flags}
 Butterfly-L433CC.build.ldscript=linker_scripts/STM32L433CC_FLASH.ld
 Butterfly-L433CC.build.openocdscript=openocd_scripts/stm32l433cc_butterfly.cfg
 Butterfly-L433CC.build.variant=STM32L433CC-Butterfly
@@ -120,6 +137,13 @@ Butterfly-L433CC.menu.usb.cdc_msc.build.usb_type=USB_TYPE_CDC_MSC
 Butterfly-L433CC.menu.usb.none=No USB
 Butterfly-L433CC.menu.usb.none.build.usb_type=USB_TYPE_NONE
 
+Butterfly-L433CC.menu.dosfs.none=None
+Butterfly-L433CC.menu.dosfs.none.build.dosfs_sdcard=0
+Butterfly-L433CC.menu.dosfs.none.build.dosfs_sflash=0
+Butterfly-L433CC.menu.dosfs.sdspi=SDCARD (SPI)
+Butterfly-L433CC.menu.dosfs.sdspi.build.dosfs_sdcard=1
+Butterfly-L433CC.menu.dosfs.sdspi.build.dosfs_sflash=0
+
 Butterfly-L433CC.menu.speed.80=80 MHz
 Butterfly-L433CC.menu.speed.80.build.f_cpu=80000000L
 Butterfly-L433CC.menu.speed.72=72 MHz
@@ -182,7 +206,7 @@ Ladybug-L432KC.build.usb_manufacturer=u"\u0324Tlera Corporation"
 Ladybug-L432KC.build.usb_product=u"\u0310Ladybug"
 Ladybug-L432KC.build.vid=0x1209
 Ladybug-L432KC.build.pid=0x6669
-Ladybug-L432KC.build.extra_flags=-DSTM32L432xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant {build.usb_flags}
+Ladybug-L432KC.build.extra_flags=-DSTM32L432xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant {build.usb_flags} {build.dosfs_flags}
 Ladybug-L432KC.build.ldscript=linker_scripts/STM32L432KC_FLASH.ld
 Ladybug-L432KC.build.openocdscript=openocd_scripts/stm32l432kc_ladybug.cfg
 Ladybug-L432KC.build.variant=STM32L432KC-Ladybug
@@ -196,6 +220,13 @@ Ladybug-L432KC.menu.usb.cdc_msc.build.usb_type=USB_TYPE_CDC_MSC
 Ladybug-L432KC.menu.usb.none=No USB
 Ladybug-L432KC.menu.usb.none.build.usb_type=USB_TYPE_NONE
 
+Ladybug-L432KC.menu.dosfs.none=None
+Ladybug-L432KC.menu.dosfs.none.build.dosfs_sdcard=0
+Ladybug-L432KC.menu.dosfs.none.build.dosfs_sflash=0
+Ladybug-L432KC.menu.dosfs.sdspi=SDCARD (SPI)
+Ladybug-L432KC.menu.dosfs.sdspi.build.dosfs_sdcard=1
+Ladybug-L432KC.menu.dosfs.sdspi.build.dosfs_sflash=0
+
 Ladybug-L432KC.menu.speed.80=80 MHz
 Ladybug-L432KC.menu.speed.80.build.f_cpu=80000000L
 Ladybug-L432KC.menu.speed.72=72 MHz
@@ -251,7 +282,7 @@ NUCLEO-L432KC.build.f_cpu=80000000L
 NUCLEO-L432KC.build.board=NUCLEO-L432KC
 NUCLEO-L432KC.build.arch=STM32L4
 NUCLEO-L432KC.build.core=stm32l4
-NUCLEO-L432KC.build.extra_flags=-DSTM32L432xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant
+NUCLEO-L432KC.build.extra_flags=-DSTM32L432xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant {build.dosfs_flags}
 NUCLEO-L432KC.build.ldscript=linker_scripts/STM32L432KC_FLASH.ld
 NUCLEO-L432KC.build.openocdscript=openocd_scripts/stm32l432kc_nucleo.cfg
 NUCLEO-L432KC.build.variant=STM32L432KC-NUCLEO
@@ -320,6 +351,19 @@ NUCLEO-L476RG.build.variant=STM32L476RG-NUCLEO
 NUCLEO-L476RG.build.variant_system_libs="-L{runtime.platform.path}/system/STM32L4xx/Lib" "-L{runtime.platform.path}/system/CMSIS/Lib" -lstm32l476 -larm_cortexM4lf_math
 NUCLEO-L476RG.build.variant_system_include="-I{runtime.platform.path}/system/CMSIS/Include" "-I{runtime.platform.path}/system/CMSIS/Device/ST/STM32L4xx/Include" "-I{runtime.platform.path}/system/STM32L4xx/Include" 
 
+NUCLEO-L476RG.menu.dosfs.none=None
+NUCLEO-L476RG.menu.dosfs.none.build.dosfs_sdcard=0
+NUCLEO-L476RG.menu.dosfs.none.build.dosfs_sflash=0
+NUCLEO-L476RG.menu.dosfs.sdspi=SDCARD (SPI)
+NUCLEO-L476RG.menu.dosfs.sdspi.build.dosfs_sdcard=1
+NUCLEO-L476RG.menu.dosfs.sdspi.build.dosfs_sflash=0
+NUCLEO-L476RG.menu.dosfs.sdmmc=SDCARD (SDIO Default Speed)
+NUCLEO-L476RG.menu.dosfs.sdmmc.build.dosfs_sdcard=2
+NUCLEO-L476RG.menu.dosfs.sdmmc.build.dosfs_sflash=0
+NUCLEO-L476RG.menu.dosfs.sdmmc1=SDCARD (SDIO High Speed)
+NUCLEO-L476RG.menu.dosfs.sdmmc1.build.dosfs_sdcard=3
+NUCLEO-L476RG.menu.dosfs.sdmmc1.build.dosfs_sflash=0
+
 NUCLEO-L476RG.menu.speed.80=80 MHz
 NUCLEO-L476RG.menu.speed.80.build.f_cpu=80000000L
 NUCLEO-L476RG.menu.speed.72=72 MHz

cores/stm32l4/FS.cpp

@@ -177,6 +177,16 @@ FS::FS() {
 }
 
 bool FS::begin()
+{
+    return (f_initvolume() == F_NO_ERROR);
+}
+
+void FS::end()
+{
+    f_delvolume();
+}
+
+bool FS::check()
 {
     return (f_checkvolume() == F_NO_ERROR);
 }

cores/stm32l4/FS.h

@@ -93,7 +93,9 @@ class FS
     FS();
 
     bool begin();
+    void end();
 
+    bool check();
     bool format();
     bool info(FSInfo& info);
 

cores/stm32l4/stm32l4_wiring.c

@@ -81,14 +81,16 @@ void init( void )
     stm32l4_exti_create(&stm32l4_exti, STM32L4_EXTI_IRQ_PRIORITY);
     stm32l4_exti_enable(&stm32l4_exti);
 
-#if defined(STM32L4_CONFIG_DOSFS_SDCARD)
-    f_initvolume(&dosfs_sdcard_init, 0);
-    f_checkvolume();
-#endif /* STM32L4_CONFIG_DOSFS_SDCARD */
-#if defined(STM32L4_CONFIG_DOSFS_SFLASH)
-    f_initvolume(&dosfs_sflash_init, 0);
-    f_checkvolume();
-#endif /* STM32L4_CONFIG_DOSFS_SFLASH */
+#if (DOSFS_SDCARD == 1)
+    stm32l4_sdspi_initialize();
+#elif (DOSFS_SDCARD == 2)
+    stm32l4_sdmmc_initialize(0);
+#elif (DOSFS_SDCARD == 3)
+    stm32l4_sdmmc_initialize(STM32L4_SDMMC_OPTION_HIGH_SPEED);
+#endif
+#if (DOSFS_SFLASH >= 1)
+    dosfs_sflash_init();
+#endif
 
     /* This is here to work around a linker issue in avr/fdevopen.c */
     asm(".global stm32l4_stdio_put");

cores/stm32l4/stm32l4_wiring_private.h

@@ -49,6 +49,8 @@ extern "C" {
 #include "stm32l4_rtc.h"
 #include "stm32l4_sai.h"
 #include "stm32l4_flash.h"
+#include "stm32l4_sdmmc.h"
+#include "stm32l4_sdspi.h"
 
 #define STM32L4_SVCALL_IRQ_PRIORITY  15
 #define STM32L4_PENDSV_IRQ_PRIORITY  15
@@ -99,10 +101,10 @@ extern bool USBD_Suspended(void);
  * DMA_CHANNEL_DMA2_CH1_SPI3_RX
  * DMA_CHANNEL_DMA2_CH2_SPI3_TX
  * DMA_CHANNEL_DMA2_CH3_SPI1_RX
- * DMA_CHANNEL_DMA2_CH4_SPI1_TX / DMA_CHANNEL_DMA2_CH4_SDMMC
+ * DMA_CHANNEL_DMA2_CH4_SPI1_TX
  * DMA_CHANNEL_DMA2_CH5_UART4_RX
- * DMA_CHANNEL_DMA2_CH6_SAI1_A
- * DMA_CHANNEL_DMA2_CH7_QUADSPI
+ * DMA_CHANNEL_DMA2_CH6_SAI1_A (-)
+ * DMA_CHANNEL_DMA2_CH7_QUADSPI (-)
  *
  * (SDMMC shares PC10/PC11/PC12 with SPI3, hence is SDMMC is in use,
  * then PB3/PB4/PB5 switch from SPI1 to SPI3 to avoid DMA conflicts)

platform.txt

@@ -68,6 +68,10 @@ compiler.elf2hex.extra_flags=
 # ---------
 build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' '-DUSB_TYPE={build.usb_type}'
 
+# DOSFS Flags
+# ---------
+build.dosfs_flags='-DDOSFS_SDCARD={build.dosfs_sdcard}' '-DDOSFS_SFLASH={build.dosfs_sflash}'
+
 # Compile patterns
 # ----------------
 

system/STM32L4xx/Include/dosfs_api.h

@@ -121,10 +121,6 @@
 #define F_CLUSTER_LAST               ((unsigned long)0x0ffffff8)
 #define F_CLUSTER_LASTF32R           ((unsigned long)0x0fffffff)
 
-typedef struct _dosfs_interface_t    F_INTERFACE;
-
-typedef int (*F_DRIVERINIT)(uint32_t param, const F_INTERFACE **p_interface_return, void **p_context_return);
-
 typedef struct _dosfs_file_t         F_FILE;
 
 typedef struct {
@@ -169,7 +165,7 @@ typedef struct {
     unsigned int   bad_high;
 } F_SPACE;
 
-extern int     f_initvolume(F_DRIVERINIT initfunc, unsigned long param);
+extern int     f_initvolume(void);
 extern int     f_delvolume(void);
 extern int     f_checkvolume(void);
 extern int     f_format(int fattype);
@@ -212,10 +208,6 @@ extern int     f_getc(F_FILE *file);
 extern int     f_seteof(F_FILE *file);
 extern F_FILE *f_truncate(const char *filename, long length);
 
-
-extern int dosfs_sflash_init(uint32_t param, const F_INTERFACE **p_interface, void **p_context);
-extern int dosfs_sdcard_init(uint32_t param, const F_INTERFACE **p_interface, void **p_context);
-
 #ifdef __cplusplus
 }
 #endif

system/STM32L4xx/Include/dosfs_config.h

@@ -54,8 +54,8 @@
 
 #define DOSFS_CONFIG_SDCARD_HIGH_SPEED          0
 #define DOSFS_CONFIG_SDCARD_CRC                 1
-#define DOSFS_CONFIG_SDCARD_COMMAND_RETRIES     3
-#define DOSFS_CONFIG_SDCARD_DATA_RETRIES        3
+#define DOSFS_CONFIG_SDCARD_COMMAND_RETRIES     4
+#define DOSFS_CONFIG_SDCARD_DATA_RETRIES        4
 #define DOSFS_CONFIG_SDCARD_SIMULATE            0
 #define DOSFS_CONFIG_SDCARD_SIMULATE_BLKCNT     (unsigned long)(65536 * 64)
 #define DOSFS_CONFIG_SDCARD_SIMULATE_TRACE      0

system/STM32L4xx/Include/dosfs_core.h

@@ -29,7 +29,7 @@
 #if !defined(_DOSFS_CORE_H)
 #define _DOSFS_CORE_H
 
-#include "dosfs_driver.h"
+#include "dosfs_device.h"
 
 #ifdef __cplusplus
  extern "C" {
@@ -324,7 +324,6 @@ struct _dosfs_cache_entry_t {
 #define DOSFS_FILE_MODE_APPEND               0x04
 #define DOSFS_FILE_MODE_CREATE               0x08
 #define DOSFS_FILE_MODE_TRUNCATE             0x10
-#define DOSFS_FILE_MODE_COMMIT               0x20
 #define DOSFS_FILE_MODE_SEQUENTIAL           0x40
 #define DOSFS_FILE_MODE_RANDOM               0x80
 
@@ -403,23 +402,10 @@ struct _dosfs_cluster_entry_t {
 #endif /* (DOSFS_CONFIG_VOLUME_DIRTY_SUPPORTED == 1) */
 #define DOSFS_VOLUME_FLAG_WRITE_PROTECTED    0x0100
 
-#define DOSFS_VOLUME_LOCK_FILE_LOCK          0x0000ffff
-#define DOSFS_VOLUME_LOCK_FIND_LOCK          0x00010000
-#define DOSFS_VOLUME_LOCK_API_LOCK           0x00020000
-#define DOSFS_VOLUME_LOCK_DEVICE_LEASE       0x00400000
-#define DOSFS_VOLUME_LOCK_DEVICE_MODIFIED    0x00800000
-#define DOSFS_VOLUME_LOCK_WRITE_LOCK         0x01000000
-#define DOSFS_VOLUME_LOCK_SCSI_LOCK          0x02000000
-#define DOSFS_VOLUME_LOCK_HOST_ACCESSED      0x10000000
-#define DOSFS_VOLUME_LOCK_HOST_LEASE         0x20000000
-#define DOSFS_VOLUME_LOCK_HOST_MODIFIED      0x40000000
-
 struct _dosfs_volume_t {
     uint8_t                 state;
     uint8_t                 type;
     uint16_t                flags;
-    volatile uint32_t       lock;
-    volatile uint32_t       lease;
     uint32_t                product;                      /* product serial number */
     uint32_t                serial;                       /* volume serial number */
     uint32_t                boot_blkno;
@@ -464,7 +450,8 @@ struct _dosfs_volume_t {
 
     uint32_t                cwd_clsno;                /* put this first of the work area to align the rest */
 #if (DOSFS_CONFIG_SEQUENTIAL_SUPPORTED == 1) || (DOSFS_CONFIG_CONTIGUOUS_SUPPORTED == 1)
-    uint32_t                blk_unit_size;            /* size to align a clsno to an AU */
+    uint32_t                au_size;
+    uint32_t                erase_size;
     uint32_t                start_clsno;              /* first valid cluster for sequential/contiguous allocation */
     uint32_t                end_clsno;                /* last valid cluster for sequential/contiguous allocation */
 #if (DOSFS_CONFIG_SEQUENTIAL_SUPPORTED == 1)
@@ -533,8 +520,6 @@ struct _dosfs_volume_t {
     /* WORK AREA ABOVE */
 
     uint8_t                 media;
-    const F_INTERFACE       *interface;
-    void                    *context;
     dosfs_file_t            file_table[DOSFS_CONFIG_MAX_FILES];
 
 #if (DOSFS_CONFIG_STATISTICS == 1)
@@ -594,10 +579,11 @@ extern dosfs_volume_t dosfs_volume;
 #define DOSFS_INDEX_TO_BLKOFS(_index)      (((_index) << DOSFS_DIR_SHIFT) & DOSFS_BLK_MASK)
 
 
-#define DOSFS_DEFAULT_VOLUME()    (&dosfs_volume)
-#define DOSFS_PATH_VOLUME(_path)  (&dosfs_volume)
-#define DOSFS_FIND_VOLUME(_find)  (&dosfs_volume)
-#define DOSFS_FILE_VOLUME(_file)  (&dosfs_volume)
+#define DOSFS_DEFAULT_VOLUME()       (&dosfs_volume)
+#define DOSFS_PATH_VOLUME(_path)     (&dosfs_volume)
+#define DOSFS_FIND_VOLUME(_find)     (&dosfs_volume)
+#define DOSFS_FILE_VOLUME(_file)     (&dosfs_volume)
+#define DOSFS_VOLUME_DEVICE(_volume) (&dosfs_device)
 
 #if (DOSFS_CONFIG_STATISTICS == 1)
 

system/STM32L4xx/Include/dosfs_driver.h renamed to system/STM32L4xx/Include/dosfs_device.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Thomas Roell.  All rights reserved.
+ * Copyright (c) 2014-2017 Thomas Roell.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -26,8 +26,8 @@
  * WITH THE SOFTWARE.
  */
 
-#if !defined(_DOSFS_DRIVER_H)
-#define _DOSFS_DRIVER_H
+#if !defined(_DOSFS_DEVICE_H)
+#define _DOSFS_DEVICE_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -39,7 +39,7 @@
  extern "C" {
 #endif
 
-typedef struct _dosfs_driver_t dosfs_driver_t;
+typedef struct _dosfs_device_t dosfs_device_t;
 
 #define DOSFS_BLK_SIZE       512
 #define DOSFS_BLK_MASK       511
@@ -50,19 +50,38 @@ typedef struct _dosfs_driver_t dosfs_driver_t;
 #define DOSFS_MEDIA_SDSC     2
 #define DOSFS_MEDIA_SDHC     3
 
-typedef struct _dosfs_interface_t {
+typedef struct _dosfs_device_interface_t {
     int                     (*release)(void *context);
     int                     (*info)(void *context, uint8_t *p_type, uint8_t *p_write_protected, uint32_t *p_block_count, uint32_t *p_au_size, uint32_t *p_serial);
     int                     (*format)(void *context);
     int                     (*erase)(void *context, uint32_t address, uint32_t length);
     int                     (*discard)(void *context, uint32_t address, uint32_t length);
-    int                     (*read)(void *context, uint32_t address, uint32_t length, uint8_t *data);
-    int                     (*write)(void *context, uint32_t address, uint32_t length, const uint8_t *data, volatile uint8_t *p_status);
-    int                     (*sync)(void *context);
-} dosfs_interface_t;
+    int                     (*read)(void *context, uint32_t address, uint8_t *data, uint32_t length, bool prefetch);
+    int                     (*write)(void *context, uint32_t address, const uint8_t *data, uint32_t length, volatile uint8_t *p_status);
+    int                     (*sync)(void *context, bool wait);
+} dosfs_device_interface_t;
+
+#define DOSFS_DEVICE_LOCK_INIT               0x00000001 /* device lock during init */
+#define DOSFS_DEVICE_LOCK_SFLASH             0x00000002 /* SFLASH interface lock */
+#define DOSFS_DEVICE_LOCK_VOLUME             0x00000004 /* DOSFS file system lock */
+#define DOSFS_DEVICE_LOCK_SCSI               0x00000008 /* USB/MSC SCSI opereration */
+#define DOSFS_DEVICE_LOCK_MEDIUM             0x00000010 /* USB/MSC ALLOW_PREVENT_MEDIUM_REMOVAL lock */
+#define DOSFS_DEVICE_LOCK_EJECTED            0x00000020 /* USB/MSC ejected (refuse to remount */
+#define DOSFS_DEVICE_LOCK_ACCESSED           0x40000000 /* USB/MSC accessed device */
+#define DOSFS_DEVICE_LOCK_MODIFIED           0x80000000 /* DOSFS modified device */
+
+struct _dosfs_device_t {
+    volatile uint32_t              lock;
+    const dosfs_device_interface_t *interface;
+    void                           *context;
+};
+
+extern dosfs_device_t dosfs_device;
+
+extern int dosfs_device_format(dosfs_device_t *device, uint8_t *data);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_DOSFS_DRIVER_H */
+#endif /*_DOSFS_DEVICE_H */