From e952f681dbda9e8568206281bf588f3455924a20 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 22 Dec 2015 20:57:36 +1100 Subject: Use different jump key than the bootloaders in the documentation. --- LUFA/DoxygenPages/SoftwareBootloaderJump.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'LUFA') diff --git a/LUFA/DoxygenPages/SoftwareBootloaderJump.txt b/LUFA/DoxygenPages/SoftwareBootloaderJump.txt index 0b69612b6..f8c2523d7 100644 --- a/LUFA/DoxygenPages/SoftwareBootloaderJump.txt +++ b/LUFA/DoxygenPages/SoftwareBootloaderJump.txt @@ -31,7 +31,7 @@ * * uint32_t Boot_Key ATTR_NO_INIT; * - * #define MAGIC_BOOT_KEY 0xDC42ACCA + * #define MAGIC_BOOT_KEY 0xBADCAFE5 * #define BOOTLOADER_START_ADDRESS ((FLASH_SIZE_BYTES - BOOTLOADER_SEC_SIZE_BYTES) >> 1) * * void Bootloader_Jump_Check(void) ATTR_INIT_SECTION(3); -- cgit v1.2.3 From 59b9cf8d0f5c8238d17d5a31a6835938a8e739ad Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 22 Dec 2015 22:29:27 +1100 Subject: Update changelog. --- LUFA/DoxygenPages/ChangeLog.txt | 1 + LUFA/DoxygenPages/MigrationInformation.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'LUFA') diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index eac7d429c..b6bd54a11 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -13,6 +13,7 @@ * parameter, instead of uint16_t (thanks to Matlo) * - Fixed broken USE_RAM_DESCRIPTORS compile time option when the FIXED_NUM_CONFIGURATIONS compile time option is not enabled * in a user application (thanks to Matlo) + * - Fixed missing \c va_end() calls in the HID bootloader CLI app which could cause portability issues * * \section Sec_ChangeLog151115 Version 151115 * New: diff --git a/LUFA/DoxygenPages/MigrationInformation.txt b/LUFA/DoxygenPages/MigrationInformation.txt index b98bfc170..b9ed3a335 100644 --- a/LUFA/DoxygenPages/MigrationInformation.txt +++ b/LUFA/DoxygenPages/MigrationInformation.txt @@ -17,7 +17,7 @@ * \section Sec_Migration151115 Migrating from 140928 to 151115 * Non-USB Library Components * - The ATPROGRAM LUFA build system module now defaults to the Atmel ICE debugger tool, instead of the Atmel JTAG ICE3. - * - The \x Serial_CreateStream() and \c Serial_CreateBlockingStream() functions now require a USART base pointer for XMEGA devices as the first parameter. + * - The \c Serial_CreateStream() and \c Serial_CreateBlockingStream() functions now require a USART base pointer for XMEGA devices as the first parameter. * * \section Sec_Migration140928 Migrating from 140302 to 140928 * Device Mode -- cgit v1.2.3 From 0b69eeaf5db2f675c398a982329b6a2bbffc799e Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 22 Dec 2015 22:31:54 +1100 Subject: Fix void pointer arithmetic in the Serial peripheral drivers. --- LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c | 4 +++- LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'LUFA') diff --git a/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c index 3df39814e..6680a6ba6 100644 --- a/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c +++ b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c @@ -88,8 +88,10 @@ void Serial_SendString(const char* StringPtr) void Serial_SendData(const void* Buffer, uint16_t Length) { + uint8_t* CurrByte = (uint8_t*)Buffer; + while (Length--) - Serial_SendByte(*((uint8_t*)Buffer++)); + Serial_SendByte(*(CurrByte++)); } void Serial_CreateStream(FILE* Stream) diff --git a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c index f86bd9789..b7a39d3c2 100644 --- a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c +++ b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c @@ -91,8 +91,10 @@ void Serial_SendData(USART_t* const USART, const void* Buffer, uint16_t Length) { + uint8_t* CurrByte = (uint8_t*)Buffer; + while (Length--) - Serial_SendByte(USART, *((uint8_t*)Buffer++)); + Serial_SendByte(USART, *(CurrByte++)); } void Serial_CreateStream(USART_t* USART, FILE* Stream) -- cgit v1.2.3 From d0161e0a9bbc8d1a059a32e1c21fdd201cce1f3c Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 22 Dec 2015 22:34:50 +1100 Subject: Fixed low level RNDIS demo incorrectly setting the RNDIS state when a null packet filter was requested. --- LUFA/DoxygenPages/ChangeLog.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'LUFA') diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index b6bd54a11..36c5bf9c8 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -14,6 +14,9 @@ * - Fixed broken USE_RAM_DESCRIPTORS compile time option when the FIXED_NUM_CONFIGURATIONS compile time option is not enabled * in a user application (thanks to Matlo) * - Fixed missing \c va_end() calls in the HID bootloader CLI app which could cause portability issues + * - Fixed void pointer arithmetic in the \c Serial_SendData() functions for AVR8 and XMEGA architectures + * - Fixed void pointer arithmetic in the low level RNDIS demo protocol decoders + * - Fixed low level RNDIS demo incorrectly setting the RNDIS state when a null packet filter was requested * * \section Sec_ChangeLog151115 Version 151115 * New: -- cgit v1.2.3 From a86b502294ebda621fa8f3cce20a8238ea15eebc Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 22 Dec 2015 22:36:23 +1100 Subject: Fix additional void pointer arithmetic in the class driver RNDIS demo. --- LUFA/DoxygenPages/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'LUFA') diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index 36c5bf9c8..16102fb95 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -15,7 +15,7 @@ * in a user application (thanks to Matlo) * - Fixed missing \c va_end() calls in the HID bootloader CLI app which could cause portability issues * - Fixed void pointer arithmetic in the \c Serial_SendData() functions for AVR8 and XMEGA architectures - * - Fixed void pointer arithmetic in the low level RNDIS demo protocol decoders + * - Fixed void pointer arithmetic in the low level and class driver RNDIS demo protocol decoders * - Fixed low level RNDIS demo incorrectly setting the RNDIS state when a null packet filter was requested * * \section Sec_ChangeLog151115 Version 151115 -- cgit v1.2.3