Fixed broken DFU bootloader, added XPLAIN support for bootloader start when XCK jumpered to ground.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1596 d5102386-fcda-11dd-9fdb-3debd5008f28

2 files changed, 25 insertions, 0 deletions

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index ce4e4598..f2247eb8 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 4a620238..34839582 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"