From c6ae4645f2912c5b4a2cf654f0cd52c559b5c3ef Mon Sep 17 00:00:00 2001 From: armink Date: Tue, 25 Oct 2016 23:17:18 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: armink --- easyflash/src/ef_env.c | 10 +++++----- easyflash/src/ef_env_wl.c | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/easyflash/src/ef_env.c b/easyflash/src/ef_env.c index 2cbd9df..b1ce732 100644 --- a/easyflash/src/ef_env.c +++ b/easyflash/src/ef_env.c @@ -65,13 +65,13 @@ enum { }; /* default ENV set, must be initialized by user */ -static ef_env const *default_env_set = NULL; +static ef_env const *default_env_set; /* 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 */ static uint32_t env_cache[ENV_USER_SETTING_SIZE / 4] = { 0 }; /* 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. */ static bool env_cache_changed = false; /* initialize OK flag */ @@ -79,9 +79,9 @@ static bool init_ok = false; #ifdef EF_ENV_USING_PFS_MODE /* 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 */ -static uint32_t next_save_area_addr = NULL; +static uint32_t next_save_area_addr = 0; #endif static uint32_t get_env_system_addr(void); diff --git a/easyflash/src/ef_env_wl.c b/easyflash/src/ef_env_wl.c index 5aff343..d02029c 100644 --- a/easyflash/src/ef_env_wl.c +++ b/easyflash/src/ef_env_wl.c @@ -72,17 +72,17 @@ enum { }; /* default ENV set, must be initialized by user */ -static ef_env const *default_env_set = NULL; +static ef_env const *default_env_set; /* 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 */ -static size_t env_data_section_size = NULL; +static size_t env_data_section_size = 0; /* ENV ram cache */ static uint32_t env_cache[ENV_USER_SETTING_SIZE / 4] = { 0 }; /* ENV start address in flash */ -static uint32_t env_start_addr = NULL; +static uint32_t env_start_addr = 0; /* 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. */ static bool env_cache_changed = false; /* initialize OK flag */ @@ -90,7 +90,7 @@ static bool init_ok = false; #ifdef EF_ENV_USING_PFS_MODE /* next save ENV area address */ -static uint32_t next_save_area_addr = NULL; +static uint32_t next_save_area_addr = 0; #endif static uint32_t get_env_start_addr(void);