X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fflash.h;h=eccaf7519a6ec20e8baec1a820aadc324dc2580d;hb=02da7e0db83863a2efe15b490c7713ffe0526aeb;hp=509627428fcb183e2c66e6978a5c51fd69d50fb9;hpb=ec3166808afafa4cdae2f542253cd0a530e6ee79;p=bertos.git

diff --git a/bertos/drv/flash.h b/bertos/drv/flash.h
index 50962742..eccaf751 100644
--- a/bertos/drv/flash.h
+++ b/bertos/drv/flash.h
@@ -36,15 +36,29 @@
 * \author Daniele Basile <asterix@develer.com>
 *
 * $WIZ$ module_name = "flash"
-* $WIZ$ module_depends = "kfile"
+* $WIZ$ module_depends = "kfile", "kfile_block", "kblock"
+* $WIZ$ module_configuration = "bertos/cfg/cfg_emb_flash.h"
 */
 
 #ifndef DRV_FLASH_H
 #define DRV_FLASH_H
 
+#include "cfg/cfg_emb_flash.h"
+
 #include <cfg/macros.h>
+#include <cfg/compiler.h>
 
 #include <io/kblock.h>
+#include <io/kfile.h>
+#include <io/kfile_block.h>
+
+#include <cpu/attr.h>
+
+#if COMPILER_C99
+	#define flash_init(...)           PP_CAT(flash_init ## _, COUNT_PARMS(__VA_ARGS__)) (__VA_ARGS__)
+#else
+	#define flash_init(args...)       PP_CAT(flash_init ## _, COUNT_PARMS(args)) (args)
+#endif
 
 /*
  * Embedded flash error flags
@@ -52,7 +66,8 @@
 #define FLASH_WR_OK             0     ///< Write ok.
 #define FLASH_NOT_ERASED     BV(1)    ///< Flash memory was not erased before to write it.
 #define FLASH_WR_PROTECT     BV(2)    ///< Write not allowed the flash memory was protected.
-#define FLASH_WR_TIMEOUT     BV(3)    ///<
+#define FLASH_WR_TIMEOUT     BV(3)    ///< Timeout while writing
+#define FLASH_WR_ERR         BV(4)    ///< Invalid command and/or a bad keywords
 
 struct FlashHardware;
 
@@ -63,6 +78,12 @@ typedef struct Flash
 {
 	KBlock blk;
 	struct FlashHardware *hw;
+	#if !CONFIG_FLASH_DISABLE_OLD_API
+	union {
+		KFile fd;
+		KFileBlock fdblk;
+	} DEPRECATED;
+	#endif /* !CONFIG_FLASH_DISABLE_OLD_API */
 } Flash;
 
 /**
@@ -79,79 +100,23 @@ INLINE Flash *FLASH_CAST(KBlock *fls)
 	return (Flash *)fls;
 }
 
-void flash_hw_init(Flash *fls);
-void flash_hw_initUnbuffered(Flash *fls);
+void flash_hw_init(Flash *fls, int flags);
+void flash_hw_initUnbuffered(Flash *fls, int flags);
 
 #include CPU_HEADER(flash)
 
-INLINE void flash_init(Flash *fls)
-{
-	flash_hw_init(fls);
-}
+#define flash_init_2(fls, flags)    (flags & KB_OPEN_UNBUFF) ? \
+										flash_hw_initUnbuffered(fls, flags) : flash_hw_init(fls, flags)
 
-INLINE void flash_initUnbuffered(Flash *fls)
+#if !CONFIG_FLASH_DISABLE_OLD_API
+INLINE DEPRECATED void flash_init_1(Flash *fls)
 {
-	flash_hw_initUnbuffered(fls);
+	flash_hw_init(fls, 0);
+	kfileblock_init(&fls->fdblk, &fls->blk);
 }
+#endif /* !CONFIG_FLASH_DISABLE_OLD_API */
 
-#if 0
-/**
- * EmbFlash KFile context structure.
- */
-typedef struct Flash
-{
-	/**
-	 * File descriptor.
-	 */
-	KFile fd;
-
-	/**
-	 * Flag for checking if current page is modified.
-	 */
-	bool page_dirty;
-
-	/**
-	 * Current buffered page.
-	 */
-	page_t curr_page;
-
-	/**
-	 * Temporary buffer cointaing data block to
-	 * write on flash.
-	 */
-	uint8_t page_buf[FLASH_PAGE_SIZE];
-} Flash;
-
-/**
-* ID for FLASH
-*/
-#define KFT_FLASH MAKE_ID('F', 'L', 'A', 'S')
-
-/**
-* Convert + ASSERT from generic KFile to Flash.
-*/
-INLINE Flash * FLASH_CAST(KFile *fd)
-{
-	ASSERT(fd->_type == KFT_FLASH);
-	return (Flash *)fd;
-}
-
-
-MOD_DEFINE(flash);
-
-/**
- *
- * Initialize PWM hw.
- */
-INLINE void flash_init(Flash *fd)
-{
-	flash_hw_init(fd);
-
-	MOD_INIT(flash);
-}
-
-#endif
-
+#include CPU_HEADER(flash)
 
 #endif /* DRV_FLASH_H */