aboutsummaryrefslogtreecommitdiffstats
path: root/Bootloaders/MassStorage
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-03-20 20:03:00 +0000
committerDean Camera <dean@fourwalledcubicle.com>2013-03-20 20:03:00 +0000
commit54e46d7818ad14f4a00a9df905f26f135a462e6d (patch)
treeafe16ee8d39f687edc48eb07d188f061f082ea30 /Bootloaders/MassStorage
parent04feb435edd50d00a7531f8be367f43ab126c7ba (diff)
downloadlufa-54e46d7818ad14f4a00a9df905f26f135a462e6d.tar.gz
lufa-54e46d7818ad14f4a00a9df905f26f135a462e6d.tar.bz2
lufa-54e46d7818ad14f4a00a9df905f26f135a462e6d.zip
Add smaller AVR8 targets to the Mass Storage bootloader target list in the Bootloader build test.
Diffstat (limited to 'Bootloaders/MassStorage')
-rw-r--r--Bootloaders/MassStorage/BootloaderMassStorage.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/Bootloaders/MassStorage/BootloaderMassStorage.c b/Bootloaders/MassStorage/BootloaderMassStorage.c
index 61f8760f8..28f42b6d2 100644
--- a/Bootloaders/MassStorage/BootloaderMassStorage.c
+++ b/Bootloaders/MassStorage/BootloaderMassStorage.c
@@ -69,11 +69,13 @@ void Application_Jump_Check(void)
/* Enable pull-up on the IO13 pin so we can use it to select the mode */
PORTC |= (1 << 7);
Delay_MS(10);
+
+ /* If IO13 is not jumpered to ground, start the user application instead */
JumpToApplication |= ((PINC & (1 << 7)) != 0);
- PORTC &= ~(1 << 7);
- #endif
- #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
+ /* Disable pull-up after the check has completed */
+ PORTC &= ~(1 << 7);
+ #elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
/* Disable JTAG debugging */
JTAG_DISABLE();