1、【优化】部分全局变量初始化。

Signed-off-by: armink <armink.ztl@gmail.com>
pull/7/merge
armink 9 years ago
parent 986af23db4
commit 08789adb9c

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

@ -1,7 +1,7 @@
/* /*
* This file is part of the EasyFlash Library. * This file is part of the EasyFlash Library.
* *
* Copyright (c) 2014, Armink, <armink.ztl@gmail.com> * Copyright (c) 2014-2016, Armink, <armink.ztl@gmail.com>
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the * a copy of this software and associated documentation files (the
@ -67,19 +67,19 @@ enum {
/* default ENV set, must be initialized by user */ /* default ENV set, must be initialized by user */
static ef_env const *default_env_set = NULL; static ef_env const *default_env_set = NULL;
/* default ENV set size, must be initialized by user */ /* default ENV set size, must be initialized by user */
static size_t default_env_set_size = NULL; static size_t default_env_set_size = 0;
/* ENV ram cache */ /* ENV ram cache */
static uint32_t env_cache[ENV_USER_SETTING_SIZE / 4] = { 0 }; static uint32_t env_cache[ENV_USER_SETTING_SIZE / 4] = { 0 };
/* ENV start address in flash */ /* ENV start address in flash */
static uint32_t env_start_addr = NULL; static uint32_t env_start_addr = 0;
/* ENV ram cache has changed when ENV created, deleted and changed value. */ /* ENV ram cache has changed when ENV created, deleted and changed value. */
static bool env_cache_changed = false; static bool env_cache_changed = false;
#ifdef EF_ENV_USING_PFS_MODE #ifdef EF_ENV_USING_PFS_MODE
/* current load ENV area address */ /* current load ENV area address */
static uint32_t cur_load_area_addr = NULL; static uint32_t cur_load_area_addr = 0;
/* next save ENV area address */ /* next save ENV area address */
static uint32_t next_save_area_addr = NULL; static uint32_t next_save_area_addr = 0;
#endif #endif
static uint32_t get_env_system_addr(void); static uint32_t get_env_system_addr(void);

@ -1,7 +1,7 @@
/* /*
* This file is part of the EasyFlash Library. * This file is part of the EasyFlash Library.
* *
* Copyright (c) 2015, Armink, <armink.ztl@gmail.com> * Copyright (c) 2015-2016, Armink, <armink.ztl@gmail.com>
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the * a copy of this software and associated documentation files (the
@ -74,21 +74,21 @@ enum {
/* default ENV set, must be initialized by user */ /* default ENV set, must be initialized by user */
static ef_env const *default_env_set = NULL; static ef_env const *default_env_set = NULL;
/* default ENV set size, must be initialized by user */ /* default ENV set size, must be initialized by user */
static size_t default_env_set_size = NULL; static size_t default_env_set_size = 0;
/* flash ENV data section size */ /* flash ENV data section size */
static size_t env_data_section_size = NULL; static size_t env_data_section_size = 0;
/* ENV ram cache */ /* ENV ram cache */
static uint32_t env_cache[ENV_USER_SETTING_SIZE / 4] = { 0 }; static uint32_t env_cache[ENV_USER_SETTING_SIZE / 4] = { 0 };
/* ENV start address in flash */ /* ENV start address in flash */
static uint32_t env_start_addr = NULL; static uint32_t env_start_addr = 0;
/* current using data section address */ /* current using data section address */
static uint32_t cur_using_data_addr = NULL; static uint32_t cur_using_data_addr = 0;
/* ENV ram cache has changed when ENV created, deleted and changed value. */ /* ENV ram cache has changed when ENV created, deleted and changed value. */
static bool env_cache_changed = false; static bool env_cache_changed = false;
#ifdef EF_ENV_USING_PFS_MODE #ifdef EF_ENV_USING_PFS_MODE
/* next save ENV area address */ /* next save ENV area address */
static uint32_t next_save_area_addr = NULL; static uint32_t next_save_area_addr = 0;
#endif #endif
static uint32_t get_env_start_addr(void); static uint32_t get_env_start_addr(void);

@ -1,7 +1,7 @@
/* /*
* This file is part of the EasyFlash Library. * This file is part of the EasyFlash Library.
* *
* Copyright (c) 2015, Armink, <armink.ztl@gmail.com> * Copyright (c) 2015-2016, Armink, <armink.ztl@gmail.com>
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the * a copy of this software and associated documentation files (the
@ -31,7 +31,7 @@
#ifdef EF_USING_IAP #ifdef EF_USING_IAP
/* IAP section backup application section start address in flash */ /* IAP section backup application section start address in flash */
static uint32_t bak_app_start_addr = NULL; static uint32_t bak_app_start_addr = 0;
static uint32_t get_bak_app_start_addr(void); static uint32_t get_bak_app_start_addr(void);

Loading…
Cancel
Save