timer: Cleanup and warning removal from driver and test

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

diff --git a/bertos/drv/dataflash.h b/bertos/drv/dataflash.h
index e9ef00af9a37be0c956d7b03d41d5e5f98fd0f0e..1da6105be8c9a3bdecde83b841b8066fea11f472 100644 (file)
--- a/bertos/drv/dataflash.h
+++ b/bertos/drv/dataflash.h
@@ -30,9 +30,9 @@
  *
  * -->
  *
- * \brief Function library for AT45DB081D Flash memory.
+ * \brief Function library for dataflash AT45DB family (interface).
  *
- * \version $Id: dataflash.h 20677 2008-02-19 14:29:52Z batt $
+ * \version $Id: dataflash.h 21658 2008-06-05 16:42:54Z asterix $
  *
  * \author Daniele Basile <asterix@develer.com>
  */
@@ -81,7 +81,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).
@@ -90,7 +90,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.
@@ -98,12 +98,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.
@@ -181,6 +181,17 @@ 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);
+
+/**
+ * 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 */