Customize dfu flash operations according to key presence

pennam · pennam · commit d2579157d463 · 2022-11-22T16:22:18.000+01:00
diff --git a/app/dfu/usbd_dfu_flash.cpp b/app/dfu/usbd_dfu_flash.cpp
@@ -28,6 +28,7 @@
 #include "FlashSimBlockDevice.h"
 #include "flash_map_backend/secondary_bd.h"
 #include "bootutil/bootutil.h"
+#include "bootutil/bootutil_extra.h"
 
 /* Private typedef ----------------------------------------------------------- */
 /* Private define ------------------------------------------------------------ */
@@ -60,7 +61,21 @@ mbed::BlockDevice* dfu_secondary_bd = get_secondary_bd();
 const uint32_t QSPIFLASH_BASE_ADDRESS   =  0x90000000;
 const uint32_t FILEBLOCK_BASE_ADDRESS   =  0xA0000000;
 
-USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops = {
+USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops_default = {
+  {
+		  (uint8_t *) FLASH_DESC_STR,
+		  (uint8_t *) QSPI_FLASH_DESC_STR,
+      (uint8_t *) BOOTLOADER_DESC_STR
+  },
+  Flash_If_Init,
+  Flash_If_DeInit,
+  Flash_If_Erase,
+  Flash_If_Write,
+  Flash_If_Read,
+  Flash_If_GetStatus,
+};
+
+USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops_MCUboot = {
   {
 		  (uint8_t *) FLASH_DESC_STR,
 		  (uint8_t *) QSPI_FLASH_DESC_STR,
@@ -83,7 +98,11 @@ void init_Memories() {
   if (dfu_secondary_bd != nullptr) {
     dfu_secondary_bd->init();
   }
-  snprintf(BOOTLOADER_DESC_STR, sizeof(BOOTLOADER_DESC_STR), "@MCUBoot version %d /0x00000000/0*4Kg", BOOTLOADER_VERSION);
+  if(boot_empty_keys()) {
+    snprintf(BOOTLOADER_DESC_STR, sizeof(BOOTLOADER_DESC_STR), "@Arduino boot v.%d /0x00000000/0*4Kg", BOOTLOADER_VERSION);
+  } else {
+    snprintf(BOOTLOADER_DESC_STR, sizeof(BOOTLOADER_DESC_STR), "@MCUboot v.%d /0x00000000/0*4Kg", BOOTLOADER_VERSION);
+  }
 }
 
 Thread writeThread(osPriorityHigh);
diff --git a/app/dfu/usbd_dfu_flash.h b/app/dfu/usbd_dfu_flash.h
@@ -48,7 +48,8 @@
 #define ADDR_FLASH_SECTOR_7_BANK2     ((uint32_t)0x081E0000) /* Base @ of Sector 7, 128 Kbytes */
 
 /* Exported macro ------------------------------------------------------------*/
-extern USBD_DFU_MediaTypeDef  USBD_DFU_Flash_fops;
+extern USBD_DFU_MediaTypeDef  USBD_DFU_Flash_fops_default;
+extern USBD_DFU_MediaTypeDef  USBD_DFU_Flash_fops_MCUboot;
 #define FLASH_BASE_ADDR      (uint32_t)(FLASH_BASE)
 #define FLASH_END_ADDR       (uint32_t)(0x081FFFFF)
 
diff --git a/app/main.cpp b/app/main.cpp
@@ -151,7 +151,11 @@ static int start_dfu(void) {
   USBD_RegisterClass(&USBD_Device, USBD_DFU_CLASS);
 
   /* Add DFU Media interface */
-  USBD_DFU_RegisterMedia(&USBD_Device, &USBD_DFU_Flash_fops);
+  if(boot_empty_keys()) {
+    USBD_DFU_RegisterMedia(&USBD_Device, &USBD_DFU_Flash_fops_default);
+  } else {
+    USBD_DFU_RegisterMedia(&USBD_Device, &USBD_DFU_Flash_fops_MCUboot);
+  }
 
   /* Start Device Process */
   USBD_Start(&USBD_Device);
