flash_decoder: Pass address to validate_target_image function.

When blocks are received out of order the data passed to
board_detect_incompatible_image() via
flash_decoder_validate_target_image() might not be the first block
of flash data, as expected by the microbitv2 imcompatibility
detection, so pass the address to the function and perform the
check.

Author: microbit-carlos

source/board/microbitv2/microbitv2.c

@@ -446,13 +446,16 @@ static uint32_t read_file_data_txt(uint32_t sector_offset, uint8_t *data, uint32
     return VFS_SECTOR_SIZE;
 }
 
-uint8_t board_detect_incompatible_image(const uint8_t *data, uint32_t size)
+uint8_t board_detect_incompatible_image(uint32_t addr, const uint8_t *data, uint32_t size)
 {
-    uint8_t result = 0;
+    // We can only check image compatibility on the first block of flash data
+    if (addr != 0) {
+        return 0;
+    }
 
     // Check difference in vectors (mem fault, bus fault, usage fault)
     // If these vectors are 0, we assume it's an M0 image (not compatible)
-    result = memcmp(data + M0_RESERVED_VECT_OFFSET, (uint8_t[M0_RESERVED_VECT_SIZE]){0}, M0_RESERVED_VECT_SIZE);
+    uint8_t result = memcmp(data + M0_RESERVED_VECT_OFFSET, (uint8_t[M0_RESERVED_VECT_SIZE]){0}, M0_RESERVED_VECT_SIZE);
 
     return result == 0;
 }

source/daplink/drag-n-drop/flash_decoder.c

@@ -60,7 +60,7 @@ static bool flash_type_target_bin;
 
 static bool flash_decoder_is_at_end(uint32_t addr, const uint8_t *data, uint32_t size);
 
-__WEAK uint8_t board_detect_incompatible_image(const uint8_t *data, uint32_t size)
+__WEAK uint8_t board_detect_incompatible_image(uint32_t addr, const uint8_t *data, uint32_t size)
 {
     return 0;   // Return 0 if image is compatible
 }
@@ -190,14 +190,14 @@ error_t flash_decoder_get_flash(flash_decoder_type_t type, uint32_t addr, bool a
     return status;
 }
 
-error_t flash_decoder_validate_target_image(flash_decoder_type_t type, const uint8_t *data, uint32_t size)
+error_t flash_decoder_validate_target_image(flash_decoder_type_t type, uint32_t addr, const uint8_t *data, uint32_t size)
 {
     error_t status = ERROR_SUCCESS;
 
     if (daplink_is_interface()) {
         if (FLASH_DECODER_TYPE_TARGET == type) {
             if (g_board_info.target_cfg) {
-                if (board_detect_incompatible_image(data, size)){
+                if (board_detect_incompatible_image(addr, data, size)){
                     status = ERROR_FD_INCOMPATIBLE_IMAGE;
                 } else {
                     status = ERROR_SUCCESS;
@@ -295,7 +295,7 @@ error_t flash_decoder_write(uint32_t addr, const uint8_t *data, uint32_t size)
 
             // Validate incompatible target image file
             if (config_get_detect_incompatible_target()){
-                status = flash_decoder_validate_target_image(flash_type, flash_buf, flash_buf_pos);
+                status = flash_decoder_validate_target_image(flash_type, addr, flash_buf, flash_buf_pos);
 
                 if (ERROR_SUCCESS != status) {
                     state = DECODER_STATE_ERROR;

source/daplink/drag-n-drop/flash_decoder.h

@@ -45,7 +45,6 @@ typedef enum {
 flash_decoder_type_t flash_decoder_detect_type(const uint8_t *data, uint32_t size, uint32_t addr, bool addr_valid);
 error_t flash_decoder_get_flash(flash_decoder_type_t type, uint32_t addr, bool addr_valid, uint32_t *start_addr, const flash_intf_t **flash_intf);
 
-error_t flash_decoder_validate_target_image(flash_decoder_type_t type, const uint8_t *data, uint32_t size);
 error_t flash_decoder_open(void);
 error_t flash_decoder_write(uint32_t addr, const uint8_t *data, uint32_t size);
 error_t flash_decoder_close(void);