From fcbf3f98bcdeaf1bef363e19c8341cf6bf1cbfb7 Mon Sep 17 00:00:00 2001 From: armink Date: Wed, 8 Apr 2015 17:01:39 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91I?= =?UTF-8?q?AP=E4=B8=AD=E8=AF=BB=E5=8F=96APP=E4=B8=8EBootloader=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BD=BF=E5=85=B6=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=9A=84flash=5Fread=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: armink --- flash/inc/flash.h | 2 +- flash/src/flash_iap.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flash/inc/flash.h b/flash/inc/flash.h index 8552872..1dde515 100644 --- a/flash/inc/flash.h +++ b/flash/inc/flash.h @@ -44,7 +44,7 @@ if (!(EXPR)) \ while (1); \ } /* EasyFlash software version number */ -#define FLASH_SW_VERSION "1.03.23" +#define FLASH_SW_VERSION "1.04.08" typedef struct _flash_env{ char *key; diff --git a/flash/src/flash_iap.c b/flash/src/flash_iap.c index 556a348..eb03462 100644 --- a/flash/src/flash_iap.c +++ b/flash/src/flash_iap.c @@ -175,11 +175,11 @@ FlashErrCode flash_copy_app_from_bak(uint32_t user_app_addr, size_t app_size) { uint32_t buff[32]; /* cycle copy data */ - for (cur_size = 0; cur_size < app_size; cur_size += sizeof(buff) / 4) { + for (cur_size = 0; cur_size < app_size; cur_size += sizeof(buff)) { app_cur_addr = user_app_addr + cur_size; bak_cur_addr = get_bak_app_start_addr() + cur_size; - flash_read(bak_cur_addr, buff, sizeof(buff) / 4); - result = flash_write(app_cur_addr, buff, sizeof(buff) / 4); + flash_read(bak_cur_addr, buff, sizeof(buff)); + result = flash_write(app_cur_addr, buff, sizeof(buff)); if (result != FLASH_NO_ERR) { break; } @@ -211,15 +211,15 @@ FlashErrCode flash_copy_bl_from_bak(uint32_t bl_addr, size_t bl_size) { size_t cur_size; uint32_t bl_cur_addr, bak_cur_addr; FlashErrCode result = FLASH_NO_ERR; - /* 32bytes buffer */ + /* 32 words buffer */ uint32_t buff[32]; /* cycle copy data by 32bytes buffer */ - for (cur_size = 0; cur_size < bl_size; cur_size += 32) { + for (cur_size = 0; cur_size < bl_size; cur_size += sizeof(buff)) { bl_cur_addr = bl_addr + cur_size; bak_cur_addr = get_bak_app_start_addr() + cur_size; - flash_read(bak_cur_addr, buff, 32); - result = flash_write(bl_cur_addr, buff, 32); + flash_read(bak_cur_addr, buff, sizeof(buff)); + result = flash_write(bl_cur_addr, buff, sizeof(buff)); if (result != FLASH_NO_ERR) { break; }