catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-20 07:18:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

DFU: fix transitions between runtime and DFU mode

Browse Source 
we now always go through a processor reset to avoid any state that might
be persistent/left-over during the switch.
This commit is contained in:
Harald Welte
2017-03-03 00:34:17 +01:00
parent db17e83960
commit d1e963479e
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
View File

@@ -1163,10 +1163,20 @@ void USBD_IrqHandler(void)
TRACE_INFO_WP("EoBRes ");
#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
#if defined(BOARD_USB_DFU)
#if defined(APPLICATION_dfu)
/* if we are currently in the DFU bootloader, and we are beyond
* the MANIFEST stage, we shall switch to the normal
* application */
if (g_dfu->past_manifest)
USBDFU_SwitchToApp();
#endif
#else
/* if we are currently in the main application, and we are in
* appDETACH state, switch into the DFU bootloader */
if (g_dfu->state == DFU_STATE_appDETACH)
DFURT_SwitchToDFU();
#endif /* APPLICATION_dfu */
#endif /* BOARD_USB_DFU */
/* Flush and enable the Suspend interrupt */
UDP->UDP_ICR = UDP_ICR_WAKEUP | UDP_ICR_RXRSM | UDP_ICR_RXSUSP;