projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add smaller AVR8 targets to the Mass Storage bootloader target list in the Bootloader...
[pub/USBasp.git]
/
Bootloaders
/
MassStorage
/
BootloaderMassStorage.c
diff --git
a/Bootloaders/MassStorage/BootloaderMassStorage.c
b/Bootloaders/MassStorage/BootloaderMassStorage.c
index
61f8760
..
28f42b6
100644
(file)
--- 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);
/* 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);
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();
/* Disable JTAG debugging */
JTAG_DISABLE();