Skip to content

Commit d04eb7b

Browse files
committed
Restore full list of dfu operations
1 parent d257915 commit d04eb7b

File tree

3 files changed

+3
-22
lines changed

3 files changed

+3
-22
lines changed

app/dfu/usbd_dfu_flash.cpp

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,7 @@ mbed::BlockDevice* dfu_secondary_bd = get_secondary_bd();
6161
const uint32_t QSPIFLASH_BASE_ADDRESS = 0x90000000;
6262
const uint32_t FILEBLOCK_BASE_ADDRESS = 0xA0000000;
6363

64-
USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops_default = {
65-
{
66-
(uint8_t *) FLASH_DESC_STR,
67-
(uint8_t *) QSPI_FLASH_DESC_STR,
68-
(uint8_t *) BOOTLOADER_DESC_STR
69-
},
70-
Flash_If_Init,
71-
Flash_If_DeInit,
72-
Flash_If_Erase,
73-
Flash_If_Write,
74-
Flash_If_Read,
75-
Flash_If_GetStatus,
76-
};
77-
78-
USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops_MCUboot = {
64+
USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops = {
7965
{
8066
(uint8_t *) FLASH_DESC_STR,
8167
(uint8_t *) QSPI_FLASH_DESC_STR,

app/dfu/usbd_dfu_flash.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@
4848
#define ADDR_FLASH_SECTOR_7_BANK2 ((uint32_t)0x081E0000) /* Base @ of Sector 7, 128 Kbytes */
4949

5050
/* Exported macro ------------------------------------------------------------*/
51-
extern USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops_default;
52-
extern USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops_MCUboot;
51+
extern USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops;
5352
#define FLASH_BASE_ADDR (uint32_t)(FLASH_BASE)
5453
#define FLASH_END_ADDR (uint32_t)(0x081FFFFF)
5554

app/main.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,7 @@ static int start_dfu(void) {
151151
USBD_RegisterClass(&USBD_Device, USBD_DFU_CLASS);
152152

153153
/* Add DFU Media interface */
154-
if(boot_empty_keys()) {
155-
USBD_DFU_RegisterMedia(&USBD_Device, &USBD_DFU_Flash_fops_default);
156-
} else {
157-
USBD_DFU_RegisterMedia(&USBD_Device, &USBD_DFU_Flash_fops_MCUboot);
158-
}
154+
USBD_DFU_RegisterMedia(&USBD_Device, &USBD_DFU_Flash_fops);
159155

160156
/* Start Device Process */
161157
USBD_Start(&USBD_Device);

0 commit comments

Comments
 (0)