From 82fa9149d705b70fc6d0e53e3d164fe138ce9a8b Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sat, 27 Nov 2010 01:27:55 +0000
Subject: [PATCH] Fixed broken DFU bootloader, added XPLAIN support for
bootloader start when XCK jumpered to ground.
---
Bootloaders/DFU/BootloaderDFU.c | 24 ++++++++++++++++++++++++
Bootloaders/DFU/BootloaderDFU.h | 1 +
LUFA/ManPages/ChangeLog.txt | 1 +
Projects/XPLAINBridge/XPLAINBridge.h | 1 +
4 files changed, 27 insertions(+)
diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index ce4e45981..f2247eb8b 100644
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -102,6 +102,23 @@ int main(void)
/* Configure hardware required by the bootloader */
SetupHardware();
+ #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
+ /* Disable JTAG debugging */
+ MCUCR |= (1 << JTD);
+ MCUCR |= (1 << JTD);
+
+ /* Enable pull-up on the JTAG TCK pin so we can use it to select the mode */
+ PORTF |= (1 << 4);
+ _delay_ms(10);
+
+ /* If the TCK pin is not jumpered to ground, start the user application instead */
+ RunBootloader = (!(PINF & (1 << 4)));
+
+ /* Re-enable JTAG debugging */
+ MCUCR &= ~(1 << JTD);
+ MCUCR &= ~(1 << JTD);
+ #endif
+
/* Enable global interrupts so that the USB stack can function */
sei();
@@ -153,6 +170,13 @@ void EVENT_USB_Device_ControlRequest(void)
{
/* Get the size of the command and data from the wLength value */
SentCommand.DataSize = USB_ControlRequest.wLength;
+
+ /* Ignore any requests that aren't directed to the DFU interface */
+ if ((USB_ControlRequest.bmRequestType & (CONTROL_REQTYPE_TYPE | CONTROL_REQTYPE_RECIPIENT)) !=
+ (REQTYPE_CLASS | REQREC_INTERFACE))
+ {
+ return;
+ }
switch (USB_ControlRequest.bRequest)
{
diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h
index 4a620238b..348395829 100644
--- a/Bootloaders/DFU/BootloaderDFU.h
+++ b/Bootloaders/DFU/BootloaderDFU.h
@@ -44,6 +44,7 @@
#include <avr/eeprom.h>
#include <avr/power.h>
#include <avr/interrupt.h>
+ #include <util/delay.h>
#include <stdbool.h>
#include "Descriptors.h"
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 57f867735..ca7366f4a 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -26,6 +26,7 @@
* - None
* - Library Applications:
* - Fixed Benito project discarding incoming data from the USB virtual serial port when the USART is busy
+ * - Fixed broken DFU bootloader, added XPLAIN support for bootloader start when XCK jumpered to ground
*
* \section Sec_ChangeLog101122 Version 101122
* <b>New:</b>
diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h
index 7d81abf3d..449257502 100644
--- a/Projects/XPLAINBridge/XPLAINBridge.h
+++ b/Projects/XPLAINBridge/XPLAINBridge.h
@@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
+ #include <util/delay.h>
#include "AVRISPDescriptors.h"
#include "USARTDescriptors.h"
--
GitLab