DFU: include code to switch from DFU to RUNTUIME after bus reset / mannifest

3 files changed, 28 insertions, 0 deletions

diff --git a/usb/device/core/USBD_UDPHS.c b/usb/device/core/USBD_UDPHS.c
index f02fa55..4ea6d1a 100644
--- a/usb/device/core/USBD_UDPHS.c
+++ b/usb/device/core/USBD_UDPHS.c
@@ -41,6 +41,7 @@
 #include <usb/common/core/USBEndpointDescriptor.h>

 #include <usb/common/core/USBGenericRequest.h>

 #include <usb/common/core/USBFeatureRequest.h>

+#include <usb/device/dfu/dfu.h>

 

 #include <stdio.h>

 

@@ -1119,6 +1120,11 @@ void USBD_IrqHandler(void)
 

 //            TRACE_DEBUG_WP("EoB ");

 

+#if defined(BOARD_USB_DFU) && !defined(dfu)

+		if (g_dfu.past_manifest)

+			USBDFU_SwitchToApp();

+#endif

+

             // The device enters the Default state

             deviceState = USBD_STATE_DEFAULT;

             //      MCK + UDPCK are already enabled

diff --git a/usb/device/dfu/dfu.h b/usb/device/dfu/dfu.h
index eec956b..52b4ea5 100644
--- a/usb/device/dfu/dfu.h
+++ b/usb/device/dfu/dfu.h
@@ -139,6 +139,9 @@ void USBDFU_DFU_RequestHandler(const USBGenericRequest *request);
 
 void USBDFU_Initialize(const USBDDriverDescriptors *pDescriptors);
 
+/* USBD tells us to switch from DFU mode to application mode */
+void USBDFU_SwitchToApp(void);
+
 #define DFU_RET_NOTHING	0
 #define DFU_RET_ZLP	1
 #define DFU_RET_STALL	2
diff --git a/usb/device/dfu/dfu_driver.c b/usb/device/dfu/dfu_driver.c
index 832ccbb..c9a9f03 100644
--- a/usb/device/dfu/dfu_driver.c
+++ b/usb/device/dfu/dfu_driver.c
@@ -22,6 +22,9 @@
 
 #include <unistd.h>
 
+#include <board.h>
+#include <core_cm3.h>
+
 #include <utility/trace.h>
 
 #include <usb/common/core/USBInterfaceDescriptor.h>
@@ -462,3 +465,19 @@ void USBDFU_Initialize(const USBDDriverDescriptors *pDescriptors)
 
 	USBD_Init();
 }
+
+void USBDFU_SwitchToApp(void)
+{
+	/* make sure the MAGIC is not set to enter DFU again */
+	*(unsigned int *)USB_DFU_MAGIC_ADDR = 0;
+
+	/* disconnect from USB to ensure re-enumeration */
+	USBD_Disconnect();
+
+	/* disable any interrupts during transition */
+	__disable_irq();
+
+	/* Tell the hybrid to execute FTL JUMP! */
+	//BootIntoApp();
+	RSTC_ProcessorReset();
+}