Use BlockDevice::get_default_instance in dfu and ota code

Author: pennam

app/dfu/usbd_dfu_flash.cpp

@@ -24,7 +24,7 @@
 //#include "option_bits.h"
 #include "mbed.h"
 #include "target.h"
-#include "QSPIFBlockDevice.h"
+#include "BlockDevice.h"
 #include "FlashSimBlockDevice.h"
 #include "flash_map_backend/secondary_bd.h"
 #include "bootutil/bootutil.h"
@@ -42,7 +42,6 @@
 /* Private macro ------------------------------------------------------------- */
 /* Private variables --------------------------------------------------------- */
 /* Private function prototypes ----------------------------------------------- */
-
 char BOOTLOADER_DESC_STR[48];
 
 
@@ -55,7 +54,7 @@ uint16_t Flash_If_DeInit(void);
 uint16_t Flash_If_GetStatus(uint32_t Add, uint8_t Cmd, uint8_t * buffer);
 
 FlashIAP flash;
-QSPIFBlockDevice qspi_flash(PD_11, PD_12, PF_7, PD_13, PF_10, PG_6, QSPIF_POLARITY_MODE_1, 40000000);
+mbed::BlockDevice* qspi_flash = mbed::BlockDevice::get_default_instance();
 mbed::BlockDevice* dfu_secondary_bd = get_secondary_bd();
 
 const uint32_t QSPIFLASH_BASE_ADDRESS   =  0x90000000;
@@ -80,7 +79,7 @@ bool Flash_If_Init_requested = false;
 
 void init_Memories() {
   flash.init();
-  qspi_flash.init();
+  qspi_flash->init();
   dfu_secondary_bd->init();
   snprintf(BOOTLOADER_DESC_STR, sizeof(BOOTLOADER_DESC_STR), "@MCUBoot version %d /0x00000000/0*4Kg", BOOTLOADER_VERSION);
 }
@@ -133,7 +132,7 @@ uint16_t Flash_If_Erase(uint32_t Add)
     return dfu_secondary_bd->erase(Add, dfu_secondary_bd->get_erase_size(Add));
   } else if (isExternalFlash(Add)) {
     Add -= QSPIFLASH_BASE_ADDRESS;
-    return qspi_flash.erase(Add, qspi_flash.get_erase_size(Add));
+    return qspi_flash->erase(Add, qspi_flash->get_erase_size(Add));
   } else {
     return flash.erase(Add, flash.get_sector_size(Add));
   }
@@ -171,10 +170,10 @@ uint16_t Flash_If_Write(uint8_t * src, uint8_t * dest, uint32_t Len)
     return dfu_secondary_bd->program(src, (uint32_t)dest, Len);
   } else if (isExternalFlash((uint32_t)dest)) {
     dest -= QSPIFLASH_BASE_ADDRESS;
-    if (Len < qspi_flash.get_erase_size(0)) {
-      Len = qspi_flash.get_erase_size(0);
+    if (Len < qspi_flash->get_erase_size(0)) {
+      Len = qspi_flash->get_erase_size(0);
     }
-    return qspi_flash.program(src, (uint32_t)dest, Len);
+    return qspi_flash->program(src, (uint32_t)dest, Len);
   } else {
     uint8_t* srcCopy = (uint8_t*)malloc(Len);
     memcpy(srcCopy, src, Len);
@@ -204,7 +203,7 @@ uint8_t *Flash_If_Read(uint8_t * src, uint8_t * dest, uint32_t Len)
     dfu_secondary_bd->read(dest, (uint32_t)src, Len);
   } else if (isExternalFlash((uint32_t)src)) {
     src -= QSPIFLASH_BASE_ADDRESS;
-    qspi_flash.read(dest, (uint32_t)src, Len);
+    qspi_flash->read(dest, (uint32_t)src, Len);
   } else {
     for (i = 0; i < Len; i++)
     {

app/ota/ota.cpp

@@ -17,7 +17,7 @@
 */
 
 #include "mbed.h"
-#include "QSPIFBlockDevice.h"
+#include "BlockDevice.h"
 #include "FlashIAPBlockDevice.h"
 #include "MBRBlockDevice.h"
 #include "SDMMCBlockDevice.h"
@@ -79,8 +79,7 @@ int tryOTA(enum storageType storage_type, uint32_t data_offset, uint32_t update_
   }
   if (storage_type & QSPI_FLASH_FLAG) {
     BOOT_LOG_DBG("  QSPI_FLASH ");
-    extern QSPIFBlockDevice qspi_flash;
-    bd = &qspi_flash;
+    bd = mbed::BlockDevice::get_default_instance();
   }
   if (storage_type & SDCARD_FLAG) {
 #if MCUBOOT_APPLICATION_SDCARD

default_bd.cpp

@@ -387,6 +387,12 @@ mbed::BlockDevice* get_scratch_bd(void) {
     }
 }
 
+mbed::BlockDevice* BlockDevice::get_default_instance()
+{
+    static QSPIFBlockDevice default_bd(PD_11, PD_12, PF_7, PD_13,  PF_10, PG_6, QSPIF_POLARITY_MODE_1, 40000000);
+    return &default_bd;
+}
+
 #else // MCUBOOT_APPLICATION_HOOKS
 
 #include "BlockDevice.h"