X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fdataflash.h;h=43a345b40478780a51108a05d50a0760a3f9be96;hb=2c2c07eb47ee84d3f2a73209d0968b12c5809255;hp=69f3217b233547599b6263a860b16d0e5728a5a1;hpb=77f7560887c694977dc03e9c547b1b119e92c70c;p=bertos.git

diff --git a/bertos/drv/dataflash.h b/bertos/drv/dataflash.h
index 69f3217b..43a345b4 100644
--- a/bertos/drv/dataflash.h
+++ b/bertos/drv/dataflash.h
@@ -30,10 +30,10 @@
  *
  * -->
  *
- * \brief Function library for AT45DB081D Flash memory.
+ * \brief Function library for dataflash AT45DB family (interface).
  *
+ * \version $Id: dataflash.h 21658 2008-06-05 16:42:54Z asterix $
  *
- * \version $Id: dataflash.h 20677 2008-02-19 14:29:52Z batt $
  * \author Daniele Basile <asterix@develer.com>
  */
 
@@ -41,9 +41,11 @@
 #ifndef DRV_DATAFLASH_H
 #define DRV_DATAFLASH_H
 
-#include <kern/kfile.h>
 #include <cfg/compiler.h>
 
+#include <kern/kfile.h>
+#include <fs/battfs.h>
+
 /**
  * Type definitions for dflash memory.
  * \{
@@ -69,9 +71,10 @@ typedef void (dataflash_setCS_t)(bool);
  */
 typedef enum DataflashType
 {
-	DFT_AT45DB041B,
+	DFT_AT45DB041B = 0,
 	DFT_AT45DB081D,
 	DFT_AT45DB161D,
+	DFT_AT45DB642D,
 	DFT_CNT
 } DataflashType;
 
@@ -79,7 +82,7 @@ typedef enum DataflashType
 /**
  * Dataflash KFile context structure.
  */
-typedef struct KFileDataflash
+typedef struct DataFlash
 {
 	KFile fd;                       ///< File descriptor.
 	KFile *channel;                 ///< Dataflash comm channel (usually SPI).
@@ -88,7 +91,7 @@ typedef struct KFileDataflash
 	bool page_dirty;                ///< True if current_page is dirty (needs to be flushed).
 	dataflash_setReset_t *setReset; ///< Callback used to set reset pin of dataflash.
 	dataflash_setCS_t *setCS;       ///< Callback used to set CS pin of dataflash.
-} KFileDataflash;
+} DataFlash;
 
 /**
  * ID for dataflash.
@@ -96,12 +99,12 @@ typedef struct KFileDataflash
 #define KFT_DATAFLASH MAKE_ID('D', 'F', 'L', 'H')
 
 /**
- * Convert + ASSERT from generic KFile to KFileDataflash.
+ * Convert + ASSERT from generic KFile to DataFlash.
  */
-INLINE KFileDataflash * KFILEDATAFLASH(KFile *fd)
+INLINE DataFlash * DATAFLASH_CAST(KFile *fd)
 {
 	ASSERT(fd->_type == KFT_DATAFLASH);
-	return (KFileDataflash *)fd;
+	return (DataFlash *)fd;
 }
 
 #define RESET_PULSE_WIDTH     10 ///< Width of reset pulse in usec.
@@ -179,6 +182,18 @@ typedef struct DataflashInfo
 } DataflashInfo;
 
 
-bool dataflash_init(KFileDataflash *fd, KFile *ch, DataflashType type, dataflash_setCS_t *setCS, dataflash_setReset_t *setReset);
+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
+ * this functions. To use these functions make sure to include in your make file the
+ * drv/datafalsh_test.c source.
+ *
+ * (see drv/datafalsh_test.c for more detail)
+ */
+int dataflash_testSetUp(void);
+int dataflash_testRun(void);
+int dataflash_testTearDown(void);
 
 #endif /* DRV_DATAFLASH_H */