Merge some fix from trunk.

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

diff --git a/bertos/drv/flash.h b/bertos/drv/flash.h
index 509627428fcb183e2c66e6978a5c51fd69d50fb9..9ea5665075e815793a0e9daf8ccaa2a2d903e8a0 100644 (file)
--- 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;
 
 /**
@@ -71,7 +92,7 @@ typedef struct Flash
 #define KBT_FLASH MAKE_ID('F', 'L', 'A', 'S')
 
 /**
-* Convert + ASSERT from generic KFile to Flash.
+* Convert + ASSERT from generic KBlock to Flash.
 */
 INLINE Flash *FLASH_CAST(KBlock *fls)
 {
@@ -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);
-}
-
-INLINE void flash_initUnbuffered(Flash *fls)
-{
-       flash_hw_initUnbuffered(fls);
-}
-
-#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;
-}
-
+#define FLASH_WRITE_ONCE   BV(0) ///< Allow only one write per block.
+#define FLASH_UNBUFFERED   BV(1) ///< Open flash memory disabling page caching, no modification and partial write are allowed.
 
-MOD_DEFINE(flash);
+#define flash_init_2(fls, flags)    (flags & FLASH_UNBUFFERED) ? \
+                                                                               flash_hw_initUnbuffered(fls, flags) : flash_hw_init(fls, flags)
 
-/**
- *
- * Initialize PWM hw.
- */
-INLINE void flash_init(Flash *fd)
+#if !CONFIG_FLASH_DISABLE_OLD_API
+INLINE DEPRECATED void flash_init_1(Flash *fls)
 {
-       flash_hw_init(fd);
-
-       MOD_INIT(flash);
+       flash_hw_init(fls, 0);
+       kfileblock_init(&fls->fdblk, &fls->blk);
 }
-
-#endif
-
+#endif /* !CONFIG_FLASH_DISABLE_OLD_API */
 
 #endif /* DRV_FLASH_H */
-