diff --git a/demo/stm32f10x/rtt/README.md b/demo/stm32f10x/rtt/README.md index a1a6fba..d7ed567 100644 --- a/demo/stm32f10x/rtt/README.md +++ b/demo/stm32f10x/rtt/README.md @@ -19,7 +19,7 @@ ## 2、文件(夹)说明 -`components\flash\port\flash_port.c` 移植参考文件 +`components\easyflash\port\flash_port.c` 移植参考文件 `RVMDK` 下为Keil工程文件 diff --git a/easyflash/inc/flash.h b/easyflash/inc/flash.h index 600a583..b1761c0 100644 --- a/easyflash/inc/flash.h +++ b/easyflash/inc/flash.h @@ -24,7 +24,13 @@ #ifndef FLASH_H_ #define FLASH_H_ -#include "types.h" +#include +#include +#include + +#ifndef NULL + #define NULL 0 +#endif /* using ENV function */ #define FLASH_USING_ENV @@ -36,7 +42,7 @@ #define FLASH_USER_SETTING_ENV_SIZE (2 * 1024) /* default 2K */ /* using wear leveling mode or normal mode */ /* #define FLASH_ENV_USING_WEAR_LEVELING_MODE */ -#define FLASH_ENV_USING_NORMAL_MODE +#define FLASH_ENV_USING_NORMAL_MODE */ /* Flash debug print function. Must be implement by user. */ #define FLASH_DEBUG(...) flash_log_debug(__FILE__, __LINE__, __VA_ARGS__) @@ -50,7 +56,7 @@ if (!(EXPR)) \ while (1); \ } /* EasyFlash software version number */ -#define FLASH_SW_VERSION "1.04.23" +#define FLASH_SW_VERSION "1.05.16" typedef struct _flash_env{ char *key; diff --git a/easyflash/src/flash_env.c b/easyflash/src/flash_env.c index 2075c9c..9134645 100644 --- a/easyflash/src/flash_env.c +++ b/easyflash/src/flash_env.c @@ -75,7 +75,7 @@ static FlashErrCode create_env(const char *key, const char *value); #ifdef FLASH_ENV_USING_CRC_CHECK static uint32_t calc_env_crc(void); -static bool_t env_crc_is_ok(void); +static bool env_crc_is_ok(void); #endif /** @@ -561,12 +561,12 @@ static uint32_t calc_env_crc(void) { * * @return true is ok */ -static bool_t env_crc_is_ok(void) { +static bool env_crc_is_ok(void) { if (calc_env_crc() == env_cache[ENV_PARAM_INDEX_DATA_CRC]) { FLASH_DEBUG("Verify Env CRC32 result is OK.\n"); - return TRUE; + return true; } else { - return FALSE; + return false; } } #endif diff --git a/easyflash/src/flash_env_wl.c b/easyflash/src/flash_env_wl.c index 61a8a94..26f967f 100644 --- a/easyflash/src/flash_env_wl.c +++ b/easyflash/src/flash_env_wl.c @@ -92,7 +92,7 @@ static FlashErrCode save_cur_using_data_addr(uint32_t cur_data_addr); #ifdef FLASH_ENV_USING_CRC_CHECK static uint32_t calc_env_crc(void); -static bool_t env_crc_is_ok(void); +static bool env_crc_is_ok(void); #endif /** @@ -668,12 +668,12 @@ static uint32_t calc_env_crc(void) { * * @return true is ok */ -static bool_t env_crc_is_ok(void) { +static bool env_crc_is_ok(void) { if (calc_env_crc() == env_cache[ENV_PARAM_PART_INDEX_DATA_CRC]) { FLASH_DEBUG("Verify Env CRC32 result is OK.\n"); - return TRUE; + return true; } else { - return FALSE; + return false; } } #endif