diff --git a/demo/iap/ymodem+rtt.c b/demo/iap/ymodem+rtt.c index 17bb24d..0b05a90 100644 --- a/demo/iap/ymodem+rtt.c +++ b/demo/iap/ymodem+rtt.c @@ -1,7 +1,7 @@ /* * This file is part of the EasyFlash Library. * - * Copyright (c) 2014, Armink, + * Copyright (c) 2015, Armink, * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/demo/log/easylogger.c b/demo/log/easylogger.c index 19a4579..046bad5 100644 --- a/demo/log/easylogger.c +++ b/demo/log/easylogger.c @@ -1,7 +1,7 @@ /* * This file is part of the EasyFlash Library. * - * Copyright (c) 2014, Armink, + * Copyright (c) 2015, Armink, * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/easyflash/inc/easyflash.h b/easyflash/inc/easyflash.h index 0667e3a..0ae00f8 100644 --- a/easyflash/inc/easyflash.h +++ b/easyflash/inc/easyflash.h @@ -62,7 +62,7 @@ if (!(EXPR)) \ while (1); \ } /* EasyFlash software version number */ -#define EF_SW_VERSION "1.07.04" +#define EF_SW_VERSION "1.07.06" typedef struct _eflash_env{ char *key; @@ -121,7 +121,7 @@ size_t ef_log_get_used_size(void); #endif /* utils.c */ -uint32_t calc_crc32(uint32_t crc, const void *buf, size_t size); +uint32_t ef_calc_crc32(uint32_t crc, const void *buf, size_t size); FlashSecrorStatus ef_get_sector_status(uint32_t addr, size_t sec_size); uint32_t ef_find_sec_using_end_addr(uint32_t addr, size_t sec_size); diff --git a/easyflash/src/ef_env.c b/easyflash/src/ef_env.c index 92db391..9ea389d 100644 --- a/easyflash/src/ef_env.c +++ b/easyflash/src/ef_env.c @@ -550,8 +550,8 @@ static uint32_t calc_env_crc(void) { /* Calculate the ENV end address and all ENV data CRC32. * The 4 is ENV end address bytes size. */ - crc32 = calc_crc32(crc32, &env_cache[ENV_PARAM_INDEX_END_ADDR], 4); - crc32 = calc_crc32(crc32, &env_cache[ENV_PARAM_WORD_SIZE], get_env_data_size()); + crc32 = ef_calc_crc32(crc32, &env_cache[ENV_PARAM_INDEX_END_ADDR], 4); + crc32 = ef_calc_crc32(crc32, &env_cache[ENV_PARAM_WORD_SIZE], get_env_data_size()); EF_DEBUG("Calculate Env CRC32 number is 0x%08X.\n", crc32); return crc32; diff --git a/easyflash/src/ef_env_wl.c b/easyflash/src/ef_env_wl.c index 504839c..9b097be 100644 --- a/easyflash/src/ef_env_wl.c +++ b/easyflash/src/ef_env_wl.c @@ -662,8 +662,8 @@ static uint32_t calc_env_crc(void) { /* Calculate the ENV end address and all ENV data CRC32. * The 4 is ENV end address bytes size. */ - crc32 = calc_crc32(crc32, &env_cache[ENV_PARAM_PART_INDEX_END_ADDR], 4); - crc32 = calc_crc32(crc32, &env_cache[ENV_PARAM_PART_WORD_SIZE], get_env_detail_size()); + crc32 = ef_calc_crc32(crc32, &env_cache[ENV_PARAM_PART_INDEX_END_ADDR], 4); + crc32 = ef_calc_crc32(crc32, &env_cache[ENV_PARAM_PART_WORD_SIZE], get_env_detail_size()); EF_DEBUG("Calculate Env CRC32 number is 0x%08X.\n", crc32); return crc32; diff --git a/easyflash/src/ef_utils.c b/easyflash/src/ef_utils.c index 728f6d9..0b2e23d 100644 --- a/easyflash/src/ef_utils.c +++ b/easyflash/src/ef_utils.c @@ -84,7 +84,7 @@ static const uint32_t crc32_table[] = * * @return calculated CRC32 value */ -uint32_t calc_crc32(uint32_t crc, const void *buf, size_t size) +uint32_t ef_calc_crc32(uint32_t crc, const void *buf, size_t size) { const uint8_t *p;