1、【优化】几处兼容性不好的断言。

Signed-off-by: armink <armink.ztl@gmail.com>
pull/7/head^2
armink 10 years ago
parent b5539a022b
commit ec9d426f51

@ -67,7 +67,7 @@ if (!(EXPR)) \
while (1); \ while (1); \
} }
/* EasyFlash software version number */ /* EasyFlash software version number */
#define EF_SW_VERSION "1.12.16" #define EF_SW_VERSION "2.07.28"
typedef struct _ef_env{ typedef struct _ef_env{
char *key; char *key;

@ -188,10 +188,8 @@ EfErrCode ef_env_set_default(void){
*/ */
static uint32_t get_env_system_addr(void) { static uint32_t get_env_system_addr(void) {
#ifndef EF_ENV_USING_PFS_MODE #ifndef EF_ENV_USING_PFS_MODE
EF_ASSERT(env_start_addr);
return env_start_addr; return env_start_addr;
#else #else
EF_ASSERT(cur_load_area_addr);
return cur_load_area_addr; return cur_load_area_addr;
#endif #endif
} }
@ -307,8 +305,6 @@ static char *find_env(const char *key) {
char *env_start, *env_end, *env, *found_env = NULL; char *env_start, *env_end, *env, *found_env = NULL;
size_t key_len = strlen(key), env_len; size_t key_len = strlen(key), env_len;
EF_ASSERT(env_start_addr);
if (*key == NULL) { if (*key == NULL) {
EF_INFO("Flash ENV name must be not empty!\n"); EF_INFO("Flash ENV name must be not empty!\n");
return NULL; return NULL;

@ -192,7 +192,6 @@ EfErrCode ef_env_set_default(void){
* @return ENV start address in flash * @return ENV start address in flash
*/ */
static uint32_t get_env_start_addr(void) { static uint32_t get_env_start_addr(void) {
EF_ASSERT(env_start_addr);
return env_start_addr; return env_start_addr;
} }
/** /**

Loading…
Cancel
Save