From 03af8edb1fc487e7e9bcf1178a5d0c367ab4bc51 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Tue, 15 Aug 2017 14:57:53 +0100 Subject: [PATCH] Revert "Error return passed back up for writing page data" This reverts commit ce5ae60f3b718335147842cc9f73c8035fcd7e66. --- module_dfu/src/dfu.xc | 10 ++-------- module_dfu/src/flash_interface.c | 3 --- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/module_dfu/src/dfu.xc b/module_dfu/src/dfu.xc index 8ff21a6a..828217b8 100644 --- a/module_dfu/src/dfu.xc +++ b/module_dfu/src/dfu.xc @@ -155,10 +155,7 @@ static int DFU_Dnload(unsigned int request_len, unsigned int block_num, const un unsigned int subPagePad[16] = {0}; for (i = 0; i < subPagesLeft; i++) { - if(flash_cmd_write_page_data((subPagePad, unsigned char[64]))) - { - return 1; - } + flash_cmd_write_page_data((subPagePad, unsigned char[64])); } } @@ -195,10 +192,7 @@ static int DFU_Dnload(unsigned int request_len, unsigned int block_num, const un cmd_data[i] = request_data[i]; } - if(flash_cmd_write_page_data((cmd_data, unsigned char[64]))) - { - return 1; - } + flash_cmd_write_page_data((cmd_data, unsigned char[64])); subPagesLeft--; DFU_state = STATE_DFU_DOWNLOAD_SYNC; diff --git a/module_dfu/src/flash_interface.c b/module_dfu/src/flash_interface.c index 98f682d6..9cb823a3 100755 --- a/module_dfu/src/flash_interface.c +++ b/module_dfu/src/flash_interface.c @@ -196,10 +196,7 @@ int flash_cmd_write_page_data(unsigned char *data) if (current_flash_subpage_index == 4) { if (fl_writeImagePage(current_flash_page_data) != 0) - { FLASH_ERROR(); - return 1; - } pages_written++; }