xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stop usb before jumping to application. Correct irq disable for nrf52840

Browse Source
This commit is contained in:
hathach
2018-04-16 17:29:24 +07:00
parent dd0d9e8014
commit 53fbcc09d2
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/sdk11/components/libraries/bootloader_dfu/bootloader.c
View File

@@ -35,10 +35,10 @@
#define IRQ_ENABLED 0x01 /**< Field identifying if an interrupt is enabled. */ #define IRQ_ENABLED 0x01 /**< Field identifying if an interrupt is enabled. */
#if defined(NRF52832_XXAA) || defined(NRF52840_XXAA) #if defined(NRF52832_XXAA)
#define MAX_NUMBER_INTERRUPTS 39 #define MAX_NUMBER_INTERRUPTS 39
#else #elif defined(NRF52840_XXAA)
#define MAX_NUMBER_INTERRUPTS 32 /**< Maximum number of interrupts available. */ #define MAX_NUMBER_INTERRUPTS 48 /**< Maximum number of interrupts available. */
#endif #endif
/**@brief Enumeration for specifying current bootloader status. /**@brief Enumeration for specifying current bootloader status.

31
src/main.c
View File

@@ -57,6 +57,7 @@
#include "nrf_delay.h" #include "nrf_delay.h"
#include "pstorage.h" #include "pstorage.h"
#include "nrf_usbd.h"
#include "tusb.h" #include "tusb.h"
#include "tusb_descriptors.h" #include "tusb_descriptors.h"
@@ -419,6 +420,36 @@ int main(void)
if (bootloader_app_is_valid(DFU_BANK_0_REGION_START) && !bootloader_dfu_sd_in_progress()) if (bootloader_app_is_valid(DFU_BANK_0_REGION_START) && !bootloader_dfu_sd_in_progress())
{ {
// Stop RTC1
NVIC_DisableIRQ(RTC1_IRQn);
NRF_RTC1->EVTENCLR = RTC_EVTEN_COMPARE0_Msk;
NRF_RTC1->INTENCLR = RTC_INTENSET_COMPARE0_Msk;
NRF_RTC1->TASKS_STOP = 1;
NRF_RTC1->TASKS_CLEAR = 1;
// Stop USB
if ( NRF_USBD->ENABLE )
{
// Abort all transfers
// Disable pull up
nrf_usbd_pullup_disable();
// Disable Interrupt
NVIC_DisableIRQ(USBD_IRQn);
// disable all interrupt
NRF_USBD->INTENCLR = NRF_USBD->INTEN;
nrf_usbd_disable();
sd_clock_hfclk_release();
sd_power_usbdetected_enable(false);
sd_power_usbpwrrdy_enable(false);
sd_power_usbremoved_enable(false);
}
// Select a bank region to use as application region. // Select a bank region to use as application region.
// @note: Only applications running from DFU_BANK_0_REGION_START is supported. // @note: Only applications running from DFU_BANK_0_REGION_START is supported.
bootloader_app_start(DFU_BANK_0_REGION_START); bootloader_app_start(DFU_BANK_0_REGION_START);