Merged from external project:

[bertos.git] / bertos / drv / dataflash.h

diff --git a/bertos/drv/dataflash.h b/bertos/drv/dataflash.h
index ff5b662bd9e57b6ec3b9f2e027b6209f3e082720..43a345b40478780a51108a05d50a0760a3f9be96 100644 (file)
--- a/bertos/drv/dataflash.h
+++ b/bertos/drv/dataflash.h
@@ -44,6 +44,7 @@
 #include <cfg/compiler.h>
 
 #include <kern/kfile.h>
+#include <fs/battfs.h>
 
 /**
  * Type definitions for dflash memory.
@@ -100,7 +101,7 @@ typedef struct DataFlash
 /**
  * Convert + ASSERT from generic KFile to DataFlash.
  */
-INLINE DataFlash * DATAFLASH(KFile *fd)
+INLINE DataFlash * DATAFLASH_CAST(KFile *fd)
 {
        ASSERT(fd->_type == KFT_DATAFLASH);
        return (DataFlash *)fd;
@@ -182,6 +183,7 @@ typedef struct DataflashInfo
 
 
 bool dataflash_init(DataFlash *fd, KFile *ch, DataflashType type, dataflash_setCS_t *setCS, dataflash_setReset_t *setReset);
+bool dataflash_diskInit(struct BattFsSuper *d, DataFlash *fd, pgcnt_t *page_array);
 
 /**
  * To test data falsh drive you could use