From ce5ae60f3b718335147842cc9f73c8035fcd7e66 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 14 Aug 2017 12:00:52 +0100 Subject: [PATCH] Error return passed back up for writing page data --- module_dfu/src/dfu.xc | 10 ++++++++-- module_dfu/src/flash_interface.c | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/module_dfu/src/dfu.xc b/module_dfu/src/dfu.xc index 828217b8..8ff21a6a 100644 --- a/module_dfu/src/dfu.xc +++ b/module_dfu/src/dfu.xc @@ -155,7 +155,10 @@ 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++) { - flash_cmd_write_page_data((subPagePad, unsigned char[64])); + if(flash_cmd_write_page_data((subPagePad, unsigned char[64]))) + { + return 1; + } } } @@ -192,7 +195,10 @@ static int DFU_Dnload(unsigned int request_len, unsigned int block_num, const un cmd_data[i] = request_data[i]; } - flash_cmd_write_page_data((cmd_data, unsigned char[64])); + if(flash_cmd_write_page_data((cmd_data, unsigned char[64]))) + { + return 1; + } subPagesLeft--; DFU_state = STATE_DFU_DOWNLOAD_SYNC; diff --git a/module_dfu/src/flash_interface.c b/module_dfu/src/flash_interface.c index 9cb823a3..98f682d6 100755 --- a/module_dfu/src/flash_interface.c +++ b/module_dfu/src/flash_interface.c @@ -196,7 +196,10 @@ 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++; }