forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed CDC and DFU bootloaders API page erase and write function failures (thanks to Martin Lambert).

Browse Source
pull/1469/head
Dean Camera 13 years ago
parent 579fbb68fc
commit 2e27cc2670
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File

2
Bootloaders/CDC/BootloaderAPI.c
Unescape View File

@ -38,12 +38,14 @@
void BootloaderAPI_ErasePage(const uint32_t Address) void BootloaderAPI_ErasePage(const uint32_t Address)
{ {
boot_page_erase_safe(Address); boot_page_erase_safe(Address);
boot_spm_busy_wait();
boot_rww_enable(); boot_rww_enable();
} }
void BootloaderAPI_WritePage(const uint32_t Address) void BootloaderAPI_WritePage(const uint32_t Address)
{ {
boot_page_write_safe(Address); boot_page_write_safe(Address);
boot_spm_busy_wait();
boot_rww_enable(); boot_rww_enable();
} }

4
Bootloaders/CDC/makefile
Unescape View File

@ -35,8 +35,8 @@ BOOT_SEC_OFFSET = 0x$(shell echo "obase=16; (($(FLASH_SIZE_KB) * 1024) - $
# Bootloader linker section flags for relocating the API table sections to # Bootloader linker section flags for relocating the API table sections to
# known FLASH addresses - these should not normally be user-edited. # known FLASH addresses - these should not normally be user-edited.
BOOT_SECTION_LD_FLAG = -Wl,--section-start=.apitable_$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=BootloaderAPI_$(strip $(2)) BOOT_SECTION_LD_FLAG = -Wl,--section-start=.apitable_$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=BootloaderAPI_$(strip $(2))
BOOT_API_LD_FLAGS = $(call BOOT_SECTION_LD_FLAG, trampolines, Trampolines, (48 + 32 + 8)) BOOT_API_LD_FLAGS = $(call BOOT_SECTION_LD_FLAG, trampolines, Trampolines, 96)
BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, jumptable, JumpTable, (32 + 8)) BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, jumptable, JumpTable, 32)
BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, signatures, Signatures, 8) BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, signatures, Signatures, 8)
# Default target # Default target

2
Bootloaders/DFU/BootloaderAPI.c
Unescape View File

@ -38,12 +38,14 @@
void BootloaderAPI_ErasePage(const uint32_t Address) void BootloaderAPI_ErasePage(const uint32_t Address)
{ {
boot_page_erase_safe(Address); boot_page_erase_safe(Address);
boot_spm_busy_wait();
boot_rww_enable(); boot_rww_enable();
} }
void BootloaderAPI_WritePage(const uint32_t Address) void BootloaderAPI_WritePage(const uint32_t Address)
{ {
boot_page_write_safe(Address); boot_page_write_safe(Address);
boot_spm_busy_wait();
boot_rww_enable(); boot_rww_enable();
} }

4
Bootloaders/DFU/makefile
Unescape View File

@ -35,8 +35,8 @@ BOOT_SEC_OFFSET = 0x$(shell echo "obase=16; (($(FLASH_SIZE_KB) * 1024) - $
# Bootloader linker section flags for relocating the API table sections to # Bootloader linker section flags for relocating the API table sections to
# known FLASH addresses - these should not normally be user-edited. # known FLASH addresses - these should not normally be user-edited.
BOOT_SECTION_LD_FLAG = -Wl,--section-start=.apitable_$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=BootloaderAPI_$(strip $(2)) BOOT_SECTION_LD_FLAG = -Wl,--section-start=.apitable_$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=BootloaderAPI_$(strip $(2))
BOOT_API_LD_FLAGS = $(call BOOT_SECTION_LD_FLAG, trampolines, Trampolines, (48 + 32 + 8)) BOOT_API_LD_FLAGS = $(call BOOT_SECTION_LD_FLAG, trampolines, Trampolines, 96)
BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, jumptable, JumpTable, (32 + 8)) BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, jumptable, JumpTable, 32)
BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, signatures, Signatures, 8) BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, signatures, Signatures, 8)
# Default target # Default target

1
LUFA/DoxygenPages/ChangeLog.txt
Unescape View File

@ -78,6 +78,7 @@
* - Fixed incorrect DFU version number reported to the host in the DFU bootloader descriptors (thanks to Georg Glock) * - Fixed incorrect DFU version number reported to the host in the DFU bootloader descriptors (thanks to Georg Glock)
* - Fixed incorrect version hundredths value encoding in VERSION_BCD() macro (thanks to Georg Glock) * - Fixed incorrect version hundredths value encoding in VERSION_BCD() macro (thanks to Georg Glock)
* - Fixed invalid configuration descriptor in the low level KeyboardMouse device demo (thanks to Jun Wako) * - Fixed invalid configuration descriptor in the low level KeyboardMouse device demo (thanks to Jun Wako)
* - Fixed CDC and DFU bootloaders API page erase and write function failures (thanks to Martin Lambert)
* *
* \section Sec_ChangeLog120219 Version 120219 * \section Sec_ChangeLog120219 Version 120219
* <b>New:</b> * <b>New:</b>

Write Preview
Loading…
Cancel
Save