Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
1e9148db
Commit
1e9148db
authored
Apr 02, 2018
by
Dean Camera
Browse files
Fix bootloaders incorrectly checking the BOOTRST fuse on start (thanks to Braden Kell).
parent
0a5848ef
Changes
5
Hide whitespace changes
Inline
Side-by-side
Bootloaders/CDC/BootloaderCDC.c
View file @
1e9148db
...
...
@@ -97,7 +97,7 @@ void Application_Jump_Check(void)
JTAG_ENABLE
();
#else
/* Check if the device's BOOTRST fuse is set */
if
(
BootloaderAPI_ReadFuse
(
GET_HIGH_FUSE_BITS
)
&
FUSE_BOOTRST
)
if
(
!
(
BootloaderAPI_ReadFuse
(
GET_HIGH_FUSE_BITS
)
&
~
FUSE_BOOTRST
)
)
{
/* If the reset source was not an external reset or the key is correct, clear it and jump to the application */
if
(
!
(
MCUSR
&
(
1
<<
EXTRF
))
||
(
MagicBootKey
==
MAGIC_BOOT_KEY
))
...
...
Bootloaders/DFU/BootloaderDFU.c
View file @
1e9148db
...
...
@@ -133,7 +133,7 @@ void Application_Jump_Check(void)
JTAG_ENABLE
();
#else
/* Check if the device's BOOTRST fuse is set */
if
(
BootloaderAPI_ReadFuse
(
GET_HIGH_FUSE_BITS
)
&
FUSE_BOOTRST
)
if
(
!
(
BootloaderAPI_ReadFuse
(
GET_HIGH_FUSE_BITS
)
&
~
FUSE_BOOTRST
)
)
{
/* If the reset source was not an external reset or the key is correct, clear it and jump to the application */
if
(
!
(
MCUSR
&
(
1
<<
EXTRF
))
||
(
MagicBootKey
==
MAGIC_BOOT_KEY
))
...
...
Bootloaders/MassStorage/BootloaderMassStorage.c
View file @
1e9148db
...
...
@@ -114,7 +114,7 @@ void Application_Jump_Check(void)
JTAG_ENABLE
();
#else
/* Check if the device's BOOTRST fuse is set */
if
(
BootloaderAPI_ReadFuse
(
GET_HIGH_FUSE_BITS
)
&
FUSE_BOOTRST
)
if
(
!
(
BootloaderAPI_ReadFuse
(
GET_HIGH_FUSE_BITS
)
&
~
FUSE_BOOTRST
)
)
{
/* If the reset source was not an external reset or the key is correct, clear it and jump to the application */
if
(
!
(
MCUSR
&
(
1
<<
EXTRF
))
||
(
MagicBootKey
==
MAGIC_BOOT_KEY
))
...
...
Bootloaders/Printer/BootloaderPrinter.c
View file @
1e9148db
...
...
@@ -146,7 +146,7 @@ void Application_Jump_Check(void)
JTAG_ENABLE
();
#else
/* Check if the device's BOOTRST fuse is set */
if
(
BootloaderAPI_ReadFuse
(
GET_HIGH_FUSE_BITS
)
&
FUSE_BOOTRST
)
if
(
!
(
BootloaderAPI_ReadFuse
(
GET_HIGH_FUSE_BITS
)
&
~
FUSE_BOOTRST
)
)
{
/* If the reset source was not an external reset or the key is correct, clear it and jump to the application */
if
(
!
(
MCUSR
&
(
1
<<
EXTRF
))
||
(
MagicBootKey
==
MAGIC_BOOT_KEY
))
...
...
LUFA/DoxygenPages/ChangeLog.txt
View file @
1e9148db
...
...
@@ -21,6 +21,7 @@
* - Library Applications:
* - Fixed bootloaders not disabling global interrupts during erase and write operations (thanks to Zoltan)
* - Fixed bootloaders accepting flash writes to the bootloader region (thanks to NicoHood)
* - Fixed bootloaders incorrectly checking the BOOTRST fuse on start (thanks to Braden Kell)
*
* \section Sec_ChangeLog170418 Version 170418
* <b>New:</b>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment