(flashloader): Call flashImage in tud_dfu_manifest_cb

genoswitch · Aug 5, 2023 · 069805b · 069805b
1 parent 8a87f9f
commit 069805b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/flashloader/dfu.c b/src/flashloader/dfu.c
@@ -4,6 +4,8 @@
 
 #include "ihex/record.h"
 #include "ihex/process.h"
+// flashImage
+#include "ihex/flash.h"
 
 #include "ringbuf.h"
 
@@ -134,7 +136,6 @@ void tud_dfu_manifest_cb(uint8_t alt)
  (void)alt; // Ignore paramater
  printf("Download finished!\n");
 
- // flashing op for manifest is complete without error
- // Application can perform checksum, should it fail, use appropriate status such as errVERIFY.
- tud_dfu_finish_flashing(DFU_STATUS_OK);
+ // tud_dfu_finish_flashing is called in flashImage.
+ flashImage(&flashbuf.header, offset);
 }
diff --git a/src/flashloader/ihex/flash.c b/src/flashloader/ihex/flash.c
@@ -15,6 +15,9 @@
 #include "hardware/watchdog.h"
 #include "hardware/structs/watchdog.h"
 
+// tud_dfu_finish_flashing(DFU_STATUS_OK);
+#include "tusb.h"
+
 #include "record.h"
 #include "process.h"
 #include "../crc32.h"
@@ -68,6 +71,11 @@ void flashImage(tFlashHeader *header, uint32_t length)
 #endif
 
  restore_interrupts(status);
+
+ // flashing op for manifest is complete without error
+ // Application can perform checksum, should it fail, use appropriate status such as errVERIFY.
+ tud_dfu_finish_flashing(DFU_STATUS_OK);
+
  uart_puts(PICO_DEFAULT_UART_INSTANCE, "Rebooting into flashloader in 1 second\r\n");
 
  // Set up watchdog scratch registers so that the flashloader knows