aboutsummaryrefslogtreecommitdiffstats
path: root/Bootloaders
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-03-20 19:08:54 +0000
committerDean Camera <dean@fourwalledcubicle.com>2013-03-20 19:08:54 +0000
commit9d988fdc222ad518afa9cfcaaa97b5e8768fd483 (patch)
treeaa8cccf55c3475ce460a203c9dbf991a6bce3c39 /Bootloaders
parent199cf8f1830ef1a8db14d311d6bfff26b82ef623 (diff)
downloadlufa-9d988fdc222ad518afa9cfcaaa97b5e8768fd483.tar.gz
lufa-9d988fdc222ad518afa9cfcaaa97b5e8768fd483.tar.bz2
lufa-9d988fdc222ad518afa9cfcaaa97b5e8768fd483.zip
Make the Mass Storage bootloader compatible with the original (green) XPLAIN boards.
Diffstat (limited to 'Bootloaders')
-rw-r--r--Bootloaders/MassStorage/BootloaderMassStorage.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/Bootloaders/MassStorage/BootloaderMassStorage.c b/Bootloaders/MassStorage/BootloaderMassStorage.c
index c891f8516..61f8760f8 100644
--- a/Bootloaders/MassStorage/BootloaderMassStorage.c
+++ b/Bootloaders/MassStorage/BootloaderMassStorage.c
@@ -73,6 +73,21 @@ void Application_Jump_Check(void)
PORTC &= ~(1 << 7);
#endif
+ #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
+ /* Disable JTAG debugging */
+ JTAG_DISABLE();
+
+ /* 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 */
+ JumpToApplication |= ((PINF & (1 << 4)) != 0);
+
+ /* Re-enable JTAG debugging */
+ JTAG_ENABLE();
+ #endif
+
if (JumpToApplication)
{
// cppcheck-suppress constStatement