more clean up, everything look good

usb example work without SD, which means ISR forwarding is working.

Author: hathach

lib/sdk11/components/libraries/bootloader_dfu/bootloader.c

@@ -337,10 +337,6 @@ uint32_t bootloader_dfu_start(bool ota, uint32_t timeout_ms)
 
 void bootloader_app_start(void)
 {
-  // If the applications CRC has been checked and passed, the magic number will be written and we
-  // can start the application safely.
-  if ( is_sd_existed() ) sd_softdevice_disable();
-
   // Disable all interrupts
   NVIC->ICER[0]=0xFFFFFFFF;
   NVIC->ICPR[0]=0xFFFFFFFF;
@@ -349,27 +345,27 @@ void bootloader_app_start(void)
   NVIC->ICPR[1]=0xFFFFFFFF;
 #endif
 
-  // default to boot right after MBR
-  uint32_t app_addr = MBR_SIZE;
+  uint32_t app_addr;
 
   if ( is_sd_existed() )
   {
+    // App starts after SoftDevice
     app_addr = SD_SIZE_GET(MBR_SIZE);
     sd_softdevice_vector_table_base_set(app_addr);
   }else
   {
+    // App starts right after MBR
+    app_addr = MBR_SIZE;
     sd_mbr_command_t command =
     {
       .command = SD_MBR_COMMAND_IRQ_FORWARD_ADDRESS_SET,
       .params.irq_forward_address_set.address = app_addr,
     };
 
     sd_mbr_command(&command);
-
-    // VTOR as last resource ?
-    // SCB->VTOR = app_addr;
   }
 
+  // jump to app
   bootloader_util_app_start(app_addr);
 }
 

src/main.c

@@ -284,8 +284,14 @@ int main(void)
 
   if (bootloader_app_is_valid() && !bootloader_dfu_sd_in_progress())
   {
-    // MBR must be init before start application
-    if ( is_sd_existed() && !sd_inited ) softdev_mbr_init();
+    if ( is_sd_existed() )
+    {
+      // MBR forward IRQ to SD (if not already)
+      if ( !sd_inited ) softdev_mbr_init();
+
+      // Make sure SD is disabled
+      sd_softdevice_disable();
+    }
 
     // clear in case we kept DFU_DBL_RESET_APP there
     (*dbl_reset_mem) = 0;
@@ -309,7 +315,7 @@ static uint32_t softdev_init(bool init_softdevice)
 {
   if (init_softdevice) softdev_mbr_init();
 
-  // map vector table to bootloader address
+  // Forward vector table to bootloader address so that we can handle BLE events
   APP_ERROR_CHECK( sd_softdevice_vector_table_base_set(BOOTLOADER_REGION_START) );
 
   // Enable Softdevice, Use Internal OSC to compatible with all boards