X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fdataflash.h;h=1da6105be8c9a3bdecde83b841b8066fea11f472;hb=42e61240ce8a55e92fe0942fecbee3abe371c507;hp=923b9ec3bd3329d7c04ab2c231b184afe2e90b9d;hpb=a625fd2523a0c960351f124baa7cd5c3c69c3272;p=bertos.git

diff --git a/bertos/drv/dataflash.h b/bertos/drv/dataflash.h
index 923b9ec3..1da6105b 100644
--- a/bertos/drv/dataflash.h
+++ b/bertos/drv/dataflash.h
@@ -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,7 +181,7 @@ 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
@@ -190,7 +190,7 @@ bool dataflash_init(KFileDataflash *fd, KFile *ch, DataflashType type, dataflash
  *
  * (see drv/datafalsh_test.c for more detail)
  */
-int dataflash_testSetup(void);
+int dataflash_testSetUp(void);
 int dataflash_testRun(void);
 int dataflash_testTearDown(void);