From 540b160dbedfdb12ce29f9b107be860ba22cd6cb Mon Sep 17 00:00:00 2001 From: batt Date: Thu, 28 Oct 2010 15:59:24 +0000 Subject: [PATCH] Move flash related flags to the flash driver; refactor accordingly. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4478 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/arm/drv/flash_at91.c | 7 +++---- bertos/cpu/arm/drv/flash_lpc2.c | 23 +++++++++++++---------- bertos/cpu/avr/drv/flash_avr.c | 7 +++---- bertos/cpu/cortex-m3/drv/flash_lm3s.c | 7 +++---- bertos/cpu/cortex-m3/drv/flash_stm32.c | 10 ++++++---- bertos/drv/flash.h | 14 +++++++------- bertos/io/kblock.h | 3 --- 7 files changed, 35 insertions(+), 36 deletions(-) diff --git a/bertos/cpu/arm/drv/flash_at91.c b/bertos/cpu/arm/drv/flash_at91.c index 1cdf6b78..514d54e4 100644 --- a/bertos/cpu/arm/drv/flash_at91.c +++ b/bertos/cpu/arm/drv/flash_at91.c @@ -222,21 +222,20 @@ static void common_init(Flash *fls) fls->blk.blk_cnt = FLASH_MEM_SIZE / FLASH_PAGE_SIZE_BYTES; } -void flash_hw_init(Flash *fls, int flags) +void flash_hw_init(Flash *fls, UNUSED_ARG(int, flags)) { common_init(fls); fls->blk.priv.vt = &flash_at91_buffered_vt; - fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE | flags; + fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE; fls->blk.priv.buf = flash_buf; /* Load the first block in the cache */ memcpy(fls->blk.priv.buf, (void *)(FLASH_BASE), fls->blk.blk_size); } -void flash_hw_initUnbuffered(Flash *fls, int flags) +void flash_hw_initUnbuffered(Flash *fls, UNUSED_ARG(int, flags)) { common_init(fls); fls->blk.priv.vt = &flash_at91_unbuffered_vt; - fls->blk.priv.flags |= flags; } diff --git a/bertos/cpu/arm/drv/flash_lpc2.c b/bertos/cpu/arm/drv/flash_lpc2.c index a78ade27..e1a3391b 100644 --- a/bertos/cpu/arm/drv/flash_lpc2.c +++ b/bertos/cpu/arm/drv/flash_lpc2.c @@ -90,6 +90,7 @@ typedef enum IapCommands struct FlashHardware { uint8_t status; + int flags; }; #define FLASH_PAGE_CNT FLASH_MEM_SIZE / FLASH_PAGE_SIZE_BYTES @@ -189,7 +190,7 @@ static size_t lpc2_flash_writeDirect(struct KBlock *blk, block_idx_t idx, const ASSERT(FLASH_PAGE_SIZE_BYTES == size); Flash *fls = FLASH_CAST(blk); - if (!(fls->blk.priv.flags & KB_WRITE_ONCE)) + if (!(fls->hw->flags & FLASH_WRITE_ONCE)) ASSERT(sector_size(idx) <= FLASH_PAGE_SIZE_BYTES); const uint8_t *buf = (const uint8_t *)_buf; @@ -213,7 +214,7 @@ static size_t lpc2_flash_writeDirect(struct KBlock *blk, block_idx_t idx, const if (res.status != CMD_SUCCESS) goto flash_error; - if ((fls->blk.priv.flags & KB_WRITE_ONCE) && + if ((fls->hw->flags & FLASH_WRITE_ONCE) && bitarray_isRangeFull(&lpc2_bitx, idx_sector, erase_group[sector])) { kputs("blocchi pieni\n"); @@ -222,11 +223,11 @@ static size_t lpc2_flash_writeDirect(struct KBlock *blk, block_idx_t idx, const } bool erase = false; - if ((fls->blk.priv.flags & KB_WRITE_ONCE) && + if ((fls->hw->flags & FLASH_WRITE_ONCE) && bitarray_isRangeEmpty(&lpc2_bitx, idx_sector, erase_group[sector])) erase = true; - if (!(fls->blk.priv.flags & KB_WRITE_ONCE)) + if (!(fls->hw->flags & FLASH_WRITE_ONCE)) erase = true; if (erase) @@ -248,7 +249,7 @@ static size_t lpc2_flash_writeDirect(struct KBlock *blk, block_idx_t idx, const if (res.status != CMD_SUCCESS) goto flash_error; - if (fls->blk.priv.flags & KB_WRITE_ONCE) + if (fls->hw->flags & FLASH_WRITE_ONCE) { if (bitarray_test(&lpc2_bitx, idx)) { @@ -275,6 +276,7 @@ static size_t lpc2_flash_writeDirect(struct KBlock *blk, block_idx_t idx, const return blk->blk_size; flash_error: + IRQ_RESTORE(flags); LOG_ERR("%ld\n", res.status); fls->hw->status |= FLASH_WR_ERR; return 0; @@ -329,12 +331,13 @@ static const KBlockVTable flash_lpc2_unbuffered_vt = static struct FlashHardware flash_lpc2_hw; static uint8_t flash_buf[FLASH_PAGE_SIZE_BYTES]; -static void common_init(Flash *fls) +static void common_init(Flash *fls, int flags) { memset(fls, 0, sizeof(*fls)); DB(fls->blk.priv.type = KBT_FLASH); fls->hw = &flash_lpc2_hw; + fls->hw->flags = flags; fls->blk.blk_size = FLASH_PAGE_SIZE_BYTES; fls->blk.blk_cnt = FLASH_MEM_SIZE / FLASH_PAGE_SIZE_BYTES; @@ -344,11 +347,12 @@ static void common_init(Flash *fls) void flash_hw_init(Flash *fls, int flags) { - common_init(fls); + common_init(fls, flags); fls->blk.priv.vt = &flash_lpc2_buffered_vt; - fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE | flags; + fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE; fls->blk.priv.buf = flash_buf; + /* Load the first block in the cache */ void *flash_start = 0x0; memcpy(fls->blk.priv.buf, flash_start, fls->blk.blk_size); @@ -356,7 +360,6 @@ void flash_hw_init(Flash *fls, int flags) void flash_hw_initUnbuffered(Flash *fls, int flags) { - common_init(fls); + common_init(fls, flags); fls->blk.priv.vt = &flash_lpc2_unbuffered_vt; - fls->blk.priv.flags |= flags; } diff --git a/bertos/cpu/avr/drv/flash_avr.c b/bertos/cpu/avr/drv/flash_avr.c index 7584200e..2c0baa1b 100644 --- a/bertos/cpu/avr/drv/flash_avr.c +++ b/bertos/cpu/avr/drv/flash_avr.c @@ -161,19 +161,18 @@ static void common_init(Flash *fls) } -void flash_hw_init(Flash *fls, int flags) +void flash_hw_init(Flash *fls, UNUSED_ARG(int, flags)) { common_init(fls); fls->blk.priv.vt = &flash_avr_buffered_vt; - fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE | flags; + fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE; fls->blk.priv.buf = flash_buf; } -void flash_hw_initUnbuffered(Flash *fls, int flags) +void flash_hw_initUnbuffered(Flash *fls, UNUSED_ARG(int, flags)) { common_init(fls); fls->blk.priv.vt = &flash_avr_unbuffered_vt; - fls->blk.priv.flags |= flags; } diff --git a/bertos/cpu/cortex-m3/drv/flash_lm3s.c b/bertos/cpu/cortex-m3/drv/flash_lm3s.c index 7ca0a7cf..ffec0db7 100644 --- a/bertos/cpu/cortex-m3/drv/flash_lm3s.c +++ b/bertos/cpu/cortex-m3/drv/flash_lm3s.c @@ -201,11 +201,11 @@ static void common_init(Flash *fls) } -void flash_hw_init(Flash *fls, int flags) +void flash_hw_init(Flash *fls, UNUSED_ARG(int, flags)) { common_init(fls); fls->blk.priv.vt = &flash_lm3s_buffered_vt; - fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE | flags; + fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE; fls->blk.priv.buf = flash_buf; /* Load the first block in the cache */ @@ -213,11 +213,10 @@ void flash_hw_init(Flash *fls, int flags) memcpy(fls->blk.priv.buf, flash_start, fls->blk.blk_size); } -void flash_hw_initUnbuffered(Flash *fls, int flags) +void flash_hw_initUnbuffered(Flash *fls, UNUSED_ARG(int, flags)) { common_init(fls); fls->blk.priv.vt = &flash_lm3s_unbuffered_vt; - fls->blk.priv.flags |= flags; } diff --git a/bertos/cpu/cortex-m3/drv/flash_stm32.c b/bertos/cpu/cortex-m3/drv/flash_stm32.c index 62e448f3..816cdd58 100644 --- a/bertos/cpu/cortex-m3/drv/flash_stm32.c +++ b/bertos/cpu/cortex-m3/drv/flash_stm32.c @@ -112,6 +112,8 @@ static bool stm32_erasePage(struct KBlock *blk, uint32_t page_add) return true; } +#if 0 +// not used for now static bool stm32_eraseAll(struct KBlock *blk) { EMB_FLASH->CR |= CR_MER_SET; @@ -124,6 +126,7 @@ static bool stm32_eraseAll(struct KBlock *blk) return true; } +#endif static int stm32_flash_error(struct KBlock *blk) { @@ -231,11 +234,11 @@ static void common_init(Flash *fls) } -void flash_hw_init(Flash *fls, int flags) +void flash_hw_init(Flash *fls, UNUSED_ARG(int, flags)) { common_init(fls); fls->blk.priv.vt = &flash_stm32_buffered_vt; - fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE | flags; + fls->blk.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE; fls->blk.priv.buf = flash_buf; /* Load the first block in the cache */ @@ -243,9 +246,8 @@ void flash_hw_init(Flash *fls, int flags) memcpy(fls->blk.priv.buf, flash_start, fls->blk.blk_size); } -void flash_hw_initUnbuffered(Flash *fls, int flags) +void flash_hw_initUnbuffered(Flash *fls, UNUSED_ARG(int, flags)) { common_init(fls); fls->blk.priv.vt = &flash_stm32_unbuffered_vt; - fls->blk.priv.flags |= flags; } diff --git a/bertos/drv/flash.h b/bertos/drv/flash.h index eccaf751..da1fa801 100644 --- a/bertos/drv/flash.h +++ b/bertos/drv/flash.h @@ -55,9 +55,9 @@ #include #if COMPILER_C99 - #define flash_init(...) PP_CAT(flash_init ## _, COUNT_PARMS(__VA_ARGS__)) (__VA_ARGS__) + #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) + #define flash_init(args...) PP_CAT(flash_init_, COUNT_PARMS(args)) (args) #endif /* @@ -92,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) { @@ -105,7 +105,10 @@ void flash_hw_initUnbuffered(Flash *fls, int flags); #include CPU_HEADER(flash) -#define flash_init_2(fls, flags) (flags & KB_OPEN_UNBUFF) ? \ +#define FLASH_WRITE_ONCE BV(0) ///< Allow only one write per block. +#define FLASH_BUFFERED BV(1) ///< Open flash memory using page caching, allowing the modification and partial write. + +#define flash_init_2(fls, flags) (flags & FLASH_BUFFERED) ? \ flash_hw_initUnbuffered(fls, flags) : flash_hw_init(fls, flags) #if !CONFIG_FLASH_DISABLE_OLD_API @@ -116,7 +119,4 @@ INLINE DEPRECATED void flash_init_1(Flash *fls) } #endif /* !CONFIG_FLASH_DISABLE_OLD_API */ -#include CPU_HEADER(flash) - #endif /* DRV_FLASH_H */ - diff --git a/bertos/io/kblock.h b/bertos/io/kblock.h index 358e0899..f2966baf 100644 --- a/bertos/io/kblock.h +++ b/bertos/io/kblock.h @@ -96,9 +96,6 @@ typedef struct KBlockVTable #define KB_CACHE_DIRTY BV(1) ///< Internal flag: true if the cache is dirty #define KB_PARTIAL_WRITE BV(2) ///< Internal flag: true if the device allows partial block write -#define KB_WRITE_ONCE BV(3) ///< Allow only the one write on select block. -#define KB_OPEN_BUFF BV(4) ///< Open flash memory using page caching, allowing the modification and partial write. -#define KB_OPEN_UNBUFF BV(5) ///< Open flash memory whitout memory caching. /* * KBlock private members. -- 2.25.1