X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fdrv%2Fflash25.h;h=27c6411fca2872d194bc89d67aabd4b4f8a91581;hb=515886be3106584a6d695d4b5453730121b91f74;hp=e45dbed4e4b6e76fefb05c5b7c0d19a531df76c7;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/drv/flash25.h b/bertos/drv/flash25.h
index e45dbed4..27c6411f 100644
--- a/bertos/drv/flash25.h
+++ b/bertos/drv/flash25.h
@@ -41,11 +41,10 @@
 #ifndef DRV_FLASH25_H
 #define DRV_FLASH25_H
 
-#include <kern/kfile.h>
 #include <cfg/compiler.h>
+#include "cfg/cfg_flash25.h"
 
-
-#include <appconfig.h>
+#include <kern/kfile.h>
 
 /**
  * Type definition for serial flash memory.
@@ -54,6 +53,29 @@ typedef uint32_t flash25Addr_t;
 typedef uint32_t flash25Size_t;
 typedef uint8_t flash25Offset_t;
 
+/**
+ * Flash25 KFile context structure.
+ */
+typedef struct Flash25
+{
+	KFile fd;                       ///< File descriptor.
+	KFile *channel;                 ///< Dataflash comm channel (usually SPI).
+} Flash25;
+
+/**
+ * ID for dataflash.
+ */
+#define KFT_FLASH25 MAKE_ID('F', 'L', '2', '5')
+
+
+/**
+ * Convert + ASSERT from generic KFile to Flash25.
+ */
+INLINE Flash25 * FLASH25_CAST(KFile *fd)
+{
+	ASSERT(fd->_type == KFT_FLASH25);
+	return (Flash25 *)fd;
+}
 
 /**
  * Memory definition.
@@ -109,9 +131,9 @@ typedef enum {
 	FLASH25_SECT4            = 0x30000,  ///< Sector 4 (0x30000 -0x3FFFF)
 } Flash25Sector;
 
-void flash25_init(struct KFile *fd, struct KFile *_channel);
-void flash25_chipErase(void);
-void flash25_sectorErase(Flash25Sector sector);
+void flash25_init(Flash25 *fd, KFile *ch);
+void flash25_chipErase(Flash25 *fd);
+void flash25_sectorErase(Flash25 *fd, Flash25Sector sector);
 bool flash25_test(KFile *channel);
 
 #endif /* DRV_FLASH25_H */